- correct macro usage

- section reorder

10 files changed, 109 insertions, 109 deletions

diff --git a/lib/libc/gen/isupper.3 b/lib/libc/gen/isupper.3
index c2d31dfcad5..8b7b4408e4f 100644
--- a/lib/libc/gen/isupper.3
+++ b/lib/libc/gen/isupper.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isupper.3,v 1.7 2001/06/25 03:24:04 pjanzen Exp $
+.\"	$OpenBSD: isupper.3,v 1.8 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -84,7 +84,7 @@ non-zero if the character tests true.
 .Xr ascii 7
 .Sh STANDARDS
 The
-.Xr isupper
+.Fn isupper
 function conforms to
 .St -ansiC .
 .Sh CAVEATS
diff --git a/lib/libc/gen/login_cap.3 b/lib/libc/gen/login_cap.3
index 9e8f73027f0..6a8045d9009 100644
--- a/lib/libc/gen/login_cap.3
+++ b/lib/libc/gen/login_cap.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login_cap.3,v 1.9 2003/03/06 20:48:35 jmc Exp $
+.\" $OpenBSD: login_cap.3,v 1.10 2003/05/30 17:21:06 jmc Exp $
 .\" BSDI $From: login_cap.3,v 1.4 1997/11/07 16:22:27 jch Exp $
 .\"
 .Dd July 16, 1996
@@ -185,7 +185,7 @@ function takes
 .Ar class ,
 the name of a user class, and sets the resources defined by that
 class according to
-.Ar flags.
+.Ar flags .
 Only the
 .Dv LOGIN_SETPATH ,
 .Dv LOGIN_SETPRIORITY ,
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index a83494f6e5f..7e01d522d12 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: popen.3,v 1.10 2001/07/17 17:08:29 aaron Exp $
+.\"	$OpenBSD: popen.3,v 1.11 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -127,7 +127,7 @@ command, if
 already
 .Dq pclosed ,
 or if
-.Xr wait4
+.Xr wait4 2
 returns an error.
 .Sh ERRORS
 The
@@ -144,6 +144,13 @@ function does not reliably set
 .Xr fopen 3 ,
 .Xr stdio 3 ,
 .Xr system 3
+.Sh HISTORY
+A
+.Fn popen
+and a
+.Fn pclose
+function appeared in
+.At v7 .
 .Sh BUGS
 Since the standard input of a command opened for reading
 shares its seek offset with the process that called
@@ -164,13 +171,6 @@ The only hint is an exit status of 127.
 The
 .Fn popen
 argument always calls
-.Xr sh ;
+.Xr sh 1 ;
 it never calls
-.Xr csh .
-.Sh HISTORY
-A
-.Fn popen
-and a
-.Fn pclose
-function appeared in
-.At v7 .
+.Xr csh 1 .
diff --git a/lib/libc/gen/readpassphrase.3 b/lib/libc/gen/readpassphrase.3
index 9134f1fc58c..bcbc9d744bf 100644
--- a/lib/libc/gen/readpassphrase.3
+++ b/lib/libc/gen/readpassphrase.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readpassphrase.3,v 1.10 2003/05/03 19:04:40 jmc Exp $
+.\"	$OpenBSD: readpassphrase.3,v 1.11 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -79,6 +79,31 @@ Upon successful completion,
 returns a pointer to the null-terminated passphrase.
 If an error is encountered, the terminal state is restored and
 a null pointer is returned.
+.Sh FILES
+.Bl -tag -width /dev/tty -compact
+.It Pa /dev/tty
+.El
+.Sh EXAMPLES
+The following code fragment will read a passphrase from
+.Pa /dev/tty
+into the buffer
+.Fa passbuf .
+.Bd -literal -offset indent
+char passbuf[1024];
+
+\&...
+
+if (readpassphrase("Response: ", passbuf, sizeof(passbuf),
+    RPP_REQUIRE_TTY) == NULL)
+	errx(1, "unable to read passphrase");
+
+if (compare(transform(passbuf), epass) != 0)
+	errx(1, "bad passphrase");
+
+\&...
+
+memset(passbuf, 0, sizeof(passbuf));
+.Ed
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EINTR
@@ -102,27 +127,6 @@ There is no controlling terminal and the
 .Dv RPP_REQUIRE_TTY
 flag was specified.
 .El
