[12/24] stdio: remove TRAD_SYNOPSIS

Message ID 20171130102858.16160-13-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/stdio/clearerr.c       | 12 +-------
 newlib/libc/stdio/diprintf.c       |  2 +-
 newlib/libc/stdio/dprintf.c        |  2 +-
 newlib/libc/stdio/fclose.c         | 11 +-------
 newlib/libc/stdio/fcloseall.c      |  9 +-----
 newlib/libc/stdio/fdopen.c         | 13 +--------
 newlib/libc/stdio/feof.c           | 12 +-------
 newlib/libc/stdio/ferror.c         | 12 +-------
 newlib/libc/stdio/fflush.c         |  2 +-
 newlib/libc/stdio/fgetc.c          | 23 +--------------
 newlib/libc/stdio/fgetpos.c        | 13 +--------
 newlib/libc/stdio/fgets.c          | 30 +-------------------
 newlib/libc/stdio/fgetwc.c         | 49 +-------------------------------
 newlib/libc/stdio/fgetws.c         | 30 +-------------------
 newlib/libc/stdio/fileno.c         | 12 +-------
 newlib/libc/stdio/fmemopen.c       |  2 +-
 newlib/libc/stdio/fopen.c          | 13 +--------
 newlib/libc/stdio/fopencookie.c    |  2 +-
 newlib/libc/stdio/fpurge.c         |  2 +-
 newlib/libc/stdio/fputc.c          | 26 +----------------
 newlib/libc/stdio/fputs.c          | 26 +----------------
 newlib/libc/stdio/fputwc.c         | 57 +-------------------------------------
 newlib/libc/stdio/fputws.c         | 26 +----------------
 newlib/libc/stdio/fread.c          | 34 +----------------------
 newlib/libc/stdio/freopen.c        | 15 +---------
 newlib/libc/stdio/fseek.c          | 26 +----------------
 newlib/libc/stdio/fseeko.c         | 26 +----------------
 newlib/libc/stdio/fsetlocking.c    |  2 +-
 newlib/libc/stdio/fsetpos.c        | 13 +--------
 newlib/libc/stdio/ftell.c          | 18 +-----------
 newlib/libc/stdio/ftello.c         | 18 +-----------
 newlib/libc/stdio/funopen.c        |  2 +-
 newlib/libc/stdio/fwide.c          | 13 +--------
 newlib/libc/stdio/fwrite.c         | 34 +----------------------
 newlib/libc/stdio/getc.c           | 12 +-------
 newlib/libc/stdio/getchar.c        |  9 +-----
 newlib/libc/stdio/getdelim.c       | 10 +------
 newlib/libc/stdio/getline.c        |  9 +-----
 newlib/libc/stdio/gets.c           | 12 +-------
 newlib/libc/stdio/getw.c           |  7 +----
 newlib/libc/stdio/getwchar.c       | 18 +-----------
 newlib/libc/stdio/mktemp.c         |  2 +-
 newlib/libc/stdio/nano-vfprintf.c  |  2 +-
 newlib/libc/stdio/nano-vfscanf.c   | 36 +-----------------------
 newlib/libc/stdio/open_memstream.c |  2 +-
 newlib/libc/stdio/perror.c         | 11 +-------
 newlib/libc/stdio/putc.c           | 14 +---------
 newlib/libc/stdio/putchar.c        | 11 +-------
 newlib/libc/stdio/puts.c           | 11 +-------
 newlib/libc/stdio/putw.c           |  8 +-----
 newlib/libc/stdio/putwchar.c       | 21 +-------------
 newlib/libc/stdio/remove.c         | 11 +-------
 newlib/libc/stdio/rename.c         |  8 +-----
 newlib/libc/stdio/rewind.c         | 11 +-------
 newlib/libc/stdio/setbuf.c         |  8 +-----
 newlib/libc/stdio/setbuffer.c      |  9 +-----
 newlib/libc/stdio/setlinebuf.c     |  7 +----
 newlib/libc/stdio/setvbuf.c        | 10 +------
 newlib/libc/stdio/siprintf.c       |  2 +-
 newlib/libc/stdio/siscanf.c        | 32 +--------------------
 newlib/libc/stdio/sprintf.c        |  2 +-
 newlib/libc/stdio/sscanf.c         | 32 +--------------------
 newlib/libc/stdio/stdio_ext.c      |  2 +-
 newlib/libc/stdio/swprintf.c       |  2 +-
 newlib/libc/stdio/swscanf.c        | 32 +--------------------
 newlib/libc/stdio/tmpfile.c        |  9 +-----
 newlib/libc/stdio/tmpnam.c         | 20 +------------
 newlib/libc/stdio/ungetc.c         |  2 +-
 newlib/libc/stdio/ungetwc.c        |  2 +-
 newlib/libc/stdio/vfprintf.c       |  2 +-
 newlib/libc/stdio/vfscanf.c        | 36 +-----------------------
 newlib/libc/stdio/vfwprintf.c      |  2 +-
 newlib/libc/stdio/vfwscanf.c       | 36 +-----------------------
 newlib/libc/stdio/viprintf.c       |  2 +-
 newlib/libc/stdio/viscanf.c        | 36 +-----------------------
 75 files changed, 75 insertions(+), 1022 deletions(-)

-- 
2.15.0

Patch

diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 9bf0837f5..4174a7425 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -24,7 +24,7 @@  INDEX
 INDEX
 	clearerr_unlocked
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void clearerr(FILE *<[fp]>);
 
