diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index 2906bb30dbe5..01744a890d8c 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fflush.3,v 1.7 1998/08/29 08:32:34 lukem Exp $
+.\"	$NetBSD: fflush.3,v 1.8 2001/09/16 02:17:15 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -103,8 +103,8 @@ for any of the errors specified for the routine
 .Xr write 2 .
 .Sh SEE ALSO
 .Xr write 2 ,
-.Xr fopen 3 ,
 .Xr fclose 3 ,
+.Xr fopen 3 ,
 .Xr setbuf 3
 .Sh STANDARDS
 The
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index 63c092c9c16b..e63b8a3f1a68 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fgets.3,v 1.10 2000/12/29 15:22:49 kleink Exp $
+.\"	$NetBSD: fgets.3,v 1.11 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -84,7 +84,6 @@ except that the newline character (if any) is not stored in the string.
 It is the caller's responsibility to ensure that the input line,
 if any, is sufficiently short to fit in the string.
 .Sh RETURN VALUES
-.Pp
 Upon successful completion,
 .Fn fgets
 and
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index 7f3fff4599b2..661940dff847 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fputs.3,v 1.6 2000/12/29 15:22:49 kleink Exp $
+.\"	$NetBSD: fputs.3,v 1.7 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,8 +99,8 @@ may also fail and set
 for any of the errors specified for the routines
 .Xr write 2 .
 .Sh SEE ALSO
-.Xr putc 3 ,
 .Xr ferror 3 ,
+.Xr putc 3 ,
 .Xr stdio 3
 .Sh STANDARDS
 The functions
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 0b3c006c315b..b675c5c820fb 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getc.3,v 1.6 2001/04/25 22:06:54 kleink Exp $
+.\"	$NetBSD: getc.3,v 1.7 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -136,8 +136,8 @@ until the condition is cleared with
 .Xr clearerr 3 .
 .Sh SEE ALSO
 .Xr ferror 3 ,
-.Xr fread 3 ,
 .Xr fopen 3 ,
+.Xr fread 3 ,
 .Xr putc 3 ,
 .Xr ungetc 3
 .Sh STANDARDS
@@ -169,4 +169,3 @@ The size and byte order of an
 varies from one machine to another, and
 .Fn getw
 is not recommended for portable applications.
-.Pp
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 1edcfaa0e309..ded4ac01b57a 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printf.3,v 1.19 2001/04/30 08:47:59 kleink Exp $
+.\"	$NetBSD: printf.3,v 1.20 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -47,7 +47,7 @@
 .Nm snprintf ,
 .Nm asprintf ,
 .Nm vprintf ,
-.Nm vfprintf,
+.Nm vfprintf ,
 .Nm vsprintf ,
 .Nm vsnprintf ,
 .Nm vasprintf
@@ -87,7 +87,7 @@ as described below.
 and
 .Fn vprintf
 write output to
-.Em stdout,
+.Em stdout ,
 the standard output stream;
 .Fn fprintf
 and
@@ -611,7 +611,6 @@ is
 In no case does a non-existent or small field width cause truncation of
 a field; if the result of a conversion is wider than the field width, the
 field is expanded to contain the conversion result.
-.Pp
 .Sh EXAMPLES
 .br
 To print a date and time in the form `Sunday, July 3, 10:02',
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 14a99e1de981..3489505fbf01 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: scanf.3,v 1.12 2001/04/30 08:47:59 kleink Exp $
+.\"	$NetBSD: scanf.3,v 1.13 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -383,7 +383,6 @@ and a `conversion' of
 .Ql %\e0
 causes an immediate return of
 .Dv EOF .
-.Pp
 .Sh RETURN VALUES
 These
 functions
@@ -404,11 +403,11 @@ end-of-file occurs. If an error or end-of-file occurs after conversion
 has begun,
 the number of conversions which were successfully completed is returned.
 .Sh SEE ALSO
-.Xr strtol 3 ,
-.Xr strtoul 3 ,
-.Xr strtod 3 ,
 .Xr getc 3 ,
-.Xr printf 3
+.Xr printf 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
 .Sh STANDARDS
 The functions
 .Fn fscanf ,
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index 7505de92d39c..dd3a4c0fdeb4 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: setbuf.3,v 1.8 2001/09/16 02:08:55 wiz Exp $
+.\"	$NetBSD: setbuf.3,v 1.9 2001/09/16 02:17:16 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -174,12 +174,12 @@ function returns what the equivalent
 .Fn setvbuf
 would have returned.
 .Sh SEE ALSO
-.Xr fopen 3 ,
 .Xr fclose 3 ,
+.Xr fopen 3 ,
 .Xr fread 3 ,
 .Xr malloc 3 ,
-.Xr puts 3 ,
-.Xr printf 3
+.Xr printf 3 ,
+.Xr puts 3
 .Sh STANDARDS
 The
 .Fn setbuf
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 34a55c576d66..05e7a56f0b8b 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: stdio.3,v 1.10 2001/09/16 02:08:55 wiz Exp $
+.\"	$NetBSD: stdio.3,v 1.11 2001/09/16 02:17:17 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -174,7 +174,7 @@ without first removing their current definitions with
 .Dv FOPEN_MAX ,
 .Dv L_cuserid ,
 .Dv L_ctermid ,
-.Dv L_tmpnam,
+.Dv L_tmpnam ,
 .Dv NULL ,
 .Dv SEEK_END ,
 .Dv SEEK_SET ,
@@ -205,16 +205,10 @@ and
 .Fn putchar
 exist and will be used if the macros definitions are explicitly removed.
 .Sh SEE ALSO
-.Xr open 2 ,
 .Xr close 2 ,
+.Xr open 2 ,
 .Xr read 2 ,
 .Xr write 2
-.Sh BUGS
-The standard buffered functions do not interact well with certain other
-library and system functions, especially
-.Xr vfork 2
-and
-.Xr abort 3 .
 .Sh STANDARDS
 The
 .Nm
@@ -286,3 +280,9 @@ vsnprintf	formatted output conversion
 vsprintf	formatted output conversion
 vsscanf	input format conversion
 .El
+.Sh BUGS
+The standard buffered functions do not interact well with certain other
+library and system functions, especially
+.Xr vfork 2
+and
+.Xr abort 3 .
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index a7d683c37b24..2046ecf96508 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ungetc.3,v 1.4 1998/02/05 18:49:38 perry Exp $
+.\"	$NetBSD: ungetc.3,v 1.5 2001/09/16 02:17:17 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -89,8 +89,8 @@ character equals
 .Dv EOF ,
 the operation will fail and the stream will remain unchanged.
 .Sh SEE ALSO
-.Xr getc 3 ,
 .Xr fseek 3 ,
+.Xr getc 3 ,
 .Xr setvbuf 3
 .Sh STANDARDS
 The