- clean up macro abuse

- section reorder
- merge COMPATIBILITY

13 files changed, 57 insertions, 57 deletions

diff --git a/lib/libc/gen/auth_subr.3 b/lib/libc/gen/auth_subr.3
index d9484e0d3b3..2ba03288938 100644
--- a/lib/libc/gen/auth_subr.3
+++ b/lib/libc/gen/auth_subr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: auth_subr.3,v 1.11 2003/05/03 19:04:40 jmc Exp $
+.\"	$OpenBSD: auth_subr.3,v 1.12 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -222,7 +222,6 @@ The name and value are separated by an
 .Pp
 .Li Ta Fl v Ar name=value
 .Pp
-.Pp
 Once the login script has been spawned, any data specified by the
 .Fn auth_setdata
 is written to the back channel.
@@ -375,7 +374,8 @@ variable
 These variables are set by login scripts.
 When a new login script is run
 (by the
-.Fn auth_call function)
+.Fn auth_call
+function)
 the values from the previous login script are lost.
 (See
 .Xr login.conf 5
@@ -490,6 +490,11 @@ sets the sessions state to
 Typically this is either
 .Li AUTH_OKAY
 or 0.
+.Sh SEE ALSO
+.Xr authenticate 3 ,
+.Xr login_cap 3 ,
+.Xr pw_dup 3 ,
+.Xr login.conf 5
 .Sh CAVEATS
 The
 .Fn auth_check_change
@@ -509,8 +514,3 @@ function or use the
 .Xr auth_setpwd 3
 function to copy the passwd struct into
 .Fa as .
-.Sh SEE ALSO
-.Xr authenticate 3 ,
-.Xr login_cap 3 ,
-.Xr pw_dup 3 ,
-.Xr login.conf 5
diff --git a/lib/libc/gen/authenticate.3 b/lib/libc/gen/authenticate.3
index 48db85ae034..f690610b66a 100644
--- a/lib/libc/gen/authenticate.3
+++ b/lib/libc/gen/authenticate.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: authenticate.3,v 1.6 2003/04/30 06:28:10 jmc Exp $
+.\"	$OpenBSD: authenticate.3,v 1.7 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -69,7 +69,7 @@
 .Sh DESCRIPTION
 These functions provide a simplified interface to the BSD Authentication
 system
-.Pq see Xr bsd_auth 3 Ns .
+.Pq see Xr bsd_auth 3 .
 The
 .Fn auth_userokay
 function provides a single function call interface.
@@ -239,7 +239,7 @@ The
 function is a front end to the
 .Fn auth_call
 function
-.Pq see Xr auth_subr 3 Ns .
+.Pq see Xr auth_subr 3 .
 It will open a BSD Authentication session, if needed, and will set
 the style and user name based on the
 .Ar style
@@ -257,7 +257,7 @@ The variable arguments are passed to
 via the
 .Fn auth_set_va_list
 function
-.Pq see Xr auth_subr 3 Ns .
+.Pq see Xr auth_subr 3 .
 The, possibly created, BSD Authentication session is returned.
 The
 .Fn auth_getstate
@@ -280,6 +280,10 @@ when it is no longer needed.
 A value of
 .Dv NULL
 is returned if no memory was available for the new copy of the string.
+.Sh SEE ALSO
+.Xr auth_subr 3 ,
+.Xr getpwent 3 ,
+.Xr pw_dup 3
 .Sh CAVEATS
 The
 .Fn auth_approval ,
@@ -308,7 +312,3 @@ which can then be passed to
 .Fn auth_approval
 or
 .Fn auth_usercheck .
-.Sh SEE ALSO
-.Xr auth_subr 3 ,
-.Xr getpwent 3 ,
-.Xr pw_dup 3
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index da5f1f42524..bdbbc6e87cc 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: basename.3,v 1.14 2001/08/06 10:42:25 mpech Exp $
+.\" $OpenBSD: basename.3,v 1.15 2003/05/30 14:00:32 jmc Exp $
 .\"
 .Dd August 17, 1997
 .Dt BASENAME 3
@@ -94,4 +94,4 @@ The
 function first appeared in
 .Ox 2.2 .
 .Sh AUTHORS
-Todd C. Miller <Todd.Miller@courtesan.com>
+.An Todd C. Miller Aq Todd.Miller@courtesan.com
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index c76bc532cab..59f73600b8f 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: confstr.3,v 1.10 1999/07/09 13:35:16 aaron Exp $
+.\"	$OpenBSD: confstr.3,v 1.11 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -119,13 +119,13 @@ argument is invalid.
 .El
 .Sh SEE ALSO
 .Xr sysctl 3
-.Sh HISTORY
-The
-.Nm
-function first appeared in
-.Bx 4.4 .
 .Sh STANDARDS
 The
 .Nm
 function conforms to
 .St -p1003.2-92 .
+.Sh HISTORY
+The
+.Nm
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index ab1cca11bbc..3697d3e30ae 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: dirname.3,v 1.12 2002/06/09 05:03:59 deraadt Exp $
+.\" $OpenBSD: dirname.3,v 1.13 2003/05/30 14:00:32 jmc Exp $
 .\"
 .Dd August 17, 1997
 .Dt DIRNAME 3
@@ -101,4 +101,4 @@ The
 function first appeared in
 .Ox 2.2 .
 .Sh AUTHORS
-Todd C. Miller <Todd.Miller@courtesan.com>
+.An Todd C. Miller Aq Todd.Miller@courtesan.com
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 5ee2b6b88f1..2e52d55c88d 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exec.3,v 1.14 2001/08/23 03:52:13 pjanzen Exp $
+.\"	$OpenBSD: exec.3,v 1.15 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -133,8 +133,9 @@ The search path is the path specified in the environment by
 .Ev PATH
 variable.
 If this variable isn't specified,
-.Va _PATH_DEFPATH from
-.Pa <paths.h>
+.Va _PATH_DEFPATH
+from
+.Aq Pa paths.h
 is used instead, its value being:
 .Pa /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/bin
 .Pp
@@ -167,7 +168,7 @@ these functions will sleep for several seconds,
 periodically re-attempting to execute the file.
 .Sh RETURN VALUES
 If any of the
-.Xr exec
+.Nm exec
 functions return, an error has occurred.
 The return value is \-1, and the global variable
 .Va errno
@@ -202,7 +203,7 @@ for any of the errors specified for the library function
 .Xr ktrace 2 ,
 .Xr ptrace 2 ,
 .Xr environ 7
-.Sh COMPATIBILITY
+.Sh STANDARDS
 Historically, the default path for the
 .Fn execlp
 and
@@ -231,7 +232,7 @@ and
 .Er E2BIG ,
 upon which they returned.
 They now return if any error other than the ones described above occurs.
-.Sh STANDARDS
+.Pp
 .Fn execl ,
 .Fn execv ,
 .Fn execle ,
diff --git a/lib/libc/gen/fpgetmask.3 b/lib/libc/gen/fpgetmask.3
index 53cb643bf26..3aa53340a58 100644
--- a/lib/libc/gen/fpgetmask.3
+++ b/lib/libc/gen/fpgetmask.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fpgetmask.3,v 1.2 2002/05/01 08:03:29 mpech Exp $
+.\"	$OpenBSD: fpgetmask.3,v 1.3 2003/05/30 14:00:32 jmc Exp $
 .\"	$NetBSD: fpgetmask.3,v 1.3 2001/09/16 02:57:03 wiz Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -88,7 +88,6 @@ the values listed below.
 .It Dv FP_X_IOV Ta Integer\ Overflow
 .El
 .Pp
-.Pp
 The
 .Fn fpsetmask
 function will cause future operations with the specified result status to
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index ae7af64f476..26769eb7a6b 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftok.3,v 1.11 2001/08/06 10:42:25 mpech Exp $
+.\"	$OpenBSD: ftok.3,v 1.12 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
 .\" All rights reserved.
@@ -74,7 +74,7 @@ The
 function originated with System V and is typically used by programs
 that use the System V IPC routines.
 .Sh AUTHORS
-Thorsten Lockert <tholo@sigmasoft.com>
+.An Thorsten Lockert Aq tholo@sigmasoft.com
 .Sh BUGS
 The returned key is computed based on the device and inode of the
 specified
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index f113d4d0462..2c33d688192 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.24 2003/05/03 19:04:40 jmc Exp $
+.\"	$OpenBSD: getcap.3,v 1.25 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -266,7 +266,7 @@ has no effect.
 Note that it does not erase the buffer pushed by a call to
 .Fn cgetset ,
 nor does it free the buffer allocated by
-.Fn cgetent.
+.Fn cgetent .
 .Pp
 .Fn cgetusedb
 allows the user to specify whether to use or ignore database files ending in
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 922efcaa461..05d3c0ba24e 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdomainname.3,v 1.18 2000/12/24 00:30:48 aaron Exp $
+.\"	$OpenBSD: getdomainname.3,v 1.19 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -90,6 +90,11 @@ The caller tried to set the domain name and was not the superuser.
 .Xr sysctl 3 ,
 .Xr sysctl 8 ,
 .Xr yp 8
+.Sh HISTORY
+The
+.Nm
+function call appeared in
+SunOS 3.x.
 .Sh BUGS
 Domain names are limited to
 .Dv MAXHOSTNAMELEN
@@ -101,8 +106,3 @@ This includes the terminating NUL character.
 If the buffer passed to
 .Fn getdomainname
 is too small, other operating systems may not guarantee termination with NUL.
-.Sh HISTORY
-The
-.Nm
-function call appeared in
-SunOS 3.x.
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index d2cf1a4ef43..8cea39f19cf 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getgrent.3,v 1.10 2000/12/24 00:30:48 aaron Exp $
+.\"	$OpenBSD: getgrent.3,v 1.11 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -196,7 +196,7 @@ and
 .Fn setgroupent
 appeared in
 .Bx 4.3 Reno .
-.Sh COMPATIBILITY
+.Pp
 The historic function
 .Xr setgrfile 3 ,
 which allowed the specification of alternate password databases, has
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index 2d77ffb8d16..0a35eba23d3 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpass.3,v 1.9 2001/12/07 23:56:09 millert Exp $
+.\"	$OpenBSD: getpass.3,v 1.10 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -75,6 +75,10 @@ returns a pointer to a null-terminated string of at most
 characters.
 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 ERRORS
 .Bl -tag -width Er
 .It Bq Er EINTR
@@ -90,10 +94,6 @@ The process has already reached its limit for open file descriptors.
 .It Bq Er ENFILE
 The system file table is full.
 .El
-.Sh FILES
-.Bl -tag -width /dev/tty -compact
-.It Pa /dev/tty
-.El
 .Sh SEE ALSO
 .Xr crypt 3 ,
 .Xr readpassphrase 3
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 4e631acda6f..0bba28977f3 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwent.3,v 1.17 2002/11/21 22:15:22 millert Exp $
+.\"	$OpenBSD: getpwent.3,v 1.18 2003/05/30 14:00:32 jmc Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -175,6 +175,11 @@ The
 .Fn setpassent
 function appeared in
 .Bx 4.3 Reno .
+.Pp
+The historic function
+.Xr setpwfile 3 ,
+which allowed the specification of alternate password databases,
+has been deprecated and is no longer available.
 .Sh BUGS
 The functions
 .Fn getpwent ,
@@ -193,8 +198,3 @@ and
 .Fn setpwent
 are fairly useless in a networked environment and should be
 avoided, if possible.
-.Sh COMPATIBILITY
-The historic function
-.Xr setpwfile 3 ,
-which allowed the specification of alternate password databases,
-has been deprecated and is no longer available.