8 files changed, 46 insertions, 51 deletions
diff --git a/lib/libc/hash/rmd160.3 b/lib/libc/hash/rmd160.3
index 47c2354dbcc..87d148322ed 100644
--- a/lib/libc/hash/rmd160.3
+++ b/lib/libc/hash/rmd160.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmd160.3,v 1.7 1999/05/25 13:06:45 aaron Exp $
+.\"	$OpenBSD: rmd160.3,v 1.8 1999/05/25 21:16:24 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -186,7 +186,7 @@ perform byte swapping on little endian machines such as the i386, alpha,
 and vax.
 .Sh AUTHOR
 This implementation of RMD-160 was written by Antoon Bosselaers.
-.br
+.Pp
 The
 .Fn RMD160End ,
 .Fn RMD160File ,
diff --git a/lib/libc/hash/sha1.3 b/lib/libc/hash/sha1.3
index 1ab15159bf1..50d318e079a 100644
--- a/lib/libc/hash/sha1.3
+++ b/lib/libc/hash/sha1.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sha1.3,v 1.12 1999/05/25 13:06:45 aaron Exp $
+.\"	$OpenBSD: sha1.3,v 1.13 1999/05/25 21:16:25 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -186,7 +186,7 @@ perform byte swapping on little endian machines such as the i386, alpha,
 and vax.
 .Sh AUTHOR
 This implementation of SHA-1 was written by Steve Reid.
-.br
+.Pp
 The
 .Fn SHA1End ,
 .Fn SHA1File ,
diff --git a/lib/libc/rpc/rpcauth.3 b/lib/libc/rpc/rpcauth.3
index de41af4e1d3..3899b2d7622 100644
--- a/lib/libc/rpc/rpcauth.3
+++ b/lib/libc/rpc/rpcauth.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpcauth.3,v 1.3 1999/05/25 13:06:46 aaron Exp $
+.\"	$OpenBSD: rpcauth.3,v 1.4 1999/05/25 21:16:25 aaron Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .Dd February 16, 1988
@@ -53,11 +53,9 @@ The parameter
 is the name of the machine on which the information was
 created;
 .Fa uid
-is the user's user
-.Tn ID ;
+is the user's user ID;
 .Fa gid
-is the user's current group
-.Tn ID ;
+is the user's current group ID;
 .Fa len
 and
 .Fa aup_gids
@@ -71,25 +69,24 @@ with the appropriate parameters.
 .Pp
 .Sh SEE ALSO
 .\"Xr rpc_secure 3 ,
-.Xr rpc 3 ,
-.Xr getrpcport 3 ,
-.Xr portmap 8 ,
-.Xr rpc 5 ,
 .Xr rpcgen 1 ,
 .Xr select 2 ,
-.Xr xdr 3 .
-.br
-The following manuals:
-.RS
-.ft I
-Remote Procedure Calls: Protocol Specification
-.br
-Remote Procedure Call Programming Guide
-.br
-rpcgen Programming Guide
-.br
-.ft R
-.RE
-.Fa "RPC: Remote Procedure Call Protocol Specification" ,
-.Tn RFC1050, Sun Microsystems, Inc.,
-.Tn USC-ISI .
+.Xr getrpcport 3 ,
+.Xr rpc 3 ,
+.Xr xdr 3 ,
+.Xr rpc 5 ,
+.Xr portmap 8
+.Rs
+.%T "Remote Procedure Calls: Protocol Specification"
+.Re
+.Rs
+.%T "Remote Procedure Call Programming Guide"
+.Re
+.Rs
+.%T "rpcgen Programming Guide"
+.Re
+.Rs
+.%A "Sun Microsystems, Inc."
+.%T "RPC: Remote Procedure Call Protocol Specification"
+.%R "RFC1050, USC-ISI"
+.Re
diff --git a/lib/libc/rpc/xdr.3 b/lib/libc/rpc/xdr.3
index ac73fe4820e..1a486547040 100644
--- a/lib/libc/rpc/xdr.3
+++ b/lib/libc/rpc/xdr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xdr.3,v 1.9 1999/05/25 13:06:46 aaron Exp $
+.\"	$OpenBSD: xdr.3,v 1.10 1999/05/25 21:16:25 aaron Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .Dd February 16, 1988
@@ -532,16 +532,15 @@ routines as parameters, and
 one of the most frequently used primitives, requires three.
 Returns one if it succeeds, zero otherwise.
 .Sh SEE ALSO
-.Xr rpc 3 .
-.Pp
-The following manuals:
-.RS
-.ft I
-eXternal Data Representation Standard: Protocol Specification
-.br
-eXternal Data Representation: Sun Technical Notes
-.ft R
-.br
-.Tn "XDR: External Data Representation Standard" ,
-.Tn RFC1014, Sun Microsystems, Inc.,
-.Tn USC-ISI .
+.Xr rpc 3
+.Rs
+.%T eXternal Data Representation Standard: Protocol Specification
+.Re
+.Rs
+.%T eXternal Data Representation: Sun Technical Notes
+.Re
+.Rs
+.%A "Sun Microsystems, Inc."
+.%T "XDR: External Data Representation Standard"
+.%R "RFC1014, USC-ISI"
+.Re
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index ffe868fe31e..de5991617a4 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.3,v 1.14 1999/05/16 19:55:09 alex Exp $
+.\"	$OpenBSD: mktemp.3,v 1.15 1999/05/25 21:16:26 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -298,7 +298,7 @@ A
 .Fn mktemp
 function appeared in
 .At v7 .
-.br
+.Pp
 The
 .Fn mkdtemp
 function appeared in
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 49c906125f0..36e14e1a0a4 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.16 1999/05/12 13:26:48 aaron Exp $
+.\"	$OpenBSD: printf.3,v 1.17 1999/05/25 21:16:26 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -565,7 +565,6 @@ 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',
 where
 .Em weekday
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 9dcaff321e7..c522f2d54db 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.7 1999/05/23 14:10:56 aaron Exp $
+.\"	$OpenBSD: stat.2,v 1.8 1999/05/25 21:16:26 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -247,7 +247,7 @@ An I/O error occurred while reading from or writing to the file system.
 The file generation number,
 .Fa st_gen ,
 is only available to the super-user.
-.br
+.Pp
 The fields in the stat structure currently marked
 .Fa st_spare1 ,
 .Fa st_spare2 ,
diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
index 56efdc9016f..8ce53eae656 100644
--- a/lib/libc/time/strftime.3
+++ b/lib/libc/time/strftime.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)strftime.3    5.12 (Berkeley) 6/29/91
-.\"     $OpenBSD: strftime.3,v 1.6 1999/01/04 20:00:10 millert Exp $
+.\"     $OpenBSD: strftime.3,v 1.7 1999/05/25 21:16:27 aaron Exp $
 .\"
 .Dd Jan 18, 1998
 .Dt STRFTIME 3
@@ -194,7 +194,7 @@ The
 function
 conforms to
 .St -ansiC .
-.br
+.Pp
 The
 .Ql \&%G ,
 .Ql \&%g ,