@@ -32,16 +32,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	void clearerr_unlocked(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void clearerr(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	void clearerr_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 The <<stdio>> functions maintain an error indicator with each file
 pointer <[fp]>, to record whether any read or write errors have
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index e0a5595e1..fde6ea44c 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -16,7 +16,7 @@  INDEX
 INDEX
 	_vdiprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int diprintf(int <[fd]>, const char *<[format]>, ...);
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 2925ceb31..7389eefaa 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -16,7 +16,7 @@  INDEX
 INDEX
 	_vdprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int dprintf(int <[fd]>, const char *restrict <[format]>, ...);
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 0ce112306..3325a8920 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -24,20 +24,11 @@  INDEX
 INDEX
 	_fclose_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fclose(FILE *<[fp]>);
 	int _fclose_r(struct _reent *<[reent]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fclose(<[fp]>)
-	FILE *<[fp]>;
-
-	int fclose(<[fp]>)
-        struct _reent *<[reent]>
-	FILE *<[fp]>;
-
 DESCRIPTION
 If the file or stream identified by <[fp]> is open, <<fclose>> closes
 it, after first ensuring that any pending data is written (by calling
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
index 090f3f2c3..a578e8a00 100644
--- a/newlib/libc/stdio/fcloseall.c
+++ b/newlib/libc/stdio/fcloseall.c
@@ -24,18 +24,11 @@  INDEX
 INDEX
 	_fcloseall_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fcloseall(void);
 	int _fcloseall_r (struct _reent *<[ptr]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fcloseall()
-
-	int _fcloseall_r (<[ptr]>)
-	struct _reent *<[ptr]>;
-
 DESCRIPTION
 <<fcloseall>> closes all files in the current reentrancy struct's domain.
 The function <<_fcloseall_r>> is the same function, except the reentrancy
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 77f599b65..e0268ed87 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -24,23 +24,12 @@  INDEX
 INDEX
 	_fdopen_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *fdopen(int <[fd]>, const char *<[mode]>);
 	FILE *_fdopen_r(struct _reent *<[reent]>,
                         int <[fd]>, const char *<[mode]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *fdopen(<[fd]>, <[mode]>)
-	int <[fd]>;
-	char *<[mode]>;
-
-	FILE *_fdopen_r(<[reent]>, <[fd]>, <[mode]>)
-	struct _reent *<[reent]>;
-        int <[fd]>;
-	char *<[mode]>);
-
 DESCRIPTION
 <<fdopen>> produces a file descriptor of type <<FILE *>>, from a
 descriptor for an already-open file (returned, for example, by the
diff --git a/newlib/libc/stdio/feof.c b/newlib/libc/stdio/feof.c
index 7aadd8209..617ce58df 100644
--- a/newlib/libc/stdio/feof.c
+++ b/newlib/libc/stdio/feof.c
@@ -24,7 +24,7 @@  INDEX
 INDEX
 	feof_unlocked
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int feof(FILE *<[fp]>);
 
@@ -32,16 +32,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int feof_unlocked(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int feof(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int feof_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<feof>> tests whether or not the end of the file identified by <[fp]>
 has been reached.
diff --git a/newlib/libc/stdio/ferror.c b/newlib/libc/stdio/ferror.c
index f93063d71..f99df2311 100644
--- a/newlib/libc/stdio/ferror.c
+++ b/newlib/libc/stdio/ferror.c
@@ -24,7 +24,7 @@  INDEX
 INDEX
 	ferror_unlocked
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int ferror(FILE *<[fp]>);
 
@@ -32,16 +32,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int ferror_unlocked(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int ferror(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int ferror_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 The <<stdio>> functions maintain an error indicator with each file
 pointer <[fp]>, to record whether any read or write errors have
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index a4e639e72..199acbdc3 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fflush_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fflush(FILE *<[fp]>);
 
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 34447a2c8..54322a069 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fgetc_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fgetc(FILE *<[fp]>);
 
@@ -43,27 +43,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int _fgetc_unlocked_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fgetc(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int fgetc_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _fgetc_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int _fgetc_unlocked_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Use <<fgetc>> to get the next single character from the file or stream
 identified by <[fp]>.  As a side effect, <<fgetc>> advances the file's
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 20dd1082c..3074526b4 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -24,22 +24,11 @@  INDEX
 INDEX
 	_fgetpos_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fgetpos(FILE *restrict <[fp]>, fpos_t *restrict <[pos]>);
 	int _fgetpos_r(struct _reent *<[ptr]>, FILE *restrict <[fp]>, fpos_t *restrict <[pos]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fgetpos(<[fp]>, <[pos]>)
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
-	int _fgetpos_r(<[ptr]>, <[fp]>, <[pos]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index f7c8a0300..54097510d 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fgets_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 	char *fgets(char *restrict <[buf]>, int <[n]>, FILE *restrict <[fp]>);
 
@@ -42,34 +42,6 @@  ANSI_SYNOPSIS
         #include <stdio.h>
 	char *_fgets_unlocked_r(struct _reent *<[ptr]>, char *restrict <[buf]>, int <[n]>, FILE *restrict <[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	char *fgets(<[buf]>,<[n]>,<[fp]>)
-        char *<[buf]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	char *fgets_unlocked(<[buf]>,<[n]>,<[fp]>)
-        char *<[buf]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	char *_fgets_r(<[ptr]>, <[buf]>,<[n]>,<[fp]>)
-	struct _reent *<[ptr]>;
-        char *<[buf]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	char *_fgets_unlocked_r(<[ptr]>, <[buf]>,<[n]>,<[fp]>)
-	struct _reent *<[ptr]>;
-        char *<[buf]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 	Reads at most <[n-1]> characters from <[fp]> until a newline
 	is found. The characters including to the newline are stored
diff --git a/newlib/libc/stdio/fgetwc.c b/newlib/libc/stdio/fgetwc.c
index d6de4b6cb..07731487d 100644
--- a/newlib/libc/stdio/fgetwc.c
+++ b/newlib/libc/stdio/fgetwc.c
@@ -45,7 +45,7 @@  INDEX
 INDEX
 	_getwc_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <wchar.h>
 	wint_t fgetwc(FILE *<[fp]>);
@@ -80,53 +80,6 @@  ANSI_SYNOPSIS
 	#include <wchar.h>
 	wint_t _getwc_unlocked_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t fgetwc(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t fgetwc_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _fgetwc_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _fgetwc_unlocked_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t getwc(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t getwc_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _getwc_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _getwc_unlocked_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Use <<fgetwc>> to get the next wide character from the file or stream
 identified by <[fp]>.  As a side effect, <<fgetwc>> advances the file's
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c
index ae1f48e66..3dbf3ef74 100644
--- a/newlib/libc/stdio/fgetws.c
+++ b/newlib/libc/stdio/fgetws.c
@@ -37,7 +37,7 @@  INDEX
 INDEX
 	_fgetws_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wchar_t *fgetws(wchar_t *__restrict <[ws]>, int <[n]>,
                         FILE *__restrict <[fp]>);
@@ -55,34 +55,6 @@  ANSI_SYNOPSIS
 	wchar_t *_fgetws_unlocked_r(struct _reent *<[ptr]>, wchar_t *<[ws]>,
                            int <[n]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *fgetws(<[ws]>,<[n]>,<[fp]>)
-	wchar_t *__restrict <[ws]>;
-	int <[n]>;
-	FILE *__restrict <[fp]>;
-
-	#define _GNU_SOURCE
-	#include <wchar.h>
-	wchar_t *fgetws_unlocked(<[ws]>,<[n]>,<[fp]>)
-	wchar_t *__restrict <[ws]>;
-	int <[n]>;
-	FILE *__restrict <[fp]>;
-
-	#include <wchar.h>
-	wchar_t *_fgetws_r(<[ptr]>, <[ws]>,<[n]>,<[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[ws]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
-	#include <wchar.h>
-	wchar_t *_fgetws_unlocked_r(<[ptr]>, <[ws]>,<[n]>,<[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[ws]>;
-	int <[n]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Reads at most <[n-1]> wide characters from <[fp]> until a newline
 is found. The wide characters including to the newline are stored
diff --git a/newlib/libc/stdio/fileno.c b/newlib/libc/stdio/fileno.c
index 7b505827d..949a381f8 100644
--- a/newlib/libc/stdio/fileno.c
+++ b/newlib/libc/stdio/fileno.c
@@ -24,7 +24,7 @@  INDEX
 INDEX
 	fileno_unlocked
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fileno(FILE *<[fp]>);
 
@@ -32,16 +32,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fileno_unlocked(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fileno(<[fp]>)
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int fileno_unlocked(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 You can use <<fileno>> to return the file descriptor identified by <[fp]>.
 
diff --git a/newlib/libc/stdio/fmemopen.c b/newlib/libc/stdio/fmemopen.c
index 17a3c9b5c..520ba1b80 100644
--- a/newlib/libc/stdio/fmemopen.c
+++ b/newlib/libc/stdio/fmemopen.c
@@ -10,7 +10,7 @@  FUNCTION
 INDEX
 	fmemopen
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *fmemopen(void *restrict <[buf]>, size_t <[size]>,
 		       const char *restrict <[mode]>);
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 6d07561a3..2551befed 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -24,24 +24,13 @@  INDEX
 INDEX
 	_fopen_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *fopen(const char *<[file]>, const char *<[mode]>);
 
 	FILE *_fopen_r(struct _reent *<[reent]>, 
                        const char *<[file]>, const char *<[mode]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *fopen(<[file]>, <[mode]>)
-	char *<[file]>;
-	char *<[mode]>;
-
-	FILE *_fopen_r(<[reent]>, <[file]>, <[mode]>)
-	struct _reent *<[reent]>;
-	char *<[file]>;
-	char *<[mode]>;
-
 DESCRIPTION
 <<fopen>> initializes the data structures needed to read or write a
 file.  Specify the file's name as the string at <[file]>, and the kind
diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c
index 3697b48d7..eb9861392 100644
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -10,7 +10,7 @@  FUNCTION
 INDEX
 	fopencookie
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *fopencookie(const void *<[cookie]>, const char *<[mode]>,
 			  cookie_io_functions_t <[functions]>);
diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c
index dc052e85b..de621feb6 100644
--- a/newlib/libc/stdio/fpurge.c
+++ b/newlib/libc/stdio/fpurge.c
@@ -14,7 +14,7 @@  INDEX
 INDEX
 	__fpurge
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fpurge(FILE *<[fp]>);
 
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index 0aad0a9f7..f9273d6ae 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fputc_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fputc(int <[ch]>, FILE *<[fp]>);
 
@@ -42,30 +42,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int _fputc_unlocked_r(struct _rent *<[ptr]>, int <[ch]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fputc(<[ch]>, <[fp]>)
-	int <[ch]>;
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	int fputc_unlocked(<[ch]>, <[fp]>)
-	int <[ch]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _fputc_r(<[ptr]>, <[ch]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	int <[ch]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _fputc_unlocked_r(<[ptr]>, <[ch]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	int <[ch]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fputc>> converts the argument <[ch]> from an <<int>> to an
 <<unsigned char>>, then writes it to the file or stream identified by
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 75f65d96e..c4588265b 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fputs_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fputs(const char *restrict <[s]>, FILE *restrict <[fp]>);
 
@@ -42,30 +42,6 @@  ANSI_SYNOPSIS
 	#include <stdio.h>
 	int _fputs_unlocked_r(struct _reent *<[ptr]>, const char *restrict <[s]>, FILE *restrict <[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fputs(<[s]>, <[fp]>)
-	char *<[s]>;
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	int fputs_unlocked(<[s]>, <[fp]>)
-	char *<[s]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _fputs_r(<[ptr]>, <[s]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[s]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _fputs_unlocked_r(<[ptr]>, <[s]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[s]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fputs>> writes the string at <[s]> (but without the trailing null)
 to the file or stream identified by <[fp]>.
diff --git a/newlib/libc/stdio/fputwc.c b/newlib/libc/stdio/fputwc.c
index 9c2ef6c3b..5e2a9e322 100644
--- a/newlib/libc/stdio/fputwc.c
+++ b/newlib/libc/stdio/fputwc.c
@@ -45,7 +45,7 @@  INDEX
 INDEX
 	_putwc_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <wchar.h>
 	wint_t fputwc(wchar_t <[wc]>, FILE *<[fp]>);
@@ -80,61 +80,6 @@  ANSI_SYNOPSIS
 	#include <wchar.h>
 	wint_t _putwc_unlocked_r(struct _reent *<[ptr]>, wchar_t <[wc]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t fputwc(<[wc]>, <[fp]>)
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t fputwc_unlocked(<[wc]>, <[fp]>)
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _fputwc_r(<[ptr]>, <[wc]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _fputwc_unlocked_r(<[ptr]>, <[wc]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t putwc(<[wc]>, <[fp]>)
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#define _GNU_SOURCE
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t putwc_unlocked(<[wc]>, <[fp]>)
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _putwc_r(<[ptr]>, <[wc]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	#include <wchar.h>
-	wint_t _putwc_unlocked_r(<[ptr]>, <[wc]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t <[wc]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fputwc>> writes the wide character argument <[wc]> to the file or
 stream identified by <[fp]>.
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index bb2fa6dbe..c68241c92 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/newlib/libc/stdio/fputws.c
@@ -37,7 +37,7 @@  INDEX
 INDEX
 	_fputws_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int fputws(const wchar_t *__restrict <[ws]>, FILE *__restrict <[fp]>);
 
@@ -53,30 +53,6 @@  ANSI_SYNOPSIS
 	int _fputws_unlocked_r(struct _reent *<[ptr]>, const wchar_t *<[ws]>,
                                FILE *<[fp]>);
 
-TRAD_SYNOPSIS   
-	#include <wchar.h>
-	int fputws(<[ws]>, <[fp]>)
-	wchar_t *__restrict <[ws]>;
-	FILE *__restrict <[fp]>;
-
-	#define _GNU_SOURCE
-	#include <wchar.h>
-	int fputws_unlocked(<[ws]>, <[fp]>)
-	wchar_t *__restrict <[ws]>;
-	FILE *__restrict <[fp]>;
-
-	#include <wchar.h>
-	int _fputws_r(<[ptr]>, <[ws]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[ws]>;
-	FILE *<[fp]>;
-
-	#include <wchar.h>
-	int _fputws_unlocked_r(<[ptr]>, <[ws]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	wchar_t *<[ws]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fputws>> writes the wide character string at <[ws]> (but without the
 trailing null) to the file or stream identified by <[fp]>.
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index c6839476d..c2e60bedc 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fread_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	size_t fread(void *restrict <[buf]>, size_t <[size]>, size_t <[count]>,
 		     FILE *restrict <[fp]>);
@@ -46,38 +46,6 @@  ANSI_SYNOPSIS
 	size_t _fread_unlocked_r(struct _reent *<[ptr]>, void *restrict <[buf]>,
 	                size_t <[size]>, size_t <[count]>, FILE *restrict <[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	size_t fread(<[buf]>, <[size]>, <[count]>, <[fp]>)
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	size_t fread_unlocked(<[buf]>, <[size]>, <[count]>, <[fp]>)
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	size_t _fread_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	size_t _fread_unlocked_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fread>> attempts to copy, from the file or stream identified by
 <[fp]>, <[count]> elements (each of size <[size]>) into memory,
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index fb1f6c4db..e5bb73a26 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -24,26 +24,13 @@  INDEX
 INDEX
 	_freopen_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *freopen(const char *restrict <[file]>, const char *restrict <[mode]>,
 		      FILE *restrict <[fp]>);
 	FILE *_freopen_r(struct _reent *<[ptr]>, const char *restrict <[file]>,
 		      const char *restrict <[mode]>, FILE *restrict <[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *freopen(<[file]>, <[mode]>, <[fp]>)
-	char *<[file]>;
-	char *<[mode]>;
-	FILE *<[fp]>;
-
-	FILE *_freopen_r(<[ptr]>, <[file]>, <[mode]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[file]>;
-	char *<[mode]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Use this variant of <<fopen>> if you wish to specify a particular file
 descriptor <[fp]> (notably <<stdin>>, <<stdout>>, or <<stderr>>) for
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index b8fc36a04..b5bd979d3 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fseeko_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fseek(FILE *<[fp]>, long <[offset]>, int <[whence]>);
 	int fseeko(FILE *<[fp]>, off_t <[offset]>, int <[whence]>);
@@ -37,30 +37,6 @@  ANSI_SYNOPSIS
 	int _fseeko_r(struct _reent *<[ptr]>, FILE *<[fp]>,
 	             off_t <[offset]>, int <[whence]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fseek(<[fp]>, <[offset]>, <[whence]>);
-	FILE *<[fp]>;
-	long <[offset]>;
-	int <[whence]>;
-
-	int fseeko(<[fp]>, <[offset]>, <[whence]>);
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
-	int _fseek_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>);
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	long <[offset]>;
-	int <[whence]>;
-
-	int _fseeko_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>);
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 2c9419d97..52f978929 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fseeko_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fseek(FILE *<[fp]>, long <[offset]>, int <[whence]>)
 	int fseeko(FILE *<[fp]>, off_t <[offset]>, int <[whence]>)
@@ -37,30 +37,6 @@  ANSI_SYNOPSIS
 	int _fseeko_r(struct _reent *<[ptr]>, FILE *<[fp]>,
 	             off_t <[offset]>, int <[whence]>)
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fseek(<[fp]>, <[offset]>, <[whence]>)
-	FILE *<[fp]>;
-	long <[offset]>;
-	int <[whence]>;
-
-	int fseeko(<[fp]>, <[offset]>, <[whence]>)
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
-	int _fseek_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	long <[offset]>;
-	int <[whence]>;
-
-	int _fseeko_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/fsetlocking.c b/newlib/libc/stdio/fsetlocking.c
index 3c489f54d..d62aef334 100644
--- a/newlib/libc/stdio/fsetlocking.c
+++ b/newlib/libc/stdio/fsetlocking.c
@@ -30,7 +30,7 @@  FUNCTION
 INDEX
 	__fsetlocking
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdio_ext.h>
 	int __fsetlocking(FILE *<[fp]>, int <[type]>);
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index d1596293b..a2a5d7b2e 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -24,23 +24,12 @@  INDEX
 INDEX
 	_fsetpos_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int fsetpos(FILE *<[fp]>, const fpos_t *<[pos]>);
 	int _fsetpos_r(struct _reent *<[ptr]>, FILE *<[fp]>,
 	               const fpos_t *<[pos]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fsetpos(<[fp]>, <[pos]>)
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
-	int _fsetpos_r(<[ptr]>, <[fp]>, <[pos]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index 5af0709cb..70eed84c0 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -28,29 +28,13 @@  INDEX
 INDEX
 	_ftello_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	long ftell(FILE *<[fp]>);
 	off_t ftello(FILE *<[fp]>);
 	long _ftell_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 	off_t _ftello_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	long ftell(<[fp]>)
-	FILE *<[fp]>;
-
-	off_t ftello(<[fp]>)
-	FILE *<[fp]>;
-
-	long _ftell_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	off_t _ftello_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index 3a1885e81..c120c26a9 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -28,29 +28,13 @@  INDEX
 INDEX
 	_ftello_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	long ftell(FILE *<[fp]>);
 	off_t ftello(FILE *<[fp]>);
 	long _ftell_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 	off_t _ftello_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	long ftell(<[fp]>)
-	FILE *<[fp]>;
-
-	off_t ftello(<[fp]>)
-	FILE *<[fp]>;
-
-	long _ftell_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	off_t _ftello_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c
index e71d23187..58b75648a 100644
--- a/newlib/libc/stdio/funopen.c
+++ b/newlib/libc/stdio/funopen.c
@@ -14,7 +14,7 @@  INDEX
 INDEX
 	fwopen
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *funopen(const void *<[cookie]>,
 	              int (*<[readfn]>) (void *cookie, char *buf, int n),
diff --git a/newlib/libc/stdio/fwide.c b/newlib/libc/stdio/fwide.c
index b2aaf8a62..a57a77c95 100644
--- a/newlib/libc/stdio/fwide.c
+++ b/newlib/libc/stdio/fwide.c
@@ -7,23 +7,12 @@  INDEX
 INDEX
 	_fwide_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	int fwide(FILE *<[fp]>, int <[mode]>);
 
 	int _fwide_r(struct _reent *<[ptr]>, FILE *<[fp]>, int <[mode]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int fwide(<[fp]>, <[mode]>);
-	FILE *<[fp]>;
-	int <[mode]>;
-
-	int _fwide_r(<[ptr]>, <[fp]>, <[mode]>);
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	int <[mode]>;
-
 DESCRIPTION
 When <[mode]> is zero, the <<fwide>> function determines the current
 orientation of <[fp]>. It returns a value > 0 if <[fp]> is
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 6b3ff9015..2ba71f38a 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -28,7 +28,7 @@  INDEX
 INDEX
 	_fwrite_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	size_t fwrite(const void *restrict <[buf]>, size_t <[size]>,
 		      size_t <[count]>, FILE *restrict <[fp]>);
@@ -46,38 +46,6 @@  ANSI_SYNOPSIS
 	size_t _fwrite_unlocked_r(struct _reent *<[ptr]>, const void *restrict <[buf]>, size_t <[size]>,
 		      size_t <[count]>, FILE *restrict <[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	size_t fwrite(<[buf]>, <[size]>, <[count]>, <[fp]>)
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#define _BSD_SOURCE
-	#include <stdio.h>
-	size_t fwrite_unlocked(<[buf]>, <[size]>, <[count]>, <[fp]>)
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	size_t _fwrite_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	size_t _fwrite_unlocked_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[buf]>;
-	size_t <[size]>;
-	size_t <[count]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<fwrite>> attempts to copy, starting from the memory location
 <[buf]>, <[count]> elements (each of size <[size]>) into the file or
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 7951cdc93..37e345870 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -24,23 +24,13 @@  INDEX
 INDEX
 	_getc_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int getc(FILE *<[fp]>);
 
 	#include <stdio.h>
 	int _getc_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int getc(<[fp]>)
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _getc_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<getc>> is a macro, defined in <<stdio.h>>.  You can use <<getc>>
 to get the next single character from the file or stream
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index 7f3ceac62..07ba9e64f 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -24,19 +24,12 @@  INDEX
 INDEX
 	_getchar_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int getchar(void);
 
 	int _getchar_r(struct _reent *<[reent]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int getchar();
-
-	int _getchar_r(<[reent]>)
-	char * <[reent]>;
-
 DESCRIPTION
 <<getchar>> is a macro, defined in <<stdio.h>>.  You can use <<getchar>>
 to get the next single character from the standard input stream.
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index 63a579a79..d806c02cf 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -6,19 +6,11 @@  FUNCTION
 INDEX
 	getdelim
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int getdelim(char **<[bufptr]>, size_t *<[n]>,
                      int <[delim]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int getdelim(<[bufptr]>, <[n]>, <[delim]>, <[fp]>)
-	char **<[bufptr]>;
-	size_t *<[n]>;
-	int <[delim]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<getdelim>> reads a file <[fp]> up to and possibly including a specified
 delimiter <[delim]>.  The line is read into a buffer pointed to
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index c758ae964..66ffd1990 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -6,17 +6,10 @@  FUNCTION
 INDEX
         getline
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
         ssize_t getline(char **<[bufptr]>, size_t *<[n]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-        #include <stdio.h>
-        ssize_t getline(<[bufptr]>, <[n]>, <[fp]>)
-        char **<[bufptr]>;
-        size_t *<[n]>;
-        FILE *<[fp]>;
-
 DESCRIPTION
 <<getline>> reads a file <[fp]> up to and possibly including the
 newline character.  The line is read into a buffer pointed to
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index 6c21f3e0c..a78d06b89 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -24,23 +24,13 @@  INDEX
 INDEX
 	_gets_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
 	char *gets(char *<[buf]>);
 
 	char *_gets_r(struct _reent *<[reent]>, char *<[buf]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	char *gets(<[buf]>)
-	char *<[buf]>;
-
-	char *_gets_r(<[reent]>, <[buf]>)
-	struct _reent *<[reent]>;
-	char *<[buf]>;
-
 DESCRIPTION
 	Reads characters from standard input until a newline is found.
 	The characters up to the newline are stored in <[buf]>. The
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index 210c5939a..4585d9f37 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -22,15 +22,10 @@  FUNCTION
 INDEX
 	getw
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int getw(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int getw(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<getw>> is a function, defined in <<stdio.h>>.  You can use <<getw>>
 to get the next word from the file or stream identified by <[fp]>.  As
diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c
index 7ab230a4c..61031e5a6 100644
--- a/newlib/libc/stdio/getwchar.c
+++ b/newlib/libc/stdio/getwchar.c
@@ -37,7 +37,7 @@  INDEX
 INDEX
 	_getwchar_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wint_t getwchar(void);
 
@@ -51,22 +51,6 @@  ANSI_SYNOPSIS
 	#include <wchar.h>
 	wint_t _getwchar_unlocked_r(struct _reent *<[reent]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wint_t getwchar();
-
-	#define _GNU_SOURCE
-	#include <wchar.h>
-	wint_t getwchar_unlocked();
-
-	#include <wchar.h>
-	wint_t _getwchar_r(<[reent]>)
-	char * <[reent]>;
-
-	#include <wchar.h>
-	wint_t _getwchar_unlocked_r(<[reent]>)
-	char * <[reent]>;
-
 DESCRIPTION
 <<getwchar>> function or macro is the wide character equivalent of
 the <<getchar>> function.  You can use <<getwchar>> to get the next
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index ecbc7afea..3ece9ab2c 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -52,7 +52,7 @@  INDEX
 INDEX
 	_mkostemps_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdlib.h>
 	char *mktemp(char *<[path]>);
 	char *mkdtemp(char *<[path]>);
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index f106a4167..e6604e771 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -87,7 +87,7 @@  INDEX
 INDEX
 	_vasnprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int vprintf(const char *<[fmt]>, va_list <[list]>);
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 5ba00f797..564f2916d 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -60,7 +60,7 @@  INDEX
 INDEX
 	_vsscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int vscanf(const char *<[fmt]>, va_list <[list]>);
@@ -74,40 +74,6 @@  ANSI_SYNOPSIS
 	int _vsscanf_r(struct _reent *<[reent]>, const char *<[str]>,
                        const char *<[fmt]>, va_list <[list]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int vscanf( <[fmt]>, <[ist]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsscanf( <[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
 DESCRIPTION
 <<vscanf>>, <<vfscanf>>, and <<vsscanf>> are (respectively) variants
 of <<scanf>>, <<fscanf>>, and <<sscanf>>.  They differ only in
diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c
index 5de99474d..9e6736f77 100644
--- a/newlib/libc/stdio/open_memstream.c
+++ b/newlib/libc/stdio/open_memstream.c
@@ -12,7 +12,7 @@  INDEX
 INDEX
 	open_wmemstream
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *open_memstream(char **restrict <[buf]>,
 			     size_t *restrict <[size]>);
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index 14b4d2173..0f0259632 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -24,21 +24,12 @@  INDEX
 INDEX
 	_perror_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void perror(char *<[prefix]>);
 
 	void _perror_r(struct _reent *<[reent]>, char *<[prefix]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void perror(<[prefix]>)
-	char *<[prefix]>;
-
-	void _perror_r(<[reent]>, <[prefix]>)
-	struct _reent *<[reent]>;
-	char *<[prefix]>;
-
 DESCRIPTION
 Use <<perror>> to print (on standard error) an error message
 corresponding to the current value of the global variable <<errno>>.
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index 2b1fd1bf3..a00aaad08 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -24,25 +24,13 @@  INDEX
 INDEX
 	_putc_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int putc(int <[ch]>, FILE *<[fp]>);
 
 	#include <stdio.h>
 	int _putc_r(struct _reent *<[ptr]>, int <[ch]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int putc(<[ch]>, <[fp]>)
-	int <[ch]>;
-	FILE *<[fp]>;
-
-	#include <stdio.h>
-	int _putc_r(<[ptr]>, <[ch]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	int <[ch]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<putc>> is a macro, defined in <<stdio.h>>.  <<putc>>
 writes the argument <[ch]> to the file or stream identified by
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index bb27dc4e6..a4b669832 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -24,21 +24,12 @@  INDEX
 INDEX
 	_putchar_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int putchar(int <[ch]>);
 
 	int _putchar_r(struct _reent *<[reent]>, int <[ch]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int putchar(<[ch]>)
-	int <[ch]>;
-
-	int _putchar_r(<[reent]>, <[ch]>)
-	struct _reent *<[reent]>;
-	int <[ch]>;
-
 DESCRIPTION
 <<putchar>> is a macro, defined in <<stdio.h>>.  <<putchar>>
 writes its argument to the standard output stream,
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 74673715f..72f929eea 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -24,21 +24,12 @@  INDEX
 INDEX
 	_puts_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int puts(const char *<[s]>);
 
 	int _puts_r(struct _reent *<[reent]>, const char *<[s]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int puts(<[s]>)
-	char *<[s]>;
-
-	int _puts_r(<[reent]>, <[s]>)
-	struct _reent *<[reent]>;
-	char *<[s]>;
-
 DESCRIPTION
 <<puts>> writes the string at <[s]> (followed by a newline, instead of
 the trailing null) to the standard output stream.
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 682015c0a..d4f785814 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -22,16 +22,10 @@  FUNCTION
 INDEX
 	putw
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int putw(int <[w]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int putw(<w>, <[fp]>)
-	int <w>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<putw>> is a function, defined in <<stdio.h>>.  You can use <<putw>>
 to write a word to the file or stream identified by <[fp]>.  As a side
diff --git a/newlib/libc/stdio/putwchar.c b/newlib/libc/stdio/putwchar.c
index cdd254217..248d5922d 100644
--- a/newlib/libc/stdio/putwchar.c
+++ b/newlib/libc/stdio/putwchar.c
@@ -37,7 +37,7 @@  INDEX
 INDEX
 	_putwchar_unlocked_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <wchar.h>
 	wint_t putwchar(wchar_t <[wc]>);
 
@@ -50,25 +50,6 @@  ANSI_SYNOPSIS
 	#include <wchar.h>
 	wint_t _putwchar_unlocked_r(struct _reent *<[reent]>, wchar_t <[wc]>);
 
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wint_t putwchar(<[wc]>)
-	wchar_t <[wc]>;
-
-	#include <wchar.h>
-	wint_t putwchar_unlocked(<[wc]>)
-	wchar_t <[wc]>;
-
-	#include <wchar.h>
-	wint_t _putwchar_r(<[reent]>, <[wc]>)
-	struct _reent *<[reent]>;
-	wchar_t <[wc]>;
-
-	#include <wchar.h>
-	wint_t _putwchar_unlocked_r(<[reent]>, <[wc]>)
-	struct _reent *<[reent]>;
-	wchar_t <[wc]>;
-
 DESCRIPTION
 The <<putwchar>> function or macro is the wide-character equivalent of
 the <<putchar>> function. It writes the wide character wc to stdout.
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 5a3e16be9..7b8d3060f 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -24,21 +24,12 @@  INDEX
 INDEX
 	_remove_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int remove(char *<[filename]>);
 
 	int _remove_r(struct _reent *<[reent]>, char *<[filename]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int remove(<[filename]>)
-	char *<[filename]>;
-
-	int _remove_r(<[reent]>, <[filename]>)
-	struct _reent *<[reent]>;
-	char *<[filename]>;
-
 DESCRIPTION
 Use <<remove>> to dissolve the association between a particular
 filename (the string at <[filename]>) and the file it represents.
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index 6eb1f7d19..1b807f8b2 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -22,16 +22,10 @@  FUNCTION
 INDEX
 	rename
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int rename(const char *<[old]>, const char *<[new]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int rename(<[old]>, <[new]>)
-	char *<[old]>;
-	char *<[new]>;
-
 DESCRIPTION
 Use <<rename>> to establish a new name (the string at <[new]>) for a
 file now known by the string at <[old]>.  After a successful
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index fb03e5be7..417a5963d 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -24,20 +24,11 @@  INDEX
 INDEX
 	_rewind_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void rewind(FILE *<[fp]>);
 	void _rewind_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void rewind(<[fp]>)
-	FILE *<[fp]>;
-
-	void _rewind_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<rewind>> returns the file position indicator (if any) for the file
 or stream identified by <[fp]> to the beginning of the file.  It also
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index cffb6fbf4..29f5377a7 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -22,16 +22,10 @@  FUNCTION
 INDEX
 	setbuf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void setbuf(FILE *<[fp]>, char *<[buf]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void setbuf(<[fp]>, <[buf]>)
-	FILE *<[fp]>;
-	char *<[buf]>;
-
 DESCRIPTION
 <<setbuf>> specifies that output to the file or stream identified by <[fp]>
 should be fully buffered.  All output for this file will go to a
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index e88187446..880779d13 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -27,17 +27,10 @@  FUNCTION
 INDEX
 	setbuffer
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void setbuffer(FILE *<[fp]>, char *<[buf]>, int <[size]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void setbuffer(<[fp]>, <[buf]>, <[size]>)
-	FILE *<[fp]>;
-	char *<[buf]>;
-	int <[size]>;
-
 DESCRIPTION
 <<setbuffer>> specifies that output to the file or stream identified by
 <[fp]> should be fully buffered.  All output for this file will go to a
diff --git a/newlib/libc/stdio/setlinebuf.c b/newlib/libc/stdio/setlinebuf.c
index 0df6a579a..d8cb013d9 100644
--- a/newlib/libc/stdio/setlinebuf.c
+++ b/newlib/libc/stdio/setlinebuf.c
@@ -27,15 +27,10 @@  FUNCTION
 INDEX
 	setlinebuf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	void setlinebuf(FILE *<[fp]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void setlinebuf(<[fp]>)
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<setlinebuf>> specifies that output to the file or stream identified by
 <[fp]> should be line buffered.  This causes the file or stream to pass
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index a8e46a5d0..6fa0252b0 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -22,19 +22,11 @@  FUNCTION
 INDEX
 	setvbuf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int setvbuf(FILE *<[fp]>, char *<[buf]>,
 	            int <[mode]>, size_t <[size]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int setvbuf(<[fp]>, <[buf]>, <[mode]>, <[size]>)
-	FILE *<[fp]>;
-	char *<[buf]>;
-	int <[mode]>;
-	size_t <[size]>;
-
 DESCRIPTION
 Use <<setvbuf>> to specify what kind of buffering you want for the
 file or stream identified by <[fp]>, by using one of the following
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index f0a80980c..d9559c359 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -44,7 +44,7 @@  INDEX
 INDEX
 	_asniprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
         int iprintf(const char *<[format]>, ...);
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index a6a812670..c89eb7c8d 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_siscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
         int iscanf(const char *<[format]>, ...);
@@ -45,36 +45,6 @@  ANSI_SYNOPSIS
         int _siscanf_r(struct _reent *<[ptr]>, const char *<[str]>,
                    const char *<[format]>, ...);
 
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int iscanf(<[format]> [, <[arg]>, ...])
-	char *<[format]>;
-
-	int fiscanf(<[fd]>, <[format]> [, <[arg]>, ...]);
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int siscanf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int _iscanf_r(<[ptr]>, <[format]> [, <[arg]>, ...])
-        struct _reent *<[ptr]>;
-	char *<[format]>;
-
-	int _fiscanf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int _siscanf_r(<[ptr]>, <[str]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	char *<[str]>;
-	char *<[format]>;
-
-
 DESCRIPTION
         <<iscanf>>, <<fiscanf>>, and <<siscanf>> are the same as
 	<<scanf>>, <<fscanf>>, and <<sscanf>> respectively, only that
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index d74c6f891..7fc9e6821 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -44,7 +44,7 @@  INDEX
 INDEX
 	_asnprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
         int printf(const char *restrict <[format]>, ...);
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 7961294e7..d2d9dfe8b 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_sscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
         int scanf(const char *restrict <[format]>, ...);
@@ -45,36 +45,6 @@  ANSI_SYNOPSIS
         int _sscanf_r(struct _reent *<[ptr]>, const char *restrict <[str]>,
                       const char *restrict <[format]>, ...);
 
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int scanf(<[format]> [, <[arg]>, ...])
-	char *<[format]>;
-
-	int fscanf(<[fd]>, <[format]> [, <[arg]>, ...]);
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int sscanf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int _scanf_r(<[ptr]>, <[format]> [, <[arg]>, ...])
-        struct _reent *<[ptr]>;
-	char *<[format]>;
-
-	int _fscanf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int _sscanf_r(<[ptr]>, <[str]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	char *<[str]>;
-	char *<[format]>;
-
-
 DESCRIPTION
         <<scanf>> scans a series of input fields from standard input,
 		one character at a time.  Each field is interpreted according to
diff --git a/newlib/libc/stdio/stdio_ext.c b/newlib/libc/stdio/stdio_ext.c
index 588209d18..98f2ccaa9 100644
--- a/newlib/libc/stdio/stdio_ext.c
+++ b/newlib/libc/stdio/stdio_ext.c
@@ -17,7 +17,7 @@  INDEX
 INDEX
 	__fwriting
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdio_ext.h>
 	size_t __fbufsize(FILE *<[fp]>);
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 2233b3ba7..fe106f036 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_swprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <wchar.h>
 
         int wprintf(const wchar_t *<[format]>, ...);
diff --git a/newlib/libc/stdio/swscanf.c b/newlib/libc/stdio/swscanf.c
index 6a469ac31..d52d826e3 100644
--- a/newlib/libc/stdio/swscanf.c
+++ b/newlib/libc/stdio/swscanf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_swscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
 
         int wscanf(const wchar_t *__restrict <[format]>, ...);
@@ -47,36 +47,6 @@  ANSI_SYNOPSIS
         int _swscanf_r(struct _reent *<[ptr]>, const wchar_t *<[str]>,
                       const wchar_t *<[format]>, ...);
 
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int wscanf(<[format]> [, <[arg]>, ...])
-	wchar_t *__restrict <[format]>;
-
-	int fwscanf(<[fd]>, <[format]> [, <[arg]>, ...]);
-	FILE *<[fd]>;
-	wchar_t *<[format]>;
-
-	int swscanf(<[str]>, <[format]> [, <[arg]>, ...]);
-	wchar_t *__restrict <[str]>;
-	wchar_t *__restrict <[format]>;
-
-	int _wscanf_r(<[ptr]>, <[format]> [, <[arg]>, ...])
-        struct _reent *<[ptr]>;
-	wchar_t *<[format]>;
-
-	int _fwscanf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	FILE *<[fd]>;
-	wchar_t *<[format]>;
-
-	int _swscanf_r(<[ptr]>, <[str]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	wchar_t *<[str]>;
-	wchar_t *<[format]>;
-
-
 DESCRIPTION
         <<wscanf>> scans a series of input fields from standard input,
 		one wide character at a time.  Each field is interpreted according to
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index eca4ec735..6145ad0bc 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -7,19 +7,12 @@  INDEX
 INDEX
 	_tmpfile_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	FILE *tmpfile(void);
 
 	FILE *_tmpfile_r(struct _reent *<[reent]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *tmpfile();
-
-	FILE *_tmpfile_r(<[reent]>)
-	struct _reent *<[reent]>;
-
 DESCRIPTION
 Create a temporary file (a file which will be deleted automatically),
 using a name generated by <<tmpnam>>.  The temporary file is opened with
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index ee722e630..765d27afd 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -15,31 +15,13 @@  INDEX
 INDEX
 	_tempnam_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	char *tmpnam(char *<[s]>);
 	char *tempnam(char *<[dir]>, char *<[pfx]>);
 	char *_tmpnam_r(struct _reent *<[reent]>, char *<[s]>);
 	char *_tempnam_r(struct _reent *<[reent]>, char *<[dir]>, char *<[pfx]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	char *tmpnam(<[s]>)
-	char *<[s]>;
-
-	char *tempnam(<[dir]>, <[pfx]>)
-	char *<[dir]>;
-	char *<[pfx]>;
-
-	char *_tmpnam_r(<[reent]>, <[s]>)
-	struct _reent *<[reent]>;
-	char *<[s]>;
-
-	char *_tempnam_r(<[reent]>, <[dir]>, <[pfx]>)
-	struct *<[reent]>;
-	char *<[dir]>;
-	char *<[pfx]>;
-
 DESCRIPTION
 Use either of these functions to generate a name for a temporary file.
 The generated name is guaranteed to avoid collision with other files
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index e385ce8fb..da4b19d3c 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -23,7 +23,7 @@  INDEX
 INDEX
 	_ungetc_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	int ungetc(int <[c]>, FILE *<[stream]>);
 
diff --git a/newlib/libc/stdio/ungetwc.c b/newlib/libc/stdio/ungetwc.c
index a69449eb2..000d4bdbb 100644
--- a/newlib/libc/stdio/ungetwc.c
+++ b/newlib/libc/stdio/ungetwc.c
@@ -33,7 +33,7 @@  INDEX
 INDEX
         _ungetwc_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
         #include <stdio.h>
         #include <wchar.h>
         wint_t ungetwc(wint_t <[wc]>, FILE *<[stream]>);
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 3585423af..50a3478a4 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -63,7 +63,7 @@  INDEX
 INDEX
 	_vasnprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int vprintf(const char *<[fmt]>, va_list <[list]>);
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index c5fcae577..23b7a5686 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_vsscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int vscanf(const char *<[fmt]>, va_list <[list]>);
@@ -46,40 +46,6 @@  ANSI_SYNOPSIS
 	int _vsscanf_r(struct _reent *<[reent]>, const char *<[str]>,
                        const char *<[fmt]>, va_list <[list]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int vscanf( <[fmt]>, <[ist]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsscanf( <[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
 DESCRIPTION
 <<vscanf>>, <<vfscanf>>, and <<vsscanf>> are (respectively) variants
 of <<scanf>>, <<fscanf>>, and <<sscanf>>.  They differ only in
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 4786ed6a9..9c421d267 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -47,7 +47,7 @@  INDEX
 INDEX
 	_vswprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	#include <wchar.h>
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index fd4f1f9f6..b945a3507 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -32,7 +32,7 @@  INDEX
 INDEX
 	_vswscanf
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int vwscanf(const wchar_t *__restrict <[fmt]>, va_list <[list]>);
@@ -48,40 +48,6 @@  ANSI_SYNOPSIS
 	int _vswscanf(struct _reent *<[reent]>, const wchar_t *<[str]>,
                        const wchar_t *<[fmt]>, va_list <[list]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int vwscanf( <[fmt]>, <[ist]>)
-	wchar_t *__restrict <[fmt]>;
-	va_list <[list]>;
-
-	int vfwscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *__restrict <[fp]>;
-	wchar_t *__restrict <[fmt]>;
-	va_list <[list]>;
-
-	int vswscanf( <[str]>, <[fmt]>, <[list]>)
-	wchar_t *__restrict <[str]>;
-	wchar_t *__restrict <[fmt]>;
-	va_list <[list]>;
-
-	int _vwscanf( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
-	wchar_t *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfwscanf( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	wchar_t *<[fmt]>;
-	va_list <[list]>;
-
-	int _vswscanf( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	wchar_t *<[str]>;
-	wchar_t *<[fmt]>;
-	va_list <[list]>;
-
 DESCRIPTION
 <<vwscanf>>, <<vfwscanf>>, and <<vswscanf>> are (respectively) variants
 of <<wscanf>>, <<fwscanf>>, and <<swscanf>>.  They differ only in
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index fec92fa8a..85ae286bb 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -44,7 +44,7 @@  INDEX
 INDEX
 	_vasniprintf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int viprintf(const char *<[fmt]>, va_list <[list]>);
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 9a7d0c5f2..379daa232 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -34,7 +34,7 @@  INDEX
 INDEX
 	_vsiscanf_r
 
-ANSI_SYNOPSIS
+SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
 	int viscanf(const char *<[fmt]>, va_list <[list]>);
@@ -48,40 +48,6 @@  ANSI_SYNOPSIS
 	int _vsiscanf_r(struct _reent *<[reent]>, const char *<[str]>,
                        const char *<[fmt]>, va_list <[list]>);
 
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int viscanf( <[fmt]>, <[ist]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfiscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int vsiscanf( <[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _viscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfiscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int _vsiscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
 DESCRIPTION
 <<viscanf>>, <<vfiscanf>>, and <<vsiscanf>> are (respectively) variants
 of <<iscanf>>, <<fiscanf>>, and <<siscanf>>.  They differ only in