[15/24] string: remove TRAD_SYNOPSIS

Message ID 20171130102858.16160-16-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/string/bcmp.c          |  9 +--------
 newlib/libc/string/bcopy.c         |  8 +-------
 newlib/libc/string/bzero.c         |  8 +-------
 newlib/libc/string/index.c         |  8 +-------
 newlib/libc/string/memccpy.c       |  9 +--------
 newlib/libc/string/memchr.c        |  9 +--------
 newlib/libc/string/memcmp.c        |  9 +--------
 newlib/libc/string/memcpy.c        |  9 +--------
 newlib/libc/string/memmem.c        |  2 +-
 newlib/libc/string/memmove.c       |  9 +--------
 newlib/libc/string/mempcpy.c       |  8 +-------
 newlib/libc/string/memrchr.c       |  9 +--------
 newlib/libc/string/memset.c        |  9 +--------
 newlib/libc/string/rawmemchr.c     |  8 +-------
 newlib/libc/string/rindex.c        |  8 +-------
 newlib/libc/string/stpcpy.c        |  8 +-------
 newlib/libc/string/stpncpy.c       |  9 +--------
 newlib/libc/string/strcasecmp.c    |  8 +-------
 newlib/libc/string/strcasecmp_l.c  |  2 +-
 newlib/libc/string/strcasestr.c    |  8 +-------
 newlib/libc/string/strcat.c        |  8 +-------
 newlib/libc/string/strchr.c        |  8 +-------
 newlib/libc/string/strchrnul.c     |  8 +-------
 newlib/libc/string/strcmp.c        |  8 +-------
 newlib/libc/string/strcoll.c       |  8 +-------
 newlib/libc/string/strcoll_l.c     |  2 +-
 newlib/libc/string/strcpy.c        |  8 +-------
 newlib/libc/string/strcspn.c       |  7 +------
 newlib/libc/string/strerror.c      |  7 +------
 newlib/libc/string/strerror_r.c    |  9 +--------
 newlib/libc/string/strlen.c        |  7 +------
 newlib/libc/string/strlwr.c        |  7 +------
 newlib/libc/string/strncasecmp.c   |  9 +--------
 newlib/libc/string/strncasecmp_l.c |  2 +-
 newlib/libc/string/strncat.c       |  9 +--------
 newlib/libc/string/strncmp.c       |  9 +--------
 newlib/libc/string/strncpy.c       |  9 +--------
 newlib/libc/string/strnlen.c       |  8 +-------
 newlib/libc/string/strnstr.c       |  2 +-
 newlib/libc/string/strpbrk.c       |  8 +-------
 newlib/libc/string/strrchr.c       |  8 +-------
 newlib/libc/string/strsignal.c     |  7 +------
 newlib/libc/string/strspn.c        |  8 +-------
 newlib/libc/string/strstr.c        |  8 +-------
 newlib/libc/string/strtok.c        | 17 +----------------
 newlib/libc/string/strupr.c        |  7 +------
 newlib/libc/string/strverscmp.c    |  9 +--------
 newlib/libc/string/strxfrm.c       |  9 +--------
 newlib/libc/string/strxfrm_l.c     |  2 +-
 newlib/libc/string/swab.c          |  8 +-------
 newlib/libc/string/wcpcpy.c        |  7 +------
 newlib/libc/string/wcpncpy.c       |  8 +-------
 newlib/libc/string/wcscasecmp.c    |  8 +-------
 newlib/libc/string/wcscasecmp_l.c  |  2 +-
 newlib/libc/string/wcscat.c        |  7 +------
 newlib/libc/string/wcschr.c        |  7 +------
 newlib/libc/string/wcscmp.c        |  6 +-----
 newlib/libc/string/wcscoll.c       |  8 +-------
 newlib/libc/string/wcscoll_l.c     |  2 +-
 newlib/libc/string/wcscpy.c        |  7 +------
 newlib/libc/string/wcscspn.c       |  7 +------
 newlib/libc/string/wcsdup.c        |  8 +-------
 newlib/libc/string/wcslcat.c       |  9 +--------
 newlib/libc/string/wcslcpy.c       |  9 +--------
 newlib/libc/string/wcslen.c        |  6 +-----
 newlib/libc/string/wcsncasecmp.c   |  9 +--------
 newlib/libc/string/wcsncasecmp_l.c |  2 +-
 newlib/libc/string/wcsncat.c       |  8 +-------
 newlib/libc/string/wcsncmp.c       |  8 +-------
 newlib/libc/string/wcsncpy.c       |  8 +-------
 newlib/libc/string/wcsnlen.c       |  8 +-------
 newlib/libc/string/wcspbrk.c       |  7 +------
 newlib/libc/string/wcsrchr.c       |  8 +-------
 newlib/libc/string/wcsspn.c        |  7 +------
 newlib/libc/string/wcsstr.c        |  7 +------
 newlib/libc/string/wcstok.c        |  9 +--------
 newlib/libc/string/wcswidth.c      |  8 +-------
 newlib/libc/string/wcsxfrm.c       |  9 +--------
 newlib/libc/string/wcsxfrm_l.c     |  2 +-
 newlib/libc/string/wcwidth.c       |  7 +------
 newlib/libc/string/wmemchr.c       |  8 +-------
 newlib/libc/string/wmemcmp.c       |  8 +-------
 newlib/libc/string/wmemcpy.c       |  8 +-------
 newlib/libc/string/wmemmove.c      |  8 +-------
 newlib/libc/string/wmemset.c       |  8 +-------
 85 files changed, 85 insertions(+), 546 deletions(-)