-.Sh EXAMPLES
-The following code fragment will read a passphrase from
-.Pa /dev/tty
-into the buffer
-.Fa passbuf.
-.Bd -literal -offset indent
-char passbuf[1024];
-
-\&...
-
-if (readpassphrase("Response: ", passbuf, sizeof(passbuf),
-    RPP_REQUIRE_TTY) == NULL)
-	errx(1, "unable to read passphrase");
-
-if (compare(transform(passbuf), epass) != 0)
-	errx(1, "bad passphrase");
-
-\&...
-
-memset(passbuf, 0, sizeof(passbuf));
-.Ed
 .Sh SIGNALS
 .Fn readpassphrase
 will catch the following signals:
@@ -158,10 +162,6 @@ from a background process) are treated specially.
 When the process is resumed after it has been stopped,
 .Fn readpassphrase
 will reprint the prompt and the user may then enter a passphrase.
-.Sh FILES
-.Bl -tag -width /dev/tty -compact
-.It Pa /dev/tty
-.El
 .Sh SEE ALSO
 .Xr sigaction 2 ,
 .Xr getpass 3
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 3d59d80e17a..966fb77caa3 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: signal.3,v 1.21 2003/05/12 14:36:44 jmc Exp $
+.\"	$OpenBSD: signal.3,v 1.22 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -361,7 +361,6 @@ Safe if the
 .Va syslog_data
 struct is initialized as a local variable.
 .El
-.Pp
 .Sh RETURN VALUES
 The previous action is returned on a successful call.
 Otherwise,
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 0e200a22d93..adaded79398 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysconf.3,v 1.14 2003/04/30 06:28:10 jmc Exp $
+.\"	$OpenBSD: sysconf.3,v 1.15 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -174,10 +174,6 @@ argument is invalid.
 .El
 .Sh SEE ALSO
 .Xr sysctl 3
-.Sh BUGS
-The value for _SC_STREAM_MAX is a minimum maximum, and required to be
-the same as ANSI C's FOPEN_MAX, so the returned value is a ridiculously
-small and misleading number.
 .Sh STANDARDS
 The
 .Fn sysconf
@@ -188,3 +184,7 @@ The
 .Fn sysconf
 function first appeared in
 .Bx 4.4 .
+.Sh BUGS
+The value for _SC_STREAM_MAX is a minimum maximum, and required to be
+the same as ANSI C's FOPEN_MAX, so the returned value is a ridiculously
+small and misleading number.
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 758dbadff72..bb6002b4113 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.102 2003/05/03 19:04:40 jmc Exp $
+.\"	$OpenBSD: sysctl.3,v 1.103 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -577,7 +577,7 @@ The maximum number of semaphores allowed in the system.
 .It Dv KERN_SEMINFO_SEMMNU
 The maximum number of semaphore undo structures allowed in the system.
 .It Dv KERN_SEMINFO_SEMMSL
-The maximum number of semaphores allowed per id.
+The maximum number of semaphores allowed per ID.
 .It Dv KERN_SEMINFO_SEMOPM
 The maximum number of operations per
 .Xr semop 2
@@ -1233,7 +1233,7 @@ and autoconfigures address prefixes and default routers.
 The node must be a host
 .Pq not a router
 for the option to be meaningful (see
-.Li ip6.forwarding Ns ).
+.Li ip6.forwarding ) .
 .It Li ip6.keepfaith
 If set to non-zero, enables the
 .Dq FAITH
@@ -1477,7 +1477,8 @@ timezone.
 .El
 .Ss CTL_DDB
 Integer information and settable variables are available for the
-.Dv CTL_DDB level, as described below.
+.Dv CTL_DDB level ,
+as described below.
 More information is also available in
 .Xr ddb 4 .
 .Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent
@@ -1573,7 +1574,7 @@ Encryption keys are deleted when their reference counter reaches zero.
 .El
 .It Dv VM_UVMEXP
 Contains statistics about the UVM memory management system.
-.It Dv VM_METER:
+.It Dv VM_METER
 Contains statistics about the memory management system, using the old
 VM format.
 .El
@@ -1631,6 +1632,43 @@ If the call to
 is unsuccessful, \-1 is returned and
 .Va errno
 is set appropriately.
+.Sh FILES
+.Bl -tag -width <uvm/uvmXswapXencrypt.h> -compact
+.It Aq Pa sys/sysctl.h
+definitions for top level identifiers, second level kernel and hardware
+identifiers, and user level identifiers
+.It Aq Pa sys/socket.h
+definitions for second level network identifiers
+.It Aq Pa sys/gmon.h
+definitions for third level profiling identifiers
+.It Aq Pa vm/vm_param.h
+definitions for second level virtual memory identifiers
+.It Aq Pa uvm/uvm_swap_encrypt.h
+definitions for third level virtual memory identifiers
+.It Aq Pa netinet/in.h
+definitions for third level IPv4/v6 identifiers and
+fourth level
+.Tn IP
+and
+.Tn IPv6
+identifiers
+.It Aq Pa netinet/icmp_var.h
+definitions for fourth level
+.Tn ICMP
+identifiers
+.It Aq Pa netinet/icmp6.h
+definitions for fourth level
+.Tn ICMPv6
+identifiers
+.It Aq Pa netinet/tcp_var.h
+definitions for fourth level
+.Tn TCP
+identifiers
+.It Aq Pa netinet/udp_var.h
+definitions for fourth level
+.Tn UDP
+identifiers
+.El
 .Sh ERRORS
 The following errors may be reported:
 .Bl -tag -width Er
@@ -1673,43 +1711,6 @@ A process without appropriate privileges attempts to set a value.
 An attempt to change a value protected by the current kernel security
 level is made.
 .El
-.Sh FILES
-.Bl -tag -width <uvm/uvmXswapXencrypt.h> -compact
-.It Aq Pa sys/sysctl.h
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
-definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
-definitions for third level profiling identifiers
-.It Aq Pa vm/vm_param.h
-definitions for second level virtual memory identifiers
-.It Aq Pa uvm/uvm_swap_encrypt.h
-definitions for third level virtual memory identifiers
-.It Aq Pa netinet/in.h
-definitions for third level IPv4/v6 identifiers and
-fourth level
-.Tn IP
-and
-.Tn IPv6
-identifiers
-.It Aq Pa netinet/icmp_var.h
-definitions for fourth level
-.Tn ICMP
-identifiers
-.It Aq Pa netinet/icmp6.h
-definitions for fourth level
-.Tn ICMPv6
-identifiers
-.It Aq Pa netinet/tcp_var.h
-definitions for fourth level
-.Tn TCP
-identifiers
-.It Aq Pa netinet/udp_var.h
-definitions for fourth level
-.Tn UDP
-identifiers
-.El
 .Sh SEE ALSO
 .Xr sysctl 8
 .Sh HISTORY
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 80763d59554..fbceb32f5d5 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslog.3,v 1.21 2003/04/30 06:28:10 jmc Exp $
+.\"	$OpenBSD: syslog.3,v 1.22 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -36,14 +36,14 @@
 .Os
 .Sh NAME
 .Nm syslog ,
-.Nm syslog_r,
+.Nm syslog_r ,
 .Nm vsyslog ,
-.Nm vsyslog_r,
+.Nm vsyslog_r ,
 .Nm openlog ,
-.Nm openlog_r,
+.Nm openlog_r ,
 .Nm closelog ,
-.Nm closelog_r,
-.Nm setlogmask,
+.Nm closelog_r ,
+.Nm setlogmask ,
 .Nm setlogmask_r
 .Nd control system log
 .Sh SYNOPSIS
@@ -107,7 +107,7 @@ A trailing newline is added if none is present.
 The
 .Fn syslog_r
 function is a reentrant version of the
-.Xr syslog 3
+.Fn syslog
 function.
 It takes a pointer to a
 .Fa syslog_data
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index a8fa5afda3f..0a79b818210 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ttyname.3,v 1.12 2000/12/24 00:30:52 aaron Exp $
+.\"	$OpenBSD: ttyname.3,v 1.13 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -124,6 +124,11 @@ The
 .Fn ttyslot
 function returns the unit number of the device file if found; otherwise
 the value zero is returned.
+.Sh FILES
+.Bl -tag -width /etc/ttys -compact
+.It Pa /dev/\(**
+.It Pa /etc/ttys
+.El
 .Sh ERRORS
 The
 .Fn ttyname
@@ -145,11 +150,6 @@ The value of
 is smaller than the length of the string to be returned including the
 terminating NUL character.
 .El
-.Sh FILES
-.Bl -tag -width /etc/ttys -compact
-.It Pa /dev/\(**
-.It Pa /etc/ttys
-.El
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr ttys 5 ,
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index c24fa6c944f..877ff2eb922 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utime.3,v 1.14 2000/12/24 00:30:53 aaron Exp $
+.\"	$OpenBSD: utime.3,v 1.15 2003/05/30 17:21:06 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -139,13 +139,13 @@ The file system containing the file is mounted read-only.
 .Sh SEE ALSO
 .Xr stat 2 ,
 .Xr utimes 2
-.Sh HISTORY
-A
-.Fn utime
-function appeared in
-.At v7 .
 .Sh STANDARDS
 The
 .Fn utime
 function conforms to
 .St -p1003.1-88 .
+.Sh HISTORY
+A
+.Fn utime
+function appeared in
+.At v7 .