[14/24] stdlib: remove TRAD_SYNOPSIS

Message ID 20171130102858.16160-15-yselkowi@redhat.com
State New
Headers show
Series
  • Remove TRAD_SYNOPSIS
Related show

Commit Message

Yaakov Selkowitz Nov. 30, 2017, 10:28 a.m.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---
 newlib/libc/stdlib/_Exit.c      |  7 +-----
 newlib/libc/stdlib/a64l.c       | 10 +-------
 newlib/libc/stdlib/abort.c      |  6 +----
 newlib/libc/stdlib/abs.c        |  7 +-----
 newlib/libc/stdlib/assert.c     |  2 +-
 newlib/libc/stdlib/atexit.c     |  7 +-----
 newlib/libc/stdlib/atof.c       | 10 +-------
 newlib/libc/stdlib/atoi.c       | 19 +--------------
 newlib/libc/stdlib/atoll.c      | 11 +--------
 newlib/libc/stdlib/calloc.c     | 14 +----------
 newlib/libc/stdlib/div.c        |  7 +-----
 newlib/libc/stdlib/ecvtbuf.c    | 19 +--------------
 newlib/libc/stdlib/efgcvt.c     | 41 ++------------------------------
 newlib/libc/stdlib/envlock.c    |  9 +------
 newlib/libc/stdlib/exit.c       |  7 +-----
 newlib/libc/stdlib/getenv.c     |  7 +-----
 newlib/libc/stdlib/getenv_r.c   |  8 +------
 newlib/libc/stdlib/itoa.c       |  2 +-
 newlib/libc/stdlib/labs.c       |  7 +-----
 newlib/libc/stdlib/ldiv.c       |  7 +-----
 newlib/libc/stdlib/llabs.c      |  7 +-----
 newlib/libc/stdlib/lldiv.c      |  7 +-----
 newlib/libc/stdlib/malloc.c     | 52 +----------------------------------------
 newlib/libc/stdlib/mblen.c      |  8 +------
 newlib/libc/stdlib/mblen_r.c    | 10 +-------
 newlib/libc/stdlib/mbsnrtowcs.c | 35 +--------------------------
 newlib/libc/stdlib/mbstowcs.c   |  9 +------
 newlib/libc/stdlib/mbtowc.c     |  9 +------
 newlib/libc/stdlib/mlock.c      |  9 +------
 newlib/libc/stdlib/mstats.c     | 23 +-----------------
 newlib/libc/stdlib/on_exit.c    |  8 +------
 newlib/libc/stdlib/rand.c       | 13 +----------
 newlib/libc/stdlib/rand48.c     | 28 +---------------------
 newlib/libc/stdlib/random.c     |  2 +-
 newlib/libc/stdlib/rpmatch.c    |  7 +-----
 newlib/libc/stdlib/strtod.c     | 17 +-------------
 newlib/libc/stdlib/strtol.c     | 15 +-----------
 newlib/libc/stdlib/strtoll.c    | 15 +-----------
 newlib/libc/stdlib/strtoul.c    | 15 +-----------
 newlib/libc/stdlib/strtoull.c   | 15 +-----------
 newlib/libc/stdlib/system.c     | 11 +--------
 newlib/libc/stdlib/utoa.c       |  2 +-
 newlib/libc/stdlib/wcsnrtombs.c | 35 +--------------------------
 newlib/libc/stdlib/wcstod.c     | 22 +----------------
 newlib/libc/stdlib/wcstol.c     | 15 +-----------
 newlib/libc/stdlib/wcstoll.c    | 15 +-----------
 newlib/libc/stdlib/wcstombs.c   |  9 +------
 newlib/libc/stdlib/wcstoul.c    | 15 +-----------
 newlib/libc/stdlib/wcstoull.c   | 15 +-----------
 newlib/libc/stdlib/wctomb.c     |  8 +------
 50 files changed, 51 insertions(+), 607 deletions(-)

-- 
2.15.0

Patch

diff --git a/newlib/libc/stdlib/_Exit.c b/newlib/libc/stdlib/_Exit.c
index 3f189a21f..b07559acb 100644
--- a/newlib/libc/stdlib/_Exit.c
+++ b/newlib/libc/stdlib/_Exit.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	_Exit
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	void _Exit(int <[code]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	void _Exit(<[code]>)
-	int <[code]>;
-
 DESCRIPTION
 Use <<_Exit>> to return control from a program to the host operating
 environment.  Use the argument <[code]> to pass an exit status to the
diff --git a/newlib/libc/stdlib/a64l.c b/newlib/libc/stdlib/a64l.c
index ee3d40d49..8d68ed0e9 100644
--- a/newlib/libc/stdlib/a64l.c
+++ b/newlib/libc/stdlib/a64l.c
@@ -7,19 +7,11 @@  INDEX
 INDEX
 	l64a
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         long a64l(const char *<[input]>);
         char *l64a(long <[input]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long a64l(<[input]>)
-        const char *<[input]>;
-
-        char *l64a(<[input]>)
-        long <[input]>;
-
 DESCRIPTION
 Conversion is performed between long and radix-64 characters.  The
 <<l64a>> routine transforms up to 32 bits of input value starting from
diff --git a/newlib/libc/stdlib/abort.c b/newlib/libc/stdlib/abort.c
index 93f7c2f42..febc07a31 100644
--- a/newlib/libc/stdlib/abort.c
+++ b/newlib/libc/stdlib/abort.c
@@ -15,14 +15,10 @@  FUNCTION
 INDEX
 	abort
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	void abort(void);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	void abort();
-
 DESCRIPTION
 Use <<abort>> to signal that your program has detected a condition it
 cannot deal with.  Normally, <<abort>> ends your program's execution.
diff --git a/newlib/libc/stdlib/abs.c b/newlib/libc/stdlib/abs.c
index 0308b5729..d347265fa 100644
--- a/newlib/libc/stdlib/abs.c
+++ b/newlib/libc/stdlib/abs.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	abs
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int abs(int <[i]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int abs(<[i]>)
-	int <[i]>;
-
 DESCRIPTION
 <<abs>> returns
 @tex
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index 135bf1519..a6218746c 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	assert
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <assert.h>
 	void assert(int <[expression]>);
 
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index fa91deb03..78180895c 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -12,15 +12,10 @@  FUNCTION
 INDEX
 	atexit
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int atexit (void (*<[function]>)(void));
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int atexit ((<[function]>)
-	  void (*<[function]>)();
-
 DESCRIPTION
 You can use <<atexit>> to enroll functions in a list of functions that
 will be called when your program terminates normally.  The argument is
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 8497f6807..4653d4f93 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -7,19 +7,11 @@  INDEX
 INDEX
 	atoff
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         double atof(const char *<[s]>);
         float atoff(const char *<[s]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-        double atof(<[s]>)
-        char *<[s]>;
-
-        float atoff(<[s]>)
-        char *<[s]>;
-
 DESCRIPTION
 <<atof>> converts the initial portion of a string to a <<double>>.
 <<atoff>> converts the initial portion of a string to a <<float>>.
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 6156eda4d..ac3b39a0e 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -11,30 +11,13 @@  INDEX
 INDEX
 	_atol_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         int atoi(const char *<[s]>);
 	long atol(const char *<[s]>);
         int _atoi_r(struct _reent *<[ptr]>, const char *<[s]>);
         long _atol_r(struct _reent *<[ptr]>, const char *<[s]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-       int atoi(<[s]>)
-       char *<[s]>;
-
-       long atol(<[s]>)
-       char *<[s]>;
-
-       int _atoi_r(<[ptr]>, <[s]>)
-       struct _reent *<[ptr]>;
-       char *<[s]>;
-
-       long _atol_r(<[ptr]>, <[s]>)
-       struct _reent *<[ptr]>;
-       char *<[s]>;
-
-
 DESCRIPTION
    <<atoi>> converts the initial portion of a string to an <<int>>.
    <<atol>> converts the initial portion of a string to a <<long>>.
diff --git a/newlib/libc/stdlib/atoll.c b/newlib/libc/stdlib/atoll.c
index a6abd9595..9d8a64a9c 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -7,20 +7,11 @@  INDEX
 INDEX
         _atoll_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         long long atoll(const char *<[str]>);
         long long _atoll_r(struct _reent *<[ptr]>, const char *<[str]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long long atoll(<[str]>)
-        const char *<[str]>;
-
-        long long _atoll_r(<[ptr]>, <[str]>)
-	struct _reent *<[ptr]>;
-        const char *<[str]>;
-
 DESCRIPTION
 The function <<atoll>> converts the initial portion of the string 
 pointed to by <<*<[str]>>> to a type <<long long>>.  A call to
diff --git a/newlib/libc/stdlib/calloc.c b/newlib/libc/stdlib/calloc.c
index 4415c6591..3a723783b 100644
--- a/newlib/libc/stdlib/calloc.c
+++ b/newlib/libc/stdlib/calloc.c
@@ -11,22 +11,10 @@  INDEX
 INDEX
 	_calloc_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	void *calloc(size_t <[n]>, size_t <[s]>);
 	void *_calloc_r(void *<[reent]>, size_t <[n]>, size_t <[s]>);
-	
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *calloc(<[n]>, <[s]>)
-	size_t <[n]>, <[s]>;
-
-	char *_calloc_r(<[reent]>, <[n]>, <[s]>)
-	char *<[reent]>;
-	size_t <[n]>;
-	size_t <[s]>;
-
-
 
 DESCRIPTION
 Use <<calloc>> to request a block of memory sufficient to hold an
diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c
index 816c3fb3c..a780a2d3a 100644
--- a/newlib/libc/stdlib/div.c
+++ b/newlib/libc/stdlib/div.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	div
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	div_t div(int <[n]>, int <[d]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	div_t div(<[n]>, <[d]>)
-	int <[n]>, <[d]>;
-
 DESCRIPTION
 Divide
 @tex
diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c
index feaa33fd0..ee58c9a9a 100644
--- a/newlib/libc/stdlib/ecvtbuf.c
+++ b/newlib/libc/stdlib/ecvtbuf.c
@@ -7,7 +7,7 @@  INDEX
 INDEX
 	fcvtbuf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 
 	char *ecvtbuf(double <[val]>, int <[chars]>, int *<[decpt]>,
@@ -16,23 +16,6 @@  ANSI_SYNOPSIS
 	char *fcvtbuf(double <[val]>, int <[decimals]>, int *<[decpt]>,
                        int *<[sgn]>, char *<[buf]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	char *ecvtbuf(<[val]>, <[chars]>, <[decpt]>, <[sgn]>, <[buf]>);
-	double <[val]>;
-	int <[chars]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-	char *<[buf]>;
-
-	char *fcvtbuf(<[val]>, <[decimals]>, <[decpt]>, <[sgn]>, <[buf]>);
-	double <[val]>;
-	int <[decimals]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-	char *<[buf]>;
-
 DESCRIPTION
 	<<ecvtbuf>> and <<fcvtbuf>> produce (null-terminated) strings
 	of digits representating the <<double>> number <[val]>.
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index b7d9812f6..ae6424559 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	fcvtf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 
 	char *ecvt(double <[val]>, int <[chars]>, int *<[decpt]>, int *<[sgn]>);
@@ -22,31 +22,6 @@  ANSI_SYNOPSIS
 	char *fcvtf(float <[val]>, int <[decimals]>, 
                     int *<[decpt]>, int *<[sgn]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-
-	char *ecvt(<[val]>, <[chars]>, <[decpt]>, <[sgn]>);
-	double <[val]>;
-	int <[chars]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-	char *ecvtf(<[val]>, <[chars]>, <[decpt]>, <[sgn]>);
-	float <[val]>;
-	int <[chars]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-
-	char *fcvt(<[val]>, <[decimals]>, <[decpt]>, <[sgn]>);
-	double <[val]>;
-	int <[decimals]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-	char *fcvtf(<[val]>, <[decimals]>, <[decpt]>, <[sgn]>);
-	float <[val]>;
-	int <[decimals]>;
-	int *<[decpt]>;
-	int *<[sgn]>;
-
 DESCRIPTION
 <<ecvt>> and <<fcvt>> produce (null-terminated) strings of digits
 representating the <<double>> number <[val]>.
@@ -91,24 +66,12 @@  INDEX
 INDEX
 	gcvtf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 
 	char *gcvt(double <[val]>, int <[precision]>, char *<[buf]>);
 	char *gcvtf(float <[val]>, int <[precision]>, char *<[buf]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-
-	char *gcvt(<[val]>, <[precision]>, <[buf]>);
-	double <[val]>;
-	int <[precision]>;
-	char *<[buf]>;
-	char *gcvtf(<[val]>, <[precision]>, <[buf]>);
-	float <[val]>;
-	int <[precision]>;
-	char *<[buf]>;
-
 DESCRIPTION
 <<gcvt>> writes a fully formatted number as a null-terminated
 string in the buffer <<*<[buf]>>>.  <<gcvtf>> produces corresponding
diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c
index 410a28a9c..3afe30ee9 100644
--- a/newlib/libc/stdlib/envlock.c
+++ b/newlib/libc/stdlib/envlock.c
@@ -7,18 +7,11 @@  INDEX
 INDEX
 	__env_unlock
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <envlock.h>
 	void __env_lock (struct _reent *<[reent]>);
 	void __env_unlock (struct _reent *<[reent]>);
 
-TRAD_SYNOPSIS
-	void __env_lock(<[reent]>)
-	struct _reent *<[reent]>;
-
-	void __env_unlock(<[reent]>)
-	struct _reent *<[reent]>;
-
 DESCRIPTION
 The <<setenv>> family of routines call these functions when they need to
 modify the environ variable.  The version of these routines supplied in the
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 1dc56944a..8d1be9d3a 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -12,15 +12,10 @@  FUNCTION
 INDEX
 	exit
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	void exit(int <[code]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	void exit(<[code]>)
-	int <[code]>;
-
 DESCRIPTION
 Use <<exit>> to return control from a program to the host operating
 environment.  Use the argument <[code]> to pass an exit status to the
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index 79360ac42..c64241ee6 100644
--- a/newlib/libc/stdlib/getenv.c
+++ b/newlib/libc/stdlib/getenv.c
@@ -7,15 +7,10 @@  INDEX
 INDEX
 	environ
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	char *getenv(const char *<[name]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *getenv(<[name]>)
-	char *<[name]>;
-
 DESCRIPTION
 <<getenv>> searches the list of environment variable names and values
 (using the global pointer ``<<char **environ>>'') for a variable whose
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index cdc12c0a9..7376f7407 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -7,16 +7,10 @@  INDEX
 INDEX
 	environ
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	char *_getenv_r(struct _reent *<[reent_ptr]>, const char *<[name]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *_getenv_r(<[reent_ptr]>, <[name]>)
-	struct _reent *<[reent_ptr]>;
-	char *<[name]>;
-
 DESCRIPTION
 <<_getenv_r>> searches the list of environment variable names and values
 (using the global pointer ``<<char **environ>>'') for a variable whose
diff --git a/newlib/libc/stdlib/itoa.c b/newlib/libc/stdlib/itoa.c
index 377834d03..3178cd454 100644
--- a/newlib/libc/stdlib/itoa.c
+++ b/newlib/libc/stdlib/itoa.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	itoa
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	char *itoa(int <[value]>, char *<[str]>, int <[base]>);
 	char *__itoa(int <[value]>, char *<[str]>, int <[base]>);
diff --git a/newlib/libc/stdlib/labs.c b/newlib/libc/stdlib/labs.c
index 634cf7348..712f56c37 100644
--- a/newlib/libc/stdlib/labs.c
+++ b/newlib/libc/stdlib/labs.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	labs
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	long labs(long <[i]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	long labs(<[i]>)
-	long <[i]>;
-
 DESCRIPTION
 <<labs>> returns
 @tex
diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c
index d7508f1c5..242b6bd87 100644
--- a/newlib/libc/stdlib/ldiv.c
+++ b/newlib/libc/stdlib/ldiv.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	ldiv
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	ldiv_t ldiv(long <[n]>, long <[d]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	ldiv_t ldiv(<[n]>, <[d]>)
-	long <[n]>, <[d]>;
-
 DESCRIPTION
 Divide
 @tex
diff --git a/newlib/libc/stdlib/llabs.c b/newlib/libc/stdlib/llabs.c
index 496373910..c2a561c38 100644
--- a/newlib/libc/stdlib/llabs.c
+++ b/newlib/libc/stdlib/llabs.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
         llabs
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         long long llabs(long long <[j]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long long llabs(<[j]>)
-        long long <[j]>;
-
 DESCRIPTION
 The <<llabs>> function computes the absolute value of the long long integer 
 argument <[j]> (also called the magnitude of <[j]>).
diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c
index 6b853e4b6..61a9b50ca 100644
--- a/newlib/libc/stdlib/lldiv.c
+++ b/newlib/libc/stdlib/lldiv.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
         lldiv
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         lldiv_t lldiv(long long <[n]>, long long <[d]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        lldiv_t lldiv(<[n]>, <[d]>)
-        long long <[n]>, <[d]>;
-
 DESCRIPTION
 Divide
 @tex
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
index 160a13eff..9cf897852 100644
--- a/newlib/libc/stdlib/malloc.c
+++ b/newlib/libc/stdlib/malloc.c
@@ -43,7 +43,7 @@  INDEX
 INDEX
 	_malloc_usable_size_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	void *malloc(size_t <[nbytes]>);
 	void *realloc(void *<[aptr]>, size_t <[nbytes]>);
@@ -66,56 +66,6 @@  ANSI_SYNOPSIS
 
 	size_t _malloc_usable_size_r(void *<[reent]>, void *<[aptr]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *malloc(<[nbytes]>)
-	size_t <[nbytes]>;
-
-	char *realloc(<[aptr]>, <[nbytes]>)
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	char *reallocf(<[aptr]>, <[nbytes]>)
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	void free(<[aptr]>)
-	char *<[aptr]>;
-
-	char *memalign(<[align]>, <[nbytes]>)
-	size_t <[align]>;
-	size_t <[nbytes]>;
-
-	size_t malloc_usable_size(<[aptr]>)
-	char *<[aptr]>;
-
-	char *_malloc_r(<[reent]>,<[nbytes]>)
-	char *<[reent]>;
-	size_t <[nbytes]>;
-
-	char *_realloc_r(<[reent]>, <[aptr]>, <[nbytes]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	char *_reallocf_r(<[reent]>, <[aptr]>, <[nbytes]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	void _free_r(<[reent]>, <[aptr]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-
-	char *_memalign_r(<[reent]>, <[align]>, <[nbytes]>)
-	char *<[reent]>;
-	size_t <[align]>;
-	size_t <[nbytes]>;
-
-	size_t malloc_usable_size(<[reent]>, <[aptr]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-
 DESCRIPTION
 These functions manage a pool of system memory.
 
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c
index f9fb46466..30d759be0 100644
--- a/newlib/libc/stdlib/mblen.c
+++ b/newlib/libc/stdlib/mblen.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	mblen
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int mblen(const char *<[s]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int mblen(<[s]>, <[n]>)
-	const char *<[s]>;
-	size_t <[n]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mblen>>.  In this case, the
diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c
index 9c1533ec4..5e58e1e45 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -5,18 +5,10 @@  FUNCTION
 INDEX
 	_mblen_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int _mblen_r(struct _reent *<[r]>, const char *<[s]>, size_t <[n]>, int *<[state]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int _mblen_r(<[r]>, <[s]>, <[n]>, <[state]>)
-        struct _reent *<[r]>;
-	const char *<[s]>;
-	size_t <[n]>;
-        int *<[state]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<_mblen_r>>.  In this case, the
diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c
index 7ab384721..018f075ee 100644
--- a/newlib/libc/stdlib/mbsnrtowcs.c
+++ b/newlib/libc/stdlib/mbsnrtowcs.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_mbsnrtowcs_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t mbsrtowcs(wchar_t *__restrict <[dst]>,
 			 const char **__restrict <[src]>,
@@ -33,39 +33,6 @@  ANSI_SYNOPSIS
 			     const char **<[src]>, size_t <[nms]>,
 			     size_t <[len]>, mbstate_t *<[ps]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t mbsrtowcs(<[dst]>, <[src]>, <[len]>, <[ps]>)
-	wchar_t *__restrict <[dst]>;
-	const char **__restrict <[src]>;
-	size_t <[len]>;
-	mbstate_t *__restrict <[ps]>;
-
-	#include <wchar.h>
-	size_t _mbsrtowcs_r(<[ptr]>, <[dst]>, <[src]>, <[len]>, <[ps]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[dst]>;
-	const char **<[src]>;
-	size_t <[len]>;
-	mbstate_t *<[ps]>;
-
-	#include <wchar.h>
-	size_t mbsnrtowcs(<[dst]>, <[src]>, <[nms]>, <[len]>, <[ps]>)
-	wchar_t *__restrict <[dst]>;
-	const char **__restrict <[src]>;
-	size_t <[nms]>;
-	size_t <[len]>;
-	mbstate_t *__restrict <[ps]>;
-
-	#include <wchar.h>
-	size_t _mbsnrtowcs_r(<[ptr]>, <[dst]>, <[src]>, <[nms]>, <[len]>, <[ps]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[dst]>;
-	const char **<[src]>;
-	size_t <[nms]>;
-	size_t <[len]>;
-	mbstate_t *<[ps]>;
-
 DESCRIPTION
 The <<mbsrtowcs>> function converts a sequence of multibyte characters
 pointed to indirectly by <[src]> into a sequence of corresponding wide
diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 09543451c..70ed9ede6 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	mbstowcs
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int mbstowcs(wchar_t *restrict <[pwc]>, const char *restrict <[s]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int mbstowcs(<[pwc]>, <[s]>, <[n]>)
-	wchar_t *<[pwc]>;
-	const char *<[s]>;
-	size_t <[n]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mbstowcs>>.  In this case, the
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 7b8be771c..0c29cf3d9 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	mbtowc
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int mbtowc(wchar_t *restrict <[pwc]>, const char *restrict <[s]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int mbtowc(<[pwc]>, <[s]>, <[n]>)
-	wchar_t *<[pwc]>;
-	const char *<[s]>;
-	size_t <[n]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mbtowc>>.  In this case,
diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c
index 4c392947d..23aa10173 100644
--- a/newlib/libc/stdlib/mlock.c
+++ b/newlib/libc/stdlib/mlock.c
@@ -8,18 +8,11 @@  INDEX
 INDEX
 	__malloc_unlock
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <malloc.h>
 	void __malloc_lock (struct _reent *<[reent]>);
 	void __malloc_unlock (struct _reent *<[reent]>);
 
-TRAD_SYNOPSIS
-	void __malloc_lock(<[reent]>)
-	struct _reent *<[reent]>;
-
-	void __malloc_unlock(<[reent]>)
-	struct _reent *<[reent]>;
-
 DESCRIPTION
 The <<malloc>> family of routines call these functions when they need to lock
 the memory pool.  The version of these routines supplied in the library use
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index ba89f494d..88cb54c40 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -25,7 +25,7 @@  INDEX
 INDEX
 	_mallopt_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <malloc.h>
 	struct mallinfo mallinfo(void);
 	void malloc_stats(void);
@@ -35,27 +35,6 @@  ANSI_SYNOPSIS
 	void _malloc_stats_r(void *<[reent]>);
 	int _mallopt_r(void *<[reent]>, int <[parameter]>, <[value]>);
 
-TRAD_SYNOPSIS
-	#include <malloc.h>
-	struct mallinfo mallinfo();
-
-	void malloc_stats();
-
-	int mallopt(<[parameter]>, <[value]>)
-	int <[parameter]>;
-	int <[value]>;
-
-	struct mallinfo _mallinfo_r(<[reent]>);
-	char *<[reent]>;
-
-	void _malloc_stats_r(<[reent]>);
-	char *<[reent]>;
-
-	int _mallopt_r(<[reent]>, <[parameter]>, <[value]>)
-	char *<[reent]>;
-	int <[parameter]>;
-	int <[value]>;
-
 DESCRIPTION
 <<mallinfo>> returns a structure describing the current state of
 memory allocation.  The structure is defined in malloc.h.  The
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index a405b1b51..d22fc3728 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -14,16 +14,10 @@  FUNCTION
 INDEX
 	on_exit
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int on_exit (void (*<[function]>)(int, void *), void *<[arg]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int on_exit ((<[function]>, <[arg]>)
-	  void (*<[function]>)(int, void *);
-	  void *<[arg]>;
-
 DESCRIPTION
 You can use <<on_exit>> to enroll functions in a list of functions that
 will be called when your program terminates normally.  The argument is
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index 42acde4aa..aacb0a8a4 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -9,23 +9,12 @@  INDEX
 INDEX
 	rand_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int rand(void);
 	void srand(unsigned int <[seed]>);
 	int rand_r(unsigned int *<[seed]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int rand();
-
-	void srand(<[seed]>)
-	unsigned int <[seed]>;
-
-	void rand_r(<[seed]>)
-	unsigned int *<[seed]>;
-
-
 DESCRIPTION
 <<rand>> returns a different integer each time it is called; each
 integer is chosen by an algorithm designed to be unpredictable, so
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index af2be3c07..b9bf320b2 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -36,7 +36,7 @@  INDEX
 INDEX
        lcong48
 
-ANSI_SYNOPSIS
+SYNOPSIS
        #include <stdlib.h>
        double drand48(void);
        double erand48(unsigned short <[xseed]>[3]);
@@ -48,32 +48,6 @@  ANSI_SYNOPSIS
        unsigned short *seed48(unsigned short <[xseed]>[3]);
        void lcong48(unsigned short <[p]>[7]);
 
-TRAD_SYNOPSIS
-       #include <stdlib.h>
-       double drand48();
-
-       double erand48(<[xseed]>)
-       unsigned short <[xseed]>[3];
-
-       long lrand48();
-
-       long nrand48(<[xseed]>)
-       unsigned short <[xseed]>[3];
-
-       long mrand48();
-
-       long jrand48(<[xseed]>)
-       unsigned short <[xseed]>[3];
-
-       void srand48(<[seed]>)
-       long <[seed]>;
-
-       unsigned short *seed48(<[xseed]>)
-       unsigned short <[xseed]>[3];
-
-       void lcong48(<[p]>)
-       unsigned short <[p]>[7];
-
 DESCRIPTION
 The <<rand48>> family of functions generates pseudo-random numbers
 using a linear congruential algorithm working on integers 48 bits in size.
diff --git a/newlib/libc/stdlib/random.c b/newlib/libc/stdlib/random.c
index de132f363..7abca6da4 100644
--- a/newlib/libc/stdlib/random.c
+++ b/newlib/libc/stdlib/random.c
@@ -7,7 +7,7 @@  INDEX
 INDEX
 	srandom
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#define _XOPEN_SOURCE 500
 	#include <stdlib.h>
 	long int random(void);
diff --git a/newlib/libc/stdlib/rpmatch.c b/newlib/libc/stdlib/rpmatch.c
index 0bbdf43ed..93d2c3f11 100644
--- a/newlib/libc/stdlib/rpmatch.c
+++ b/newlib/libc/stdlib/rpmatch.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	rpmatch
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int rpmatch(const char *<[response]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int rpmatch(<[response]>)
-	const char *<[response]>;
-
 DESCRIPTION
 The <<rpmatch>> function determines whether <[response]> is an affirmative
 or negative response to a question according to the current locale.
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 82e847c40..236daa5f6 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -23,7 +23,7 @@  INDEX
 INDEX
 	_strtod_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         double strtod(const char *restrict <[str]>, char **restrict <[tail]>);
         float strtof(const char *restrict <[str]>, char **restrict <[tail]>);
@@ -42,21 +42,6 @@  ANSI_SYNOPSIS
         double _strtod_r(void *<[reent]>,
                          const char *restrict <[str]>, char **restrict <[tail]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        double strtod(<[str]>,<[tail]>)
-        char *<[str]>;
-        char **<[tail]>;
-
-        float strtof(<[str]>,<[tail]>)
-        char *<[str]>;
-        char **<[tail]>;
-
-        double _strtod_r(<[reent]>,<[str]>,<[tail]>)
-	char *<[reent]>;
-        char *<[str]>;
-        char **<[tail]>;
-
 DESCRIPTION
 	<<strtod>>, <<strtof>>, <<strtold>> parse the character string
 	<[str]>, producing a substring which can be converted to a double,
diff --git a/newlib/libc/stdlib/strtol.c b/newlib/libc/stdlib/strtol.c
index 276ad1340..ba58b6e8c 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_strtol_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         long strtol(const char *restrict <[s]>, char **restrict <[ptr]>,
 		    int <[base]>);
@@ -23,19 +23,6 @@  ANSI_SYNOPSIS
         long _strtol_r(void *<[reent]>, const char *restrict <[s]>,
 		       char **restrict <[ptr]>,int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	long strtol (<[s]>, <[ptr]>, <[base]>)
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
-	long _strtol_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<strtol>> converts the string <<*<[s]>>> to
 a <<long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index e61a62a7d..2922452c7 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_strtoll_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         long long strtoll(const char *restrict <[s]>, char **restrict <[ptr]>,
 			  int <[base]>);
@@ -25,19 +25,6 @@  ANSI_SYNOPSIS
 			     const char *restrict <[s]>,
 			     char **restrict <[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	long long strtoll (<[s]>, <[ptr]>, <[base]>)
-        const char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
-	long long _strtoll_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	char *<[reent]>;
-        const char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<strtoll>> converts the string <<*<[s]>>> to
 a <<long long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index aa5897e13..9414661ec 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_strtoul_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         unsigned long strtoul(const char *restrict <[s]>,
 			      char **restrict <[ptr]>, int <[base]>);
@@ -24,19 +24,6 @@  ANSI_SYNOPSIS
         unsigned long _strtoul_r(void *<[reent]>, const char *restrict <[s]>,
 				 char **restrict <[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-        unsigned long strtoul(<[s]>, <[ptr]>, <[base]>)
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
-        unsigned long _strtoul_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<strtoul>> converts the string <<*<[s]>>> to
 an <<unsigned long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index ba6452e62..aff1fc7c3 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -8,7 +8,7 @@  INDEX
 INDEX
 	strtoull_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
         unsigned long long strtoull(const char *restrict <[s]>,
 				    char **restrict <[ptr]>, int <[base]>);
@@ -22,19 +22,6 @@  ANSI_SYNOPSIS
 				       const char *restrict <[s]>,
 				       char **restrict <[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-        unsigned long long strtoull(<[s]>, <[ptr]>, <[base]>)
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
-        unsigned long long _strtoull_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<strtoull>> converts the string <<*<[s]>>> to
 an <<unsigned long long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 135a9d05b..6cacfa587 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -7,21 +7,12 @@  INDEX
 INDEX
 	_system_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int system(char *<[s]>);
 
 	int _system_r(void *<[reent]>, char *<[s]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int system(<[s]>)
-	char *<[s]>;
-
-	int _system_r(<[reent]>, <[s]>)
-	char *<[reent]>;
-	char *<[s]>;
-
 DESCRIPTION
 
 Use <<system>> to pass a command string <<*<[s]>>> to <</bin/sh>> on
diff --git a/newlib/libc/stdlib/utoa.c b/newlib/libc/stdlib/utoa.c
index 7738c2321..75e8616ea 100644
--- a/newlib/libc/stdlib/utoa.c
+++ b/newlib/libc/stdlib/utoa.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	utoa
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	char *utoa(unsigned <[value]>, char *<[str]>, int <[base]>);
 	char *__utoa(unsigned <[value]>, char *<[str]>, int <[base]>);
diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c
index 8e5c38703..ed5f36968 100644
--- a/newlib/libc/stdlib/wcsnrtombs.c
+++ b/newlib/libc/stdlib/wcsnrtombs.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_wcsnrtombs_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcsrtombs(char *__restrict <[dst]>,
 			 const wchar_t **__restrict <[src]>, size_t <[len]>,
@@ -33,39 +33,6 @@  ANSI_SYNOPSIS
 			     const wchar_t **<[src]>, size_t <[nwc]>,
 			     size_t <[len]>, mbstate_t *<[ps]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcsrtombs(<[dst]>, <[src]>, <[len]>, <[ps]>)
-	char *__restrict <[dst]>;
-	const wchar_t **__restrict <[src]>;
-	size_t <[len]>;
-	mbstate_t *__restrict <[ps]>;
-
-	#include <wchar.h>
-	size_t _wcsrtombs_r(<[ptr]>, <[dst]>, <[src]>, <[len]>, <[ps]>)
-	struct _rent *<[ptr]>;
-	char *<[dst]>;
-	const wchar_t **<[src]>;
-	size_t <[len]>;
-	mbstate_t *<[ps]>;
-
-	#include <wchar.h>
-	size_t wcsnrtombs(<[dst]>, <[src]>, <[nwc]>, <[len]>, <[ps]>)
-	char *__restrict <[dst]>;
-	const wchar_t **__restrict <[src]>;
-	size_t <[nwc]>;
-	size_t <[len]>;
-	mbstate_t *__restrict <[ps]>;
-
-	#include <wchar.h>
-	size_t _wcsnrtombs_r(<[ptr]>, <[dst]>, <[src]>, <[nwc]>, <[len]>, <[ps]>)
-	struct _rent *<[ptr]>;
-	char *<[dst]>;
-	const wchar_t **<[src]>;
-	size_t <[nwc]>;
-	size_t <[len]>;
-	mbstate_t *<[ps]>;
-
 DESCRIPTION
 The <<wcsrtombs>> function converts a string of wide characters indirectly
 pointed to by <[src]> to a corresponding multibyte character string stored in
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 605fca40b..201a2c32c 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -26,7 +26,7 @@  INDEX
 INDEX
 	_wcstof_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdlib.h>
         double wcstod(const wchar_t *__restrict <[str]>,
 		      wchar_t **__restrict <[tail]>);
@@ -49,26 +49,6 @@  ANSI_SYNOPSIS
         float _wcstof_r(void *<[reent]>,
                          const wchar_t *<[str]>, wchar_t **<[tail]>);
 
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        double wcstod(<[str]>,<[tail]>)
-        wchar_t *__restrict <[str]>;
-        wchar_t **__restrict <[tail]>;
-
-        float wcstof(<[str]>,<[tail]>)
-        wchar_t *__restrict <[str]>;
-        wchar_t **__restrict <[tail]>;
-
-        double _wcstod_r(<[reent]>,<[str]>,<[tail]>)
-	wchar_t *<[reent]>;
-        wchar_t *<[str]>;
-        wchar_t **<[tail]>;
-
-        float _wcstof_r(<[reent]>,<[str]>,<[tail]>)
-	wchar_t *<[reent]>;
-        wchar_t *<[str]>;
-        wchar_t **<[tail]>;
-
 DESCRIPTION
 	<<wcstod>>, <<wcstof>>, <<wcstold>> parse the wide-character string
 	<[str]>, producing a substring which can be converted to a double,
diff --git a/newlib/libc/stdlib/wcstol.c b/newlib/libc/stdlib/wcstol.c
index 4c7480594..417a46d63 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_wcstol_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
         long wcstol(const wchar_t *__restrict <[s]>,
 		    wchar_t **__restrict <[ptr]>, int <[base]>);
@@ -24,19 +24,6 @@  ANSI_SYNOPSIS
         long _wcstol_r(void *<[reent]>, const wchar_t *<[s]>,
 		       wchar_t **<[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	long wcstol (<[s]>, <[ptr]>, <[base]>)
-        wchar_t *__restrict <[s]>;
-        wchar_t **__restrict <[ptr]>;
-        int <[base]>;
-
-	long _wcstol_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	struct _reent *<[reent]>;
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<wcstol>> converts the wide string <<*<[s]>>> to
 a <<long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index 2996b11a6..3a7a0e28d 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_wcstoll_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
         long long wcstoll(const wchar_t *__restrict <[s]>,
 			  wchar_t **__restrict <[ptr]>,int <[base]>);
@@ -24,19 +24,6 @@  ANSI_SYNOPSIS
         long long _wcstoll_r(void *<[reent]>, const wchar_t *<[s]>,
 			     wchar_t **<[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	long long wcstoll (<[s]>, <[ptr]>, <[base]>)
-        const wchar_t *__restrict <[s]>;
-        wchar_t **__restrict <[ptr]>;
-        int <[base]>;
-
-	long long _wcstoll_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	wchar_t *<[reent]>;
-        const wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<wcstoll>> converts the wide string <<*<[s]>>> to
 a <<long long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index b0123a313..9e1937887 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	wcstombs
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	size_t wcstombs(char *restrict <[s]>, const wchar_t *restrict <[pwc]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	size_t wcstombs(<[s]>, <[pwc]>, <[n]>)
-	char *<[s]>;
-	const wchar_t *<[pwc]>;
-	size_t <[n]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<wcstombs>>.  In this case,
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index e87b2ecc9..d649810ea 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_wcstoul_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
         unsigned long wcstoul(const wchar_t *__restrict <[s]>,
 			      wchar_t **__restrict <[ptr]>, int <[base]>);
@@ -24,19 +24,6 @@  ANSI_SYNOPSIS
         unsigned long _wcstoul_r(void *<[reent]>, const wchar_t *<[s]>,
 				 wchar_t **<[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-        unsigned long wcstoul(<[s]>, <[ptr]>, <[base]>)
-        wchar_t *__restrict <[s]>;
-        wchar_t **__restrict <[ptr]>;
-        int <[base]>;
-
-        unsigned long _wcstoul_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	wchar_t *<[reent]>;
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<wcstoul>> converts the wide string <<*<[s]>>> to
 an <<unsigned long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 131a83795..4bb0cd781 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	_wcstoull_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
         unsigned long long wcstoull(const wchar_t *__restrict <[s]>,
 				    wchar_t **__restrict <[ptr]>,
@@ -26,19 +26,6 @@  ANSI_SYNOPSIS
         unsigned long long _wcstoull_r(void *<[reent]>, const wchar_t *<[s]>,
 				       wchar_t **<[ptr]>, int <[base]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-        unsigned long long wcstoull(<[s]>, <[ptr]>, <[base]>)
-        wchar_t *__restrict <[s]>;
-        wchar_t **__restrict <[ptr]>;
-        int <[base]>;
-
-        unsigned long long _wcstoull_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
-	wchar_t *<[reent]>;
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
-        int <[base]>;
-
 DESCRIPTION
 The function <<wcstoull>> converts the wide string <<*<[s]>>> to
 an <<unsigned long long>>. First, it breaks down the string into three parts:
diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c
index 13892ffa4..8b267a324 100644
--- a/newlib/libc/stdlib/wctomb.c
+++ b/newlib/libc/stdlib/wctomb.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	wctomb
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	int wctomb(char *<[s]>, wchar_t <[wchar]>);
 
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int wctomb(<[s]>, <[wchar]>)
-	char *<[s]>;
-	wchar_t <[wchar]>;
-
 DESCRIPTION
 When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<wctomb>>.  The