-- 
2.15.0

Patch

diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 8d6e12ffb..86aada10c 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	bcmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	int bcmp(<[s1]>, <[s2]>, <[n]>)
-	const void *<[s1]>;
-	const void *<[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	This function compares not more than <[n]> bytes of the
 	object pointed to by <[s1]> with the object pointed to by <[s2]>.
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 2881fd92c..22a7f1bfe 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<bcopy>>---copy memory regions
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	void bcopy(<[in]>, <[out]>, <[n]>
-	const void *<[in]>;
-	void *<[out]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	This function copies <[n]> bytes from the memory region
 	pointed to by <[in]> to the memory region pointed to by
diff --git a/newlib/libc/string/bzero.c b/newlib/libc/string/bzero.c
index e99529af6..dc52170c5 100644
--- a/newlib/libc/string/bzero.c
+++ b/newlib/libc/string/bzero.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	bzero
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	void bzero(void *<[b]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	void bzero(<[b]>, <[length]>)
-	void *<[b]>;
-	size_t <[length]>;
-
 DESCRIPTION
 <<bzero>> initializes <[length]> bytes of memory, starting at address
 <[b]>, to zero.
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index ec241ffa8..2c4b49016 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	index
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	char * index(const char *<[string]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	char * index(<[string]>, <[c]>);
-	char *<[string]>;
-	int *<[c]>;
-
 DESCRIPTION
 	This function finds the first occurence of <[c]> (converted to
 	a char) in the string pointed to by <[string]> (including the
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 332ed4660..219aa5cfe 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -2,18 +2,11 @@ 
 FUNCTION
         <<memccpy>>---copy memory regions with end-token check
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <string.h>
         void* memccpy(void *restrict <[out]>, const void *restrict <[in]>, 
                       int <[endchar]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-        void *memccpy(<[out]>, <[in]>, <[endchar]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-	int <[endchar]>;
-        size_t <[n]>;
-
 DESCRIPTION
         This function copies up to <[n]> bytes from the memory region
         pointed to by <[in]> to the memory region pointed to by
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index db0af7cd7..152cd718a 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	memchr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	void *memchr(const void *<[src]>, int <[c]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *memchr(<[src]>, <[c]>, <[length]>)
-	void *<[src]>;
-	void *<[c]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	This function searches memory starting at <<*<[src]>>> for the
 	character <[c]>.  The search only ends with the first
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 4a871fa60..8f86e7afd 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	memcmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	int memcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	int memcmp(<[s1]>, <[s2]>, <[n]>)
-	void *<[s1]>;
-	void *<[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	This function compares not more than <[n]> characters of the
 	object pointed to by <[s1]> with the object pointed to by <[s2]>.
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index 5f27bca72..c76ab484f 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -2,18 +2,11 @@ 
 FUNCTION
         <<memcpy>>---copy memory regions
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <string.h>
         void* memcpy(void *restrict <[out]>, const void *restrict <[in]>,
                      size_t <[n]>);
 
-TRAD_SYNOPSIS
-        #include <string.h>
-        void *memcpy(<[out]>, <[in]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-        size_t <[n]>;
-
 DESCRIPTION
         This function copies <[n]> bytes from the memory region
         pointed to by <[in]> to the memory region pointed to by
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 25704e467..59e19d245 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -11,7 +11,7 @@  FUNCTION
 INDEX
 	memmem
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *memmem(const void *<[s1]>, size_t <[l1]>, const void *<[s2]>,
 		     size_t <[l2]>);
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index a037c7c2f..e6275a7e1 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	memmove
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	void *memmove(void *<[dst]>, const void *<[src]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *memmove(<[dst]>, <[src]>, <[length]>)
-	void *<[dst]>;
-	void *<[src]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	This function moves <[length]> characters from the block of
 	memory starting at <<*<[src]>>> to the memory starting at
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 5c6738f22..1a8e7cd34 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -2,16 +2,10 @@ 
 FUNCTION
         <<mempcpy>>---copy memory regions and return end pointer
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <string.h>
         void* mempcpy(void *<[out]>, const void *<[in]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-        void *mempcpy(<[out]>, <[in]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-        size_t <[n]>;
-
 DESCRIPTION
         This function copies <[n]> bytes from the memory region
         pointed to by <[in]> to the memory region pointed to by
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 60dee42ed..974cebc16 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	memrchr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	void *memrchr(const void *<[src]>, int <[c]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *memrchr(<[src]>, <[c]>, <[length]>)
-	void *<[src]>;
-	void *<[c]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	This function searches memory starting at <[length]> bytes
 	beyond <<*<[src]>>> backwards for the character <[c]>.
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index b84e155f7..7d05478eb 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	memset
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	void *memset(void *<[dst]>, int <[c]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *memset(<[dst]>, <[c]>, <[length]>)
-	void *<[dst]>;
-	int <[c]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	This function converts the argument <[c]> into an unsigned
 	char and fills the first <[length]> characters of the array
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 4b5a4cdeb..c1b360dd3 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	rawmemchr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	void *rawmemchr(const void *<[src]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *rawmemchr(<[src]>, <[c]>)
-	void *<[src]>;
-	void *<[c]>;
-
 DESCRIPTION
 	This function searches memory starting at <<*<[src]>>> for the
 	character <[c]>.  The search only ends with the first occurrence
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index daa1c5237..3284361f8 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	rindex
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char * rindex(const char *<[string]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	char * rindex(<[string]>, <[c]>);
-	char *<[string]>;
-	int *<[c]>;
-
 DESCRIPTION
 	This function finds the last occurence of <[c]> (converted to
 	a char) in the string pointed to by <[string]> (including the
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index bc58f4771..6272f1da6 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	stpcpy
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *stpcpy(char *restrict <[dst]>, const char *restrict <[src]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *stpcpy(<[dst]>, <[src]>)
-	char *<[dst]>;
-	char *<[src]>;
-
 DESCRIPTION
 	<<stpcpy>> copies the string pointed to by <[src]>
 	(including the terminating null character) to the array
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index abd9bbdbf..aa5acd45f 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	stpncpy
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *stpncpy(char *restrict <[dst]>, const char *restrict <[src]>,
                       size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *stpncpy(<[dst]>, <[src]>, <[length]>)
-	char *<[dst]>;
-	char *<[src]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	<<stpncpy>> copies not more than <[length]> characters from the
 	the string pointed to by <[src]> (including the terminating
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index df8510b13..a6c34862f 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcasecmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	int strcasecmp(const char *<[a]>, const char *<[b]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	int strcasecmp(<[a]>, <[b]>)
-	char *<[a]>;
-	char *<[b]>;
-
 DESCRIPTION
 	<<strcasecmp>> compares the string at <[a]> to
 	the string at <[b]> in a case-insensitive manner.
diff --git a/newlib/libc/string/strcasecmp_l.c b/newlib/libc/string/strcasecmp_l.c
index f87039d91..587f56ee1 100644
--- a/newlib/libc/string/strcasecmp_l.c
+++ b/newlib/libc/string/strcasecmp_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	strcasecmp_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	int strcasecmp_l(const char *<[a]>, const char *<[b]>,
 			 locale_t <[locale]>);
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 8fff00b00..599f50227 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcasestr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strcasestr(const char *<[s]>, const char *<[find]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	int strcasecmp(<[s]>, <[find]>)
-	char *<[s]>;
-	char *<[find]>;
-
 DESCRIPTION
 	<<strcasestr>> searchs the string <[s]> for
 	the first occurrence of the sequence <[find]>.  <<strcasestr>>
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index 1e4614991..44b6b03f0 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcat
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strcat(char *restrict <[dst]>, const char *restrict <[src]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strcat(<[dst]>, <[src]>)
-	char *<[dst]>;
-	char *<[src]>;
-
 DESCRIPTION
 	<<strcat>> appends a copy of the string pointed to by <[src]>
 	(including the terminating null character) to the end of the
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index e921b5db7..7147bd457 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strchr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char * strchr(const char *<[string]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char * strchr(<[string]>, <[c]>);
-	const char *<[string]>;
-	int <[c]>;
-
 DESCRIPTION
 	This function finds the first occurence of <[c]> (converted to
 	a char) in the string pointed to by <[string]> (including the
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index afeef434e..3b6cd62fb 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strchrnul
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char * strchrnul(const char *<[string]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char * strchrnul(<[string]>, <[c]>);
-	const char *<[string]>;
-	int <[c]>;
-
 DESCRIPTION
 	This function finds the first occurence of <[c]> (converted to
 	a char) in the string pointed to by <[string]> (including the
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index 81d65272e..d5e9148ef 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	int strcmp(const char *<[a]>, const char *<[b]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	int strcmp(<[a]>, <[b]>)
-	char *<[a]>;
-	char *<[b]>;
-
 DESCRIPTION
 	<<strcmp>> compares the string at <[a]> to
 	the string at <[b]>.
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index a6bb31a4e..551ede65b 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcoll
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	int strcoll(const char *<[stra]>, const char * <[strb]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	int strcoll(<[stra]>, <[strb]>)
-	char *<[stra]>;
-	char *<[strb]>;
-
 DESCRIPTION
 	<<strcoll>> compares the string pointed to by <[stra]> to
 	the string pointed to by <[strb]>, using an interpretation
diff --git a/newlib/libc/string/strcoll_l.c b/newlib/libc/string/strcoll_l.c
index 5032f8439..89a7d0535 100644
--- a/newlib/libc/string/strcoll_l.c
+++ b/newlib/libc/string/strcoll_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	strcoll_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	int strcoll_l(const char *<[stra]>, const char * <[strb]>,
 		      locale_t <[locale]>);
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 3dc3c33f6..9670d2c13 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strcpy
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strcpy(char *<[dst]>, const char *<[src]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strcpy(<[dst]>, <[src]>)
-	char *<[dst]>;
-	char *<[src]>;
-
 DESCRIPTION
 	<<strcpy>> copies the string pointed to by <[src]>
 	(including the terminating null character) to the array
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 403330c94..f80b61f37 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -5,14 +5,9 @@  FUNCTION
 INDEX
 	strcspn
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	size_t strcspn(const char *<[s1]>, const char *<[s2]>);
 
-TRAD_SYNOPSIS
-	size_t strcspn(<[s1]>, <[s2]>)
-	char *<[s1]>;
-	char *<[s2]>;
-
 DESCRIPTION
 	This function computes the length of the initial part of
 	the string pointed to by <[s1]> which consists entirely of
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index d5f0a3ec9..8da7d5185 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -15,18 +15,13 @@  INDEX
 INDEX
 	strerror_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strerror(int <[errnum]>);
 	char *strerror_l(int <[errnum]>, locale_t <[locale]>);
 	char *_strerror_r(struct _reent <[ptr]>, int <[errnum]>,
 			  int <[internal]>, int *<[error]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strerror(<[errnum]>)
-	int <[errnum]>;
-
 DESCRIPTION
 <<strerror>> converts the error number <[errnum]> into a
 string.  The value of <[errnum]> is usually a copy of <<errno>>.
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index d26a412a5..af9337563 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -6,7 +6,7 @@  FUNCTION
 INDEX
 	strerror_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	#ifdef _GNU_SOURCE
 	char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
@@ -14,13 +14,6 @@  ANSI_SYNOPSIS
 	int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
 	#endif
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strerror_r(<[errnum]>, <[buffer]>, <[n]>)
-	int <[errnum]>;
-	char *<[buffer]>;
-	size_t <[n]>;
-
 DESCRIPTION
 <<strerror_r>> converts the error number <[errnum]> into a
 string and copies the result into the supplied <[buffer]> for
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index a796d2738..2e8c09f7f 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	strlen
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strlen(const char *<[str]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	size_t strlen(<[str]>)
-	char *<[src]>;
-
 DESCRIPTION
 	The <<strlen>> function works out the length of the string
 	starting at <<*<[str]>>> by counting chararacters until it
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index 3b73dba4b..c47ff4859 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	strlwr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strlwr(char *<[a]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strlwr(<[a]>)
-	char *<[a]>;
-
 DESCRIPTION
 	<<strlwr>> converts each character in the string at <[a]> to
 	lowercase.
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index 828f30bf9..c06294232 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	strncasecmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <strings.h>
-	int strncasecmp(<[a]>, <[b]>, <[length]>)
-	char *<[a]>;
-	char *<[b]>;
-	size_t <[length]>
-
 DESCRIPTION
 	<<strncasecmp>> compares up to <[length]> characters
 	from the string at <[a]> to the string at <[b]> in a 
diff --git a/newlib/libc/string/strncasecmp_l.c b/newlib/libc/string/strncasecmp_l.c
index 41ae58265..b15c6c545 100644
--- a/newlib/libc/string/strncasecmp_l.c
+++ b/newlib/libc/string/strncasecmp_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	strncasecmp_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <strings.h>
 	int strncasecmp_l(const char *<[a]>, const char * <[b]>,
 			  size_t <[length]>, locale_t <[locale]>);
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 2f5a061bf..761cf87a7 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	strncat
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strncat(char *restrict <[dst]>, const char *restrict <[src]>,
                       size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strncat(<[dst]>, <[src]>, <[length]>)
-	char *<[dst]>;
-	char *<[src]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	<<strncat>> appends not more than <[length]> characters from
 	the string pointed to by <[src]> (including the	terminating
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 9801b7d92..3bbe47bcc 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	strncmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	int strncmp(const char *<[a]>, const char * <[b]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	int strncmp(<[a]>, <[b]>, <[length]>)
-	char *<[a]>;
-	char *<[b]>;
-	size_t <[length]>
-
 DESCRIPTION
 	<<strncmp>> compares up to <[length]> characters
 	from the string at <[a]> to the string at <[b]>.
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index ff5d0d409..83596f408 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	strncpy
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strncpy(char *restrict <[dst]>, const char *restrict <[src]>,
                       size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strncpy(<[dst]>, <[src]>, <[length]>)
-	char *<[dst]>;
-	char *<[src]>;
-	size_t <[length]>;
-
 DESCRIPTION
 	<<strncpy>> copies not more than <[length]> characters from the
 	the string pointed to by <[src]> (including the terminating
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index ed60e9371..07ece0d8b 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strnlen
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strnlen(const char *<[str]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	size_t strnlen(<[str]>, <[n]>)
-	char *<[src]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<strnlen>> function works out the length of the string
 	starting at <<*<[str]>>> by counting chararacters until it
diff --git a/newlib/libc/string/strnstr.c b/newlib/libc/string/strnstr.c
index 947355fed..cb5f71914 100644
--- a/newlib/libc/string/strnstr.c
+++ b/newlib/libc/string/strnstr.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	strnstr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strnstr(const char *<[s1]>, const char *<[s2]>, size_t <[n]>);
 
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index 5668db395..4507a86a4 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strpbrk
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strpbrk(const char *<[s1]>, const char *<[s2]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strpbrk(<[s1]>, <[s2]>)
-	char *<[s1]>;
-	char *<[s2]>;
-
 DESCRIPTION
 	This function locates the first occurence in the string
 	pointed to by <[s1]> of any character in string pointed to by
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 4f903afe2..8217c6df3 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strrchr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char * strrchr(const char *<[string]>, int <[c]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char * strrchr(<[string]>, <[c]>);
-	char *<[string]>;
-	int *<[c]>;
-
 DESCRIPTION
 	This function finds the last occurence of <[c]> (converted to
 	a char) in the string pointed to by <[string]> (including the
diff --git a/newlib/libc/string/strsignal.c b/newlib/libc/string/strsignal.c
index e32c9a7be..86a0e5dd9 100644
--- a/newlib/libc/string/strsignal.c
+++ b/newlib/libc/string/strsignal.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	strsignal
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strsignal(int <[signal]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strsignal(<[signal]>)
-	int <[signal]>;
-
 DESCRIPTION
 <<strsignal>> converts the signal number <[signal]> into a
 string.  If <[signal]> is not a known signal number, the result
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 32b921b10..3f43b8f82 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strspn
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strspn(const char *<[s1]>, const char *<[s2]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	size_t strspn(<[s1]>, <[s2]>)
-	char *<[s1]>;
-	char *<[s2]>;
-
 DESCRIPTION
 	This function computes the length of the initial segment of
 	the string pointed to by <[s1]> which consists entirely of
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 0480bce0a..288c74466 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	strstr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strstr(const char *<[s1]>, const char *<[s2]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strstr(<[s1]>, <[s2]>)
-	char *<[s1]>;
-	char *<[s2]>;
-
 DESCRIPTION
 	Locates the first occurrence in the string pointed to by <[s1]> of
 	the sequence of characters in the string pointed to by <[s2]>
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 8d07ab387..a24c538e4 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -11,7 +11,7 @@  INDEX
 INDEX
 	strsep
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
       	char *strtok(char *restrict <[source]>,
                      const char *restrict <[delimiters]>);
@@ -20,21 +20,6 @@  ANSI_SYNOPSIS
                        char **<[lasts]>);
 	char *strsep(char **<[source_ptr]>, const char *<[delimiters]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strtok(<[source]>, <[delimiters]>);
-	char *<[source]>;
-	char *<[delimiters]>;
-
-	char *strtok_r(<[source]>, <[delimiters]>, <[lasts]>);
-	char *<[source]>;
-	char *<[delimiters]>;
-	char **<[lasts]>;
-
-	char *strsep(<[source_ptr]>, <[delimiters]>);
-	char **<[source_ptr]>;
-	char *<[delimiters]>;
-
 DESCRIPTION
 	The <<strtok>> function is used to isolate sequential tokens in a 
 	null-terminated string, <<*<[source]>>>. These tokens are delimited 
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index 350618e78..dbec79e46 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	strupr
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	char *strupr(char *<[a]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strupr(<[a]>)
-	char *<[a]>;
-
 DESCRIPTION
 	<<strupr>> converts each character in the string at <[a]> to
 	uppercase.
diff --git a/newlib/libc/string/strverscmp.c b/newlib/libc/string/strverscmp.c
index 83f053222..04aa7213a 100644
--- a/newlib/libc/string/strverscmp.c
+++ b/newlib/libc/string/strverscmp.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	strverscmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#define _GNU_SOURCE
 	#include <string.h>
 	int strverscmp(const char *<[a]>, const char *<[b]>);
 
-TRAD_SYNOPSIS
-	#define _GNU_SOURCE
-	#include <string.h>
-	int strverscmp(<[a]>, <[b]>)
-	char *<[a]>;
-	char *<[b]>;
-
 DESCRIPTION
 	<<strverscmp>> compares the string at <[a]> to
 	the string at <[b]> in a version-logical order.
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index edc1272de..de397210b 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	strxfrm
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strxfrm(char *restrict <[s1]>, const char *restrict <[s2]>,
                        size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <string.h>
-	size_t strxfrm(<[s1]>, <[s2]>, <[n]>);
-	char *<[s1]>;
-	char *<[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	This function transforms the string pointed to by <[s2]> and
 	places the resulting string into the array pointed to by
diff --git a/newlib/libc/string/strxfrm_l.c b/newlib/libc/string/strxfrm_l.c
index a1f4fe295..0ac52432c 100644
--- a/newlib/libc/string/strxfrm_l.c
+++ b/newlib/libc/string/strxfrm_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	strxfrm_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <string.h>
 	size_t strxfrm_l(char *restrict <[s1]>, const char *restrict <[s2]>,
                        size_t <[n]>, locale_t <[locale]>);
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index aee076319..ecf5abed9 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<swab>>---swap adjacent bytes
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <unistd.h>
 	void swab(const void *<[in]>, void *<[out]>, ssize_t <[n]>);
 
-TRAD_SYNOPSIS
-	void swab(<[in]>, <[out]>, <[n]>
-	void *<[in]>;
-	void *<[out]>;
-	ssize_t <[n]>;
-
 DESCRIPTION
 	This function copies <[n]> bytes from the memory region
 	pointed to by <[in]> to the memory region pointed to by
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index e1d9ad073..f0f9c4a08 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -2,15 +2,10 @@ 
 FUNCTION
 	<<wcpcpy>>---copy a wide-character string returning a pointer to its end
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcpcpy(wchar_t *<[s1]>, const wchar_t *<[s2]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcpcpy(<[s1]>, <[s2]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-
 DESCRIPTION
 	The <<wcpcpy>> function copies the wide-character string pointed to by
 	<[s2]> (including the terminating null wide-character code) into the
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index 87843b422..8f7ee796f 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -2,17 +2,11 @@ 
 FUNCTION
 	<<wcpncpy>>---copy part of a wide-character string returning a pointer to its end
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcpncpy(wchar_t *__restrict <[s1]>,
 			 const wchar_t *__restrict <[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcpncpy(<[s1]>, <[s2]>, <[n]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wcpncpy>> function copies not more than n wide-character codes
 	(wide-character codes that follow a null wide-character code are not
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 05f95619d..26c7cc237 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	wcscasecmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcscasecmp(const wchar_t *<[a]>, const wchar_t *<[b]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcscasecmp(<[a]>, <[b]>)
-	wchar_t *<[a]>;
-	wchar_t *<[b]>;
-
 DESCRIPTION
 	<<wcscasecmp>> compares the wide character string at <[a]> to
 	the wide character string at <[b]> in a case-insensitive manner.
diff --git a/newlib/libc/string/wcscasecmp_l.c b/newlib/libc/string/wcscasecmp_l.c
index 329be0529..3c58d8f50 100644
--- a/newlib/libc/string/wcscasecmp_l.c
+++ b/newlib/libc/string/wcscasecmp_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	wcscasecmp_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcscasecmp_l(const wchar_t *<[a]>, const wchar_t *<[b]>,
 			 locale_t <[locale]>);
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 11afbe3a6..586512d0f 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -4,16 +4,11 @@  FUNCTION
 INDEX
 	wcscat
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcscat(wchar_t *__restrict <[s1]>,
 			const wchar_t *__restrict <[s2]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcscat(<[s1]>, <[s2]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-
 DESCRIPTION
 	The <<wcscat>> function appends a copy of the wide-character string
 	pointed to by <[s2]> (including the terminating null wide-character
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index fb35d1f42..c705a08d5 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -2,15 +2,10 @@ 
 FUNCTION
 	<<wcschr>>---wide-character string scanning operation
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcschr(const wchar_t *<[s]>, wchar_t <[c]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcschr(<[s]>, <[c]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-
 DESCRIPTION
 	The <<wcschr>> function locates the first occurrence of <[c]> in the
 	wide-character string pointed to by <[s]>. The value of <[c]> must be a
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 03089620d..8155742b8 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -2,14 +2,10 @@ 
 FUNCTION
 	<<wcscmp>>---compare two wide-character strings
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcscmp(const wchar_t *<[s1]>, *<[s2]>);
 
-TRAD_SYNOPSIS
-	int wcscmp(<[s1]>, <[s2]>
-	const wchar_t *<[s1]>, <[s2]>;
-
 DESCRIPTION
 	The <<wcscmp>> function compares the wide-character string pointed to
 	by <[s1]> to the wide-character string pointed to by <[s2]>.
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 726f4ca0b..020f7e57f 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	wcscoll
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcscoll(const wchar_t *<[stra]>, const wchar_t * <[strb]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcscoll(<[stra]>, <[strb]>)
-	wchar_t *<[stra]>;
-	wchar_t *<[strb]>;
-
 DESCRIPTION
 	<<wcscoll>> compares the wide-character string pointed to by
 	<[stra]> to the wide-character string pointed to by <[strb]>,
diff --git a/newlib/libc/string/wcscoll_l.c b/newlib/libc/string/wcscoll_l.c
index e71d02a75..2c9df5244 100644
--- a/newlib/libc/string/wcscoll_l.c
+++ b/newlib/libc/string/wcscoll_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	wcscoll_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcscoll_l(const wchar_t *<[stra]>, const wchar_t * <[strb]>,
 		      locale_t <[locale]>);
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index ed8b484bc..79f065ca0 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -2,16 +2,11 @@ 
 FUNCTION
 	<<wcscpy>>---copy a wide-character string 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcscpy(wchar_t *__restrict <[s1]>,
 			const wchar_t *__restrict <[s2]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcscpy(<[s1]>, <[s2]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-
 DESCRIPTION
 	The <<wcscpy>> function copies the wide-character string pointed to by
 	<[s2]> (including the terminating null wide-character code) into the
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 5ab965690..7be5f5eee 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -2,15 +2,10 @@ 
 FUNCTION
 	<<wcscspn>>---get length of a complementary wide substring 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcscspn(const wchar_t *<[s]>, wchar_t *<[set]>);
 
-TRAD_SYNOPSIS
-	size_t wcscspn(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
 DESCRIPTION
 	The <<wcscspn>> function computes the length of the maximum initial
 	segment of the wide-character string pointed to by <[s]> which consists
diff --git a/newlib/libc/string/wcsdup.c b/newlib/libc/string/wcsdup.c
index 90be68e02..e0e97c0bd 100644
--- a/newlib/libc/string/wcsdup.c
+++ b/newlib/libc/string/wcsdup.c
@@ -7,19 +7,13 @@  INDEX
 INDEX
 	_wcsdup_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcsdup(const wchar_t *<[str]>);
 
 	#include <wchar.h>
 	wchar_t *_wcsdup_r(struct _reent *<[ptr]>, const wchar_t *<[str]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsdup(<[ptr]>, <[str]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[str]>;
-
 DESCRIPTION
 	<<wcsdup>> allocates a new wide character string using <<malloc>>,
 	and copies the content of the argument <[str]> into the newly
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 75c085b5b..2caa58820 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -2,17 +2,10 @@ 
 FUNCTION
 	<<wcslcat>>---concatenate wide-character strings to specified length
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcslcat(wchar_t *<[dst]>, const wchar_t *<[src]>, size_t <[siz]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcat(<[dst]>, <[src]>, <[siz]>
-	wchar_t *<[dst]>;
-	const wchar_t *<[src]>;
-	size_t <[siz]>;
-
 DESCRIPTION
 	The <<wcslcat>> function appends wide characters from <[src]> to
 	end of the <[dst]> wide-character string so that the resultant
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 21c030b38..34352fb9d 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -2,17 +2,10 @@ 
 FUNCTION
 	<<wcslcpy>>---copy a wide-character string to specified length
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcslcpy(wchar_t *<[dst]>, const wchar_t *<[src]>, size_t <[siz]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcpy(<[dst]>, <[src]>, <[siz]>)
-	wchar_t *<[dst]>;
-	const wchar_t *<[src]>;
-	size_t <[siz]>;
-
 DESCRIPTION
 	<<wcslcpy>> copies wide characters from <[src]> to <[dst]>
 	such that up to <[siz]> - 1 characters are copied.  A
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index d671551af..ebef17285 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -2,14 +2,10 @@ 
 FUNCTION
 	<<wcslen>>---get wide-character string length 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcslen(const wchar_t *<[s]>);
 
-TRAD_SYNOPSIS
-	size_t wcslen(<[s]>
-	const wchar_t *<[s]>;
-
 DESCRIPTION
 	The <<wcslen>> function computes the number of wide-character codes
 	in the wide-character string to which <[s]> points, not including the
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index c6fc08ef6..a339bbfa5 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -5,17 +5,10 @@  FUNCTION
 INDEX
 	wcsncasecmp
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcsncasecmp(const wchar_t *<[a]>, const wchar_t * <[b]>, size_t <[length]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcsncasecmp(<[a]>, <[b]>, <[length]>)
-	wchar_t *<[a]>;
-	wchar_t *<[b]>;
-	size_t <[length]>
-
 DESCRIPTION
 	<<wcsncasecmp>> compares up to <[length]> wide characters
 	from the string at <[a]> to the string at <[b]> in a 
diff --git a/newlib/libc/string/wcsncasecmp_l.c b/newlib/libc/string/wcsncasecmp_l.c
index 4b360b802..f276635d7 100644
--- a/newlib/libc/string/wcsncasecmp_l.c
+++ b/newlib/libc/string/wcsncasecmp_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	wcsncasecmp_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcsncasecmp_l(const wchar_t *<[a]>, const wchar_t * <[b]>,
 			  size_t <[length]>, locale_t <[locale]>);
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index b73f6e93e..34a694790 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -2,17 +2,11 @@ 
 FUNCTION
 	<<wcsncat>>---concatenate part of two wide-character strings 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcsncat(wchar_t *__restrict <[s1]>,
 			const wchar_t *__restrict <[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcsncat(<[s1]>, <[s2]>, <[n]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wcsncat>> function appends not more than <[n]> wide-character
 	codes (a null wide-character code and wide-character codes that follow
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 1897f5c4e..72c5d1291 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<wcsncmp>>---compare part of two wide-character strings 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcsncmp(const wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	int wcsncmp(<[s1]>, <[s2]>, <[n]>
-	const wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wcsncmp>> function compares not more than <[n]> wide-character
 	codes (wide-character codes that follow a null wide-character code are
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index 3d6d70b7d..793e522da 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -2,17 +2,11 @@ 
 FUNCTION
 	<<wcsncpy>>---copy part of a wide-character string 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcsncpy(wchar_t *__restrict <[s1]>,
 			const wchar_t *__restrict <[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcsncpy(<[s1]>, <[s2]>, <[n]>
-	wchar_t *__restrict <[s1]>;
-	const wchar_t *__restrict <[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wcsncpy>> function copies not more than <[n]> wide-character codes
 	(wide-character codes that follow a null wide-character code are not
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index 9d680d603..77aad65a3 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
         wcsnlen
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <wchar.h>
         size_t wcsnlen(const wchar_t *<[s]>, size_t <[maxlen]>);
 
-TRAD_SYNOPSIS
-        #include <wchar.h>
-        size_t wcsnlen(<[s]>, <[maxlen]>)
-        wchar_t *<[s]>;
-        size_t <[maxlen]>;
-
 DESCRIPTION
         The <<wcsnlen>> function computes the number of wide-character codes
         in the wide-character string pointed to by <[s]> not including the
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index fbdf9e49c..55401f1a9 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -2,15 +2,10 @@ 
 FUNCTION
 	<<wcspbrk>>----scan wide-character string for a wide-character code
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcspbrk(const wchar_t *<[s]>, const wchar_t *<[set]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcspbrk(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
 DESCRIPTION
 	The <<wcspbrk>> function locates the first occurrence in the
 	wide-character string pointed to by <[s]> of any wide-character code
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index 495d95a15..b99cb9760 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<wcsrchr>>---wide-character string scanning operation 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcsrchr(const wchar_t *<[s]>, wchar_t <[c]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsrchr(<[s]>, <[c]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-
 DESCRIPTION
 	The <<wcsrchr>> function locates the last occurrence of <[c]> in the
 	wide-character string pointed to by <[s]>. The value of <[c]> must be a
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index e83f42f4f..652d971dd 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -2,15 +2,10 @@ 
 FUNCTION
 	<<wcsspn>>---get length of a wide substring 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	size_t wcsspn(const wchar_t *<[s]>, const wchar_t *<[set]>);
 
-TRAD_SYNOPSIS
-	size_t wcsspn(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
 DESCRIPTION
 	The <<wcsspn>> function computes the length of the maximum initial
 	segment of the wide-character string pointed to by <[s]> which consists
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index 6e891120d..bb6e3eda8 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -2,16 +2,11 @@ 
 FUNCTION
 	<<wcsstr>>---find a wide-character substring 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wcsstr(const wchar_t *__restrict <[big]>,
 			const wchar_t *__restrict <[little]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wcsstr(<[big]>, <[little]>
-	const wchar_t *__restrict <[big]>;
-	const wchar_t *__restrict <[little]>;
-
 DESCRIPTION
 	The <<wcsstr>> function locates the first occurrence in the
 	wide-character string pointed to by <[big]> of the sequence of
diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c
index 144b33efd..091f4bd3e 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -6,19 +6,12 @@  INDEX
 	wcstok
 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
       	wchar_t *wcstok(wchar_t *__restrict <[source]>,
       			const wchar_t *__restrict <[delimiters]>,
 			wchar_t **__restrict <[lasts]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcstok(<[source]>, <[delimiters]>, <[lasts]>);
-	wchar_t *__restrict <[source]>;
-	wchar_t *__restrict <[delimiters]>;
-	wchar_t **__restrict <[lasts]>;
-
 DESCRIPTION
 	The <<wcstok>> function is the wide-character equivalent of the
 	<<strtok_r>> function (which in turn is the same as the <<strtok>>
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 6c0efe63f..4cb8fa812 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -5,16 +5,10 @@  FUNCTION
 INDEX
 	wcswidth
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcswidth(const wchar_t *<[pwcs]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcswidth(<[pwcs]>, <[n]>)
-	wchar_t *<[wc]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wcswidth>> function shall determine the number of column
 	positions required for <[n]> wide-character codes (or fewer than <[n]>
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index d267d274f..e11516ff4 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -5,18 +5,11 @@  FUNCTION
 INDEX
 	wcsxfrm
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcsxfrm(wchar_t *__restrict <[stra]>,
 		    const wchar_t *__restrict <[strb]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcsxfrm(<[stra]>, <[strb]>, <[n]>)
-	wchar_t *__restrict <[stra]>;
-	wchar_t *__restrict <[strb]>;
-	size_t   <[n]>
-
 DESCRIPTION
 	<<wcsxfrm>> transforms the wide-character string pointed to by
 	<[strb]> to the wide-character string pointed to by <[stra]>,
diff --git a/newlib/libc/string/wcsxfrm_l.c b/newlib/libc/string/wcsxfrm_l.c
index c44b0d639..bfc4ae56b 100644
--- a/newlib/libc/string/wcsxfrm_l.c
+++ b/newlib/libc/string/wcsxfrm_l.c
@@ -5,7 +5,7 @@  FUNCTION
 INDEX
 	wcsxfrm_l
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcsxfrm_l(wchar_t *__restrict <[stra]>,
 		      const wchar_t *__restrict <[strb]>, size_t <[n]>,
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index ac5c47f67..acb15d0dc 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -5,15 +5,10 @@  FUNCTION
 INDEX
 	wcwidth
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wcwidth(const wchar_t <[wc]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcwidth(<[wc]>)
-	wchar_t *<[wc]>;
-
 DESCRIPTION
 	The <<wcwidth>> function shall determine the number of column
 	positions required for the wide character <[wc]>. The application
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index b582b8948..097e47a03 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -3,16 +3,10 @@  FUNCTION
 	<<wmemchr>>---find a wide character in memory
  
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t	*wmemchr(const wchar_t *<[s]>, wchar_t <[c]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t	*wmemchr(<[s]>, <[c]>, <[n]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wmemchr>> function locates the first occurrence of <[c]> in the
 	initial <[n]> wide characters of the object pointed to be <[s]>. This
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index af9ee3207..a01bf32f1 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<wmemcmp>>---compare wide characters in memory 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int wmemcmp(const wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	int wmemcmp(<[s1]>, <[s2]>, <[n]>
-	const wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wmemcmp>> function compares the first <[n]> wide characters of the
 	object pointed to by <[s1]> to the first <[n]> wide characters of the
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index a57d6a512..0e8d6e494 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -2,17 +2,11 @@ 
 FUNCTION
 	<<wmemcpy>>---copy wide characters in memory 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wmemcpy(wchar_t *__restrict <[d]>,
 			 const wchar_t *__restrict <[s]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wmemcpy(<[d]>, <[s]>, <[n]>
-	wchar_t *__restrict <[d]>;
-	const wchar_t *__restrict <[s]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wmemcpy>> function copies <[n]> wide characters from the object
 	pointed to by <[s]> to the object pointed to be <[d]>. This function
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index e20a26ae9..18d2a2bfd 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -2,16 +2,10 @@ 
 FUNCTION
 	<<wmemmove>>---copy wide characters in memory with overlapping areas 
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *wmemmove(wchar_t *<[d]>, const wchar_t *<[s]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-	wchar_t *wmemmove(<[d]>, <[s]>, <[n]>
-	wchar_t *<[d]>;
-	const wchar_t *<[s]>;
-	size_t <[n]>;
-
 DESCRIPTION
 	The <<wmemmove>> function copies <[n]> wide characters from the object
 	pointed to by <[s]> to the object pointed to by <[d]>. Copying takes
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index 0af6f91d5..377fbee1f 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -2,16 +2,10 @@ 
 FUNCTION
        <<wmemset>>---set wide characters in memory 
 
-ANSI_SYNOPSIS
+SYNOPSIS
        #include <wchar.h>
        wchar_t *wmemset(wchar_t *<[s]>, wchar_t <[c]>, size_t <[n]>);
 
-TRAD_SYNOPSIS
-       wchar_t *wmemset(<[s]>, <[c]>, <[n]>
-       wchar_t *<[s]>;
-       wchar_t <[c]>;
-       size_t <[n]>;
-
 DESCRIPTION
        The <<wmemset>> function copies the value of <[c]> into each of the
        first <[n]> wide characters of the object pointed to by <[s]>.  This