Correctly use .Fn instead of .Nm to reference function names

in a bunch of man pages.

Use the correct .Bx  (BSD UNIX) or .At (AT&T UNIX) macros
instead of explicitly specifying the version in the text
in a bunch of man pages.

97 files changed, 224 insertions, 168 deletions

diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index cc11290..061aa90 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libc/compat-43/creat.2
@@ -57,4 +57,5 @@ open(path, O_CREAT | O_TRUNC | O_WRONLY, mode);
 .Sh HISTORY
 The
 .Fn creat
-function call appeared in Version 6 AT&T UNIX.
+function call appeared in
+.At v6 .
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 5d57e99..90115e3 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -121,4 +121,5 @@ argument is invalid.
 .Sh HISTORY
 The
 .Fn confstr
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index 6bc26bc..afbbee2 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -74,4 +74,5 @@ and
 .Sh HISTORY
 The
 .Fn daemon
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index da260c9..047ed17 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\"	$Id: err.3,v 1.2 1995/04/13 18:04:05 wollman Exp $
+.\"	$Id: err.3,v 1.3 1996/02/11 22:33:27 mpp Exp $
 .\"
 .Dd April 13, 1995
 .Dt ERR 3
@@ -142,4 +142,5 @@ The
 .Fn err
 and
 .Fn warn
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index 7878574..0d04a27 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -79,7 +79,8 @@ group membership list
 .Sh HISTORY
 The
 .Fn getgrouplist
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn getgrouplist
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index da1d5ad..4b81e05 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -91,7 +91,8 @@ or
 .Sh HISTORY
 The
 .Fn getmntinfo
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn getmntinfo
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 4e3625b..815fb15 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -425,7 +425,8 @@ The
 .Fn glob
 and
 .Fn globfree
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
 .Sh BUGS
 Patterns longer than
 .Dv MAXPATHLEN
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 2e69a04..98fb1c4 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -87,4 +87,5 @@ The
 .Fn user_from_uid
 and
 .Fn group_from_gid
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index 4a236b2..35cd5d7 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -102,4 +102,5 @@ The
 .Fn getmode
 and
 .Fn setmode
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 99034b9..0d528ca 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -181,4 +181,5 @@ function conforms to
 .Sh HISTORY
 The
 .Fn sysconf
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index f268cd3..2a9364b 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -650,4 +650,5 @@ definitions for fourth level UDP identifiers
 .Sh HISTORY
 The
 .Fn sysctl
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 90c5e16..3c5b276 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -321,4 +321,5 @@ The
 .Fn tzset
 and
 .Fn tzsetwall
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 250a023..86c0e9c 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -89,4 +89,5 @@ function conforms to
 .Sh HISTORY
 The
 .Fn uname
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index c65024d..fcce561 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -159,4 +159,5 @@ if (unvis(&out, (char)0, &state, UNVIS_END) == UNVIS_VALID)
 The
 .Nm unvis
 function
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index c10d432..7b09cc3 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\"	$Id: vis.3,v 1.2 1996/07/25 18:31:08 wollman Exp $
 .\"
 .Dd July 25, 1996
 .Dt VIS 3
@@ -260,5 +260,6 @@ ambiguous and non-invertible.
 .Xr strunvis 3 ,
 .Xr unvis 3
 .Sh HISTORY
-These functions first appeared in 4.4BSD.
+These functions first appeared in
+.Bx 4.4 .
 
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index f6b75b6..70901f3 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -296,7 +296,8 @@ The
 .Fn setlocale
 and
 .Fn localeconv
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The current implementation supports only the
 .Li "\&""C""
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 66a7285..a107eea 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -483,7 +483,9 @@ REG_INVARG	invalid argument, e.g. negative-length string
 .fi
 .SH HISTORY
 Originally written by Henry Spencer.
-Altered for inclusion in the 4.4BSD distribution.
+Altered for inclusion in the
+.Bx 4.4 
+distribution.
 .SH BUGS
 This is an alpha release with known defects.
 Please report problems.
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index 60089ea..e6c395d 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -120,4 +120,5 @@ or
 .Sh HISTORY
 The
 .Fn fgetln
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index dbdd5ca..ed47e29 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -159,7 +159,8 @@ specified for the routine
 .Sh HISTORY
 The
 .Fn funopen
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
 .Fn funopen
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index e1040d7..3f6f547 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -142,4 +142,5 @@ while ((ch = getopt(argc, argv, "ab:")) != \-1) {
 .Sh HISTORY
 The
 .Fn getsubopt
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index ce30378..4d49d46 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -157,4 +157,5 @@ for any of the errors specified for the library routine
 .Sh HISTORY
 The
 .Fn radixsort
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 28d6441..92009bd 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -69,4 +69,5 @@ bytes are copied, and a NULL pointer is returned.
 .Sh HISTORY
 The
 .Fn memccpy
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index f9d27ff..c26740e 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -83,4 +83,5 @@ The
 .Fn strcasecmp
 and
 .Fn strncasecmp
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index 2f1d5d2..f5370a3 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -60,4 +60,5 @@ If insufficient memory is available, NULL is returned.
 .Sh HISTORY
 The
 .Fn strdup
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index ebf18fd..67c22db 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -116,7 +116,8 @@ The
 .Fn strerror
 and
 .Fn perror
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
 .Sh BUGS
 For unknown error numbers, the
 .Fn strerror
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 0cedd55..83ce31c 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -144,4 +144,5 @@ always returns 0.
 .Sh HISTORY
 The
 .Fn strmode
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 938b657..5099f83 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -104,4 +104,5 @@ two adjacent delimiter characters, or to be used for more than a single
 string at a time.
 The
 .Fn strsep
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index a31c5d5..b402686 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -112,4 +112,5 @@ An I/O error occurred while reading from or writing to the file system.
 .Sh HISTORY
 An
 .Fn acct
-function call appeared in Version 7 AT&T UNIX.
+function call appeared in
+.At v7 .
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index c05396b..6cc0228 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -143,4 +143,5 @@ the data segment without consulting
 .Sh HISTORY
 A
 .Fn brk
-function call appeared in Version 7 AT&T UNIX.
+function call appeared in
+.At v7 .
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 8481851..cd99dea 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -151,4 +151,5 @@ The
 .Nm chflags
 and
 .Nm fchflags
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index 313b4c7..74105ec 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -98,6 +98,6 @@ An I/O error occurred while reading from or writing to the file system.
 .Xr sync 8
 .Sh HISTORY
 The
-.Nm
+.Fn fsync
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index b0ecd92..af1ca7a 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -170,5 +170,6 @@ error occurred while reading from or writing to the file system.
 .Xr lseek 2
 .Sh HISTORY
 The
-.Nm getdirentries
-function first appeared in 4.4BSD.
+.Fn getdirentries
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index e881066..33ad1f7 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -91,6 +91,7 @@ error occurred while reading from or writing to the file system.
 .El
 .Sh HISTORY
 The
-.Nm getfh
+.Fn getfh
 function
-first appeared in 4.4BSD.
+first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 9d2a0d7..7679f9e 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -131,5 +131,6 @@ error occurred while reading from or writing to the filesystem.
 .Xr mount 8
 .Sh HISTORY
 The
-.Nm getfsstat
-function first appeared in 4.4BSD.
+.Fn getfsstat
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index 1428d83..ea73890 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -85,6 +85,6 @@ an invalid address.
 .Xr initgroups 3
 .Sh HISTORY
 The
-.Nm
+.Fn getgroups
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index 5d94d72..4e53188 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -162,6 +162,6 @@ to be handled.
 .Xr clocks 7
 .Sh HISTORY
 The
-.Nm
+.Fn getitimer
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index b0c6f1b..4676714 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -168,4 +168,5 @@ Portable programs should probably still make this check.
 .Sh HISTORY
 The
 .Fn getlogin
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index 9967294..372d85a 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -108,6 +108,6 @@ process address space.
 .Xr getsockname 2
 .Sh HISTORY
 The
-.Nm
+.Fn getpeername
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index b98f499..13b7988 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -67,7 +67,7 @@ are used to get/set the process group of the control terminal.
 .Xr termios 4
 .Sh HISTORY
 The
-.Nm
+.Fn getpgrp
 function call appeared in
 .Bx 4.0 .
 .Sh STANDARDS
@@ -88,14 +88,17 @@ From the
 .St -p1003.1-88
 Rationale:
 .sp
-4.3BSD provides a
+.Bx 4.3
+provides a
 .Fn getpgrp
 function that returns the process group ID for a specified process.
 Although this function is used to support job control, all known
 job-control shells always specify the calling process with this
 function.
-Thus, the simpler System V
+Thus, the simpler
+.At V
 .Fn getpgrp
-suffices, and the added complexity of the 4.3BSD
+suffices, and the added complexity of the
+.Bx 4.3
 .Fn getpgrp
 has been omitted from POSIX.1.
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index aa151a0..fdb0a1e 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -137,6 +137,6 @@ A non super-user attempted to lower a process priority.
 .Xr renice 8
 .Sh HISTORY
 The
-.Nm
+.Fn getpriority
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 42b9028..14c0d56 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -178,6 +178,6 @@ raised the maximum limit value, and the caller is not the super-user.
 .Xr sysctl 3
 .Sh HISTORY
 The
-.Nm
+.Fn getrlimit
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 1a80b9c..7219304 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -164,6 +164,6 @@ There is no way to obtain information about a child process
 that has not yet terminated.
 .Sh HISTORY
 The
-.Nm
+.Fn getrusage
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index a5c7588..c8d761f 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -106,6 +106,6 @@ Names bound to sockets in the UNIX domain are inaccessible;
 returns a zero length name.
 .Sh HISTORY
 The
-.Nm
+.Fn getsockname
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 55098bc..3335b0c 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getsockopt.2	8.3 (Berkeley) 4/19/94
-.\"	$Id: getsockopt.2,v 1.4 1996/02/11 22:34:21 mpp Exp $
+.\"	$Id: getsockopt.2,v 1.5 1996/03/27 20:48:59 mpp Exp $
 .\"
 .Dd November 3, 1995
 .Dt GETSOCKOPT 2
@@ -392,6 +392,6 @@ is not in a valid part of the process address space.
 Several of the socket options should be handled at lower levels of the system.
 .Sh HISTORY
 The
-.Nm
+.Fn getsockopt
 system call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index a63f526..138c221 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -115,6 +115,6 @@ A user other than the super-user attempted to set the time.
 .Xr timed 8
 .Sh HISTORY
 The
-.Nm
+.Fn gettimeofday
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 38c58b9..f848938 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -124,5 +124,6 @@ is not valid.
 .Xr intro 4
 .Sh HISTORY
 An
-.Nm
-function call appeared in Version 7 AT&T UNIX.
+.Fn ioctl
+function call appeared in
+.At v7 .
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 4c27ab9..e535e5b 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -150,7 +150,7 @@ conform to IEEE Std 1003.1-1988
 .Sh HISTORY
 .Pp
 The
-.Nm
+.Fn link
 system call traditionally allows the super-user to link directories which
 corrupts the filesystem coherency.  This implementation no longer permits
 it. 
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index d4b600c..65f888d 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\"	$Id: listen.2,v 1.5 1996/02/11 22:34:24 mpp Exp $
+.\"	$Id: listen.2,v 1.6 1996/05/23 01:05:25 mpp Exp $
 .\"
 .Dd November 3, 1995
 .Dt LISTEN 2
@@ -130,7 +130,7 @@ The socket is not of a type that supports the operation
 .Xr sysctl 8
 .Sh HISTORY
 The
-.Nm
+.Fn listen
 function call appeared in
 .Bx 4.2 .
 The ability to configure the maximum
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index a100cb9..aa9d688 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -98,5 +98,6 @@ modified again.
 
 .Sh HISTORY
 The
-.Nm madvise
-function first appeared in 4.4BSD.
+.Fn madvise
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index a51fcc9..3341175 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -60,4 +60,5 @@ that the page is in-core.
 .Sh HISTORY
 The
 .Fn mincore
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 6f7686e..79e5c50 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -119,6 +119,6 @@ points outside the process's allocated address space.
 .Xr umask 2
 .Sh STANDARDS
 The
-.Nm mkfifo
+.Fn mkfifo
 function call conforms to
 .St -p1003.1-88 .
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index d77ccbc..63e7061 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -123,5 +123,6 @@ points outside the process's allocated address space.
 .Xr umask 2
 .Sh HISTORY
 A
-.Nm
-function call appeared in Version 6 AT&T UNIX.
+.Fn mknod
+function call appeared in
+.At v6 .
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index 90bb7c7..15ce741 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -47,7 +47,7 @@
 .Fn munlock "caddr_t addr" "size_t len"
 .Sh DESCRIPTION
 The
-.Nm mlock
+.Fn mlock
 system call
 locks into memory the physical pages associated with the virtual address
 range starting at
@@ -56,9 +56,9 @@ for
 .Fa len
 bytes.
 The
-.Nm munlock
+.Fn munlock
 call unlocks pages previously locked by one or more
-.Nm mlock
+.Fn mlock
 calls.
 For both, the
 .Fa addr
@@ -70,7 +70,7 @@ to be so.
 The entire range must be allocated.
 .Pp
 After an
-.Nm mlock
+.Fn mlock
 call, the indicated pages will cause neither a non-resident page
 nor address-translation fault until they are unlocked.
 They may still cause protection-violation faults or TLB-miss faults on
@@ -81,12 +81,12 @@ Multiple processes may have the same physical pages locked via their own
 virtual address mappings.
 A single process may likewise have pages multiply-locked via different virtual
 mappings of the same pages or via nested
-.Nm mlock
+.Fn mlock
 calls on the same address range.
 Unlocking is performed explicitly by
-.Nm munlock
+.Fn munlock
 or implicitly by a call to
-.Nm munmap
+.Fn munmap
 which deallocates the unmapped address range.
 Locked mappings are not inherited by the child process after a
 .Xr fork 2 .
@@ -94,7 +94,7 @@ Locked mappings are not inherited by the child process after a
 Since physical memory is a potentially scarce resource, processes are
 limited in how much they can lock down.
 A single process can
-.Nm mlock
+.Fn mlock
 the minimum of
 a system-wide ``wired pages'' limit and
 the per-process
@@ -138,11 +138,11 @@ Some portion of the indicated address range is not locked.
 .Xr getpagesize 3
 .Sh BUGS
 Unlike The Sun implementation, multiple
-.Nm mlock
+.Fn mlock
 calls on the same address range require the corresponding number of
-.Nm munlock
+.Fn munlock
 calls to actually unlock the pages, i.e.
-.Nm mlock
+.Fn mlock
 nests.
 This should be considered a consequence of the implementation
 and not a feature.
@@ -158,4 +158,5 @@ The
 .Fn mlock
 and
 .Fn munlock
-functions first appeared in 4.4BSD.
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 2b87189..d70d871 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -44,7 +44,7 @@
 .Fn mmap "caddr_t addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset"
 .Sh DESCRIPTION
 The
-.Nm mmap
+.Fn mmap
 function causes the pages starting at
 .Fa addr
 and continuing for at most
@@ -113,7 +113,7 @@ region.
 Do not permit the system to select a different address than the one
 specified.
 If the specified address cannot be used,
-.Nm mmap
+.Fn mmap
 will fail.
 If MAP_FIXED is specified,
 .Fa addr
@@ -147,7 +147,7 @@ the file descriptor argument specifies a file or device to which swapping
 should be done.
 .Sh RETURN VALUES
 Upon successful completion,
-.Nm mmap
+.Fn mmap
 returns a pointer to the mapped region.
 Otherwise, a value of -1 is returned and
 .Va errno
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 6829a3e..03879e1 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -165,14 +165,16 @@ and the variable
 .Va errno
 is set to indicate the error.
 .Pp
-.Nm Umount
-returns the value 0 if the umount succeeded; otherwise -1 is returned
+The
+.Fn umount
+function returns the value 0 if the umount succeeded; otherwise -1 is returned
 and the variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS
-.Fn Mount
-will fail when one of the following occurs:
+The
+.Fn mount
+function will fail when one of the following occurs:
 .Bl -tag -width [ENOTBLK]
 .It Bq Er EPERM
 The caller is not the super-user.
@@ -269,8 +271,9 @@ cylinder group information.
 points outside the process's allocated address space.
 .El
 .Pp
-.Nm Umount
-may fail with one of the following errors:
+The
+.Fn umount
+function may fail with one of the following errors:
 .Bl -tag -width [ENOTBLK]
 .It Bq Er EPERM
 The caller is not the super-user.
@@ -311,4 +314,5 @@ Some of the error codes need translation to more obvious messages.
 .Fn Mount
 and
 .Fn umount
-function calls appeared in Version 6 AT&T UNIX.
+function calls appeared in
+.At v6 .
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 4ddd65d..51d1b14 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -57,4 +57,5 @@ the granularity of protection changes may be as large as an entire region.
 .Sh HISTORY
 The
 .Fn mprotect
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 409dd08..388790f 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -90,4 +90,5 @@ was both MS_ASYNC and MS_INVALIDATE. Only one of these flags is allowed.
 .Sh HISTORY
 The
 .Fn msync
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 5d14016..ef6c7f9 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -50,7 +50,7 @@ and causes further references to addresses within the range
 to generate invalid memory references.
 .Sh RETURN VALUES
 Upon successful completion,
-.Nm munmap
+.Fn munmap
 returns zero.
 Otherwise, a value of -1 is returned and
 .Va errno
@@ -77,4 +77,5 @@ valid address space.
 .Sh HISTORY
 The
 .Fn munmap
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index 0c8038f..e113fd0 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -199,7 +199,7 @@ socket into the kernel for servicing by the
 daemons.
 .Sh RETURN VALUES
 Normally
-.Nm nfssvc
+.Fn nfssvc
 does not return unless the server
 is terminated by a signal when a value of 0 is returned.
 Otherwise, -1 is returned and the global variable
@@ -220,11 +220,12 @@ The caller is not the super-user.
 .Xr nfsiod 8
 .Sh HISTORY
 The
-.Nm nfssvc
-function first appeared in 4.4BSD.
+.Fn nfssvc
+function first appeared in
+.Bx 4.4 .
 .Sh BUGS
 The
-.Nm nfssvc
+.Fn nfssvc
 system call is designed specifically for the
 .Tn NFS
 support daemons and as such is specific to their requirements.
@@ -234,5 +235,5 @@ support, since
 is not really an error.
 Several fields of the argument structures are assumed to be valid and
 sometimes to be unchanged from a previous call, such that
-.Nm nfssvc
+.Fn nfssvc
 must be used with extreme care.
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index bb75262..ac5335a 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -208,7 +208,7 @@ special file, and the device associated with this special file
 does not exist.
 .It Bq Er EINTR
 The
-.Nm
+.Fn open
 operation was interrupted by a signal.
 .It Bq Er EOPNOTSUPP
 .Dv O_SHLOCK
@@ -273,5 +273,6 @@ An attempt was made to open a socket (not currently implemented).
 .Xr umask 2
 .Sh HISTORY
 An
-.Nm
-function call appeared in Version 6 AT&T UNIX.
+.Fn open
+function call appeared in
+.At v6 .
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 1b4fbc4..f8500e3 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -55,12 +55,12 @@ value of a configurable system limit or option variable associated
 with a pathname or file descriptor.
 .Pp
 For
-.Nm pathconf ,
+.Fn pathconf ,
 the
 .Fa path
 argument is the name of a file or directory.
 For
-.Nm fpathconf ,
+.Fn fpathconf ,
 the
 .Fa fd
 argument is an open file descriptor.
@@ -98,9 +98,9 @@ Returns the terminal character disabling value.
 .El
 .Sh RETURN VALUES
 If the call to
-.Nm pathconf
+.Fn pathconf
 or
-.Nm fpathconf
+.Fn fpathconf
 is not successful, \-1 is returned and
 .Va errno
 is set appropriately.
@@ -111,9 +111,9 @@ is not modified.
 Otherwise, the current variable value is returned.
 .Sh ERRORS
 If any of the following conditions occur, the
-.Nm pathconf
+.Fn pathconf
 and
-.Nm fpathconf
+.Fn fpathconf
 functions shall return -1 and set
 .Va errno
 to the corresponding value.
@@ -157,7 +157,8 @@ An I/O error occurred while reading from or writing to the file system.
 .Xr sysctl 3
 .Sh HISTORY
 The
-.Nm pathconf
+.Fn pathconf
 and
-.Nm fpathconf
-functions first appeared in 4.4BSD.
+.Fn fpathconf
+functions first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 480fb91..9a03c84 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -113,7 +113,7 @@ space.
 .Xr socketpair 2
 .Sh HISTORY
 A
-.Nm
+.Fn pipe
 function call appeared in Version 3 AT&T UNIX.
 .Pp
 Bidirectional pipes were first used on Unix System V release 4.
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index f40a0de..31c7c77 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -208,6 +208,6 @@ and
 .Xr getrlimit 2 .
 .Sh HISTORY
 The
-.Nm quotactl
+.Fn quotactl
 function call appeared in
 .Bx 4.3 Reno .
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index ea428fd..a09cc37 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -230,7 +230,6 @@ function call
 appeared in
 .Bx 4.2 .
 A
-.Nm read
-function call
-appeared in
-Version 6 AT&T UNIX.
+.Fn read
+function call appeared in
+.At v6 .
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 4827110..da96ac1 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -49,8 +49,9 @@ in the buffer
 .Fa buf ,
 which has size
 .Fa bufsiz .
-.Nm Readlink
-does not append a
+The
+.Fn readlink
+function does not append a
 .Dv NUL
 character to
 .Fa buf .
@@ -91,6 +92,6 @@ extends outside the process's allocated address space.
 .Xr symlink 7 ,
 .Sh HISTORY
 The
-.Nm
+.Fn readlink
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index d51468d..1eda9b3 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -155,6 +155,6 @@ nor
 .Dv RB_KDB .
 .Sh HISTORY
 The
-.Nm
+.Fn reboot
 function call appeared in
 .Bx 4.0 .
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 9ed24a3..02f841b 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -258,6 +258,6 @@ address space.
 .Xr socket 2
 .Sh HISTORY
 The
-.Nm
+.Fn recv
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index e782874..93dfdee 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -45,7 +45,7 @@
 .Fn revoke "char *path"
 .Sh DESCRIPTION
 The
-.Nm revoke
+.Fn revoke
 function invalidates all current open file descriptors in the system
 for the file named by
 .Fa path .
@@ -63,7 +63,7 @@ is called as if all open references to the file had been closed.
 .Pp
 Access to a file may be revoked only by its owner or the super user.
 The
-.Nm revoke
+.Fn revoke
 function is currently supported only for block and character special
 device files.
 It is normally used to prepare a terminal device for a new login session,
@@ -100,6 +100,6 @@ The caller is neither the owner of the file nor the super user.
 .Xr close 2
 .Sh HISTORY
 The
-.Nm revoke
+.Fn revoke
 function was introduced in
 .Bx 4.3 Reno .
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index 29f8833..3697bf4 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -101,6 +101,6 @@ points outside the process's allocated address space.
 .Xr unlink 2
 .Sh HISTORY
 The
-.Nm
+.Fn rmdir
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index a178a01..e42553f 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -186,6 +186,6 @@ by the
 call.
 .Sh HISTORY
 The
-.Nm
+.Fn select
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 77e2ed8..e39f5c0 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\"	$Id$
+.\"	$Id: send.2,v 1.2 1995/02/15 22:53:02 wollman Exp $
 .\"
 .Dd February 15, 1995
 .Dt SEND 2
@@ -174,6 +174,6 @@ but may be caused by transient congestion.
 .Xr write 2
 .Sh HISTORY
 The
-.Nm
+.Fn send
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index e20b47e..bce9e1a 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -78,6 +78,6 @@ address space.
 .Xr initgroups 3
 .Sh HISTORY
 The
-.Nm
+.Fn setgroups
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index e890a98..787dd11 100644
--- a/lib/libc/sys/setregid.2
+++ b/lib/libc/sys/setregid.2
@@ -86,6 +86,6 @@ was specified.
 .Xr setuid 2
 .Sh HISTORY
 The
-.Nm
+.Fn setregid
 system call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
index 12af3ca..9d9402c 100644
--- a/lib/libc/sys/setreuid.2
+++ b/lib/libc/sys/setreuid.2
@@ -84,6 +84,6 @@ was specified.
 .Xr setuid 2
 .Sh HISTORY
 The
-.Nm
+.Fn setreuid
 system call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
index 404b1b8..e67aae4 100644
--- a/lib/libc/sys/setsid.2
+++ b/lib/libc/sys/setsid.2
@@ -43,7 +43,7 @@
 .Fn setsid "void"
 .Sh DESCRIPTION
 The
-.Nm setsid
+.Fn setsid
 function creates a new session.
 The calling process is the session leader of the new session, is the
 process group leader of a new process group and has no controlling
@@ -52,12 +52,12 @@ The calling process is the only process in either the session or the
 process group.
 .Pp
 Upon successful completion, the
-.Nm setsid
+.Fn setsid
 function returns the value of the process group ID of the new process
 group, which is the same as the process ID of the calling process.
 .Sh ERRORS
 If an error occurs,
-.Nm setsid
+.Fn setsid
 returns -1 and the global variable
 .Va errno
 is set to indicate the error, as follows:
@@ -73,7 +73,7 @@ ID of the calling process.
 .Xr tcsetpgrp 3
 .Sh STANDARDS
 The
-.Nm setsid
+.Fn setsid
 function is expected to be compliant with the
 .St -p1003.1-88
 specification.
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 976f958..6c159e9 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -76,6 +76,6 @@ The specified socket is not connected.
 .Xr socket 2
 .Sh HISTORY
 The
-.Nm
+.Fn shutdown
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 38e8613..03f5bc2 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -337,7 +337,7 @@ or
 .El
 .Sh STANDARDS
 The
-.Nm sigaction
+.Fn sigaction
 function is defined by
 .St -p1003.1-88 .
 The
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 4892a92..5e8815d 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -79,7 +79,7 @@ and
 .Fa ss_size
 are ignored and the signal stack will be disabled.
 Trying to disable an active stack will cause
-.Nm
+.Fn sigaltstack
 to return -1 with
 .Va errno
 set to
@@ -158,7 +158,7 @@ Size of alternate stack area is less than or equal to
 .Xr setjmp 3
 .Sh HISTORY
 The predecessor to
-.Nm sigaltstack ,
+.Fn sigaltstack ,
 the
 .Fn sigstack
 system call, appeared in
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
index 0c87d4f..e7b7c3b 100644
--- a/lib/libc/sys/sigpending.2
+++ b/lib/libc/sys/sigpending.2
@@ -46,7 +46,7 @@
 .Fn sigpending "sigset_t *set"
 .Sh DESCRIPTION
 The
-.Nm sigpending
+.Fn sigpending
 function returns a mask of the signals pending for delivery
 to the calling process in the location indicated by
 .Fa set .
@@ -60,13 +60,13 @@ indicates an error occurred and
 is set to indicated the reason.
 .Sh ERRORS
 The
-.Nm sigpending
+.Fn sigpending
 function does not currently detect any errors.
 .Sh SEE ALSO
 .Xr sigaction 2 ,
 .Xr sigprocmask 2
 .Sh STANDARDS
 The
-.Nm sigpending
+.Fn sigpending
 function is defined by
 .St -p1003.1-88 .
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index 73b014d..b1452cb 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -114,7 +114,7 @@ has a value other than those listed here.
 .Xr sigsuspend 2
 .Sh STANDARDS
 The
-.Nm sigprocmask
+.Fn sigprocmask
 function call is expected to
 conform to
 .St -p1003.1-88 .
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index f995d11..b116db3 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -92,6 +92,6 @@ raise the privilege level of the process.
 .Xr setjmp 3
 .Sh HISTORY
 The
-.Nm
+.Fn sigreturn
 function call appeared in
 .Bx 4.3 .
diff --git a/lib/libc/sys/sigstack.2 b/lib/libc/sys/sigstack.2
index 54d1c14..3fbe6e6 100644
--- a/lib/libc/sys/sigstack.2
+++ b/lib/libc/sys/sigstack.2
@@ -46,6 +46,6 @@ function has been deprecated in favor of the interface described in
 .Xr sigaltstack 2
 .Sh HISTORY
 The
-.Nm
+.Fn sigstack
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index a234454..cbd6c52 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -74,7 +74,7 @@ set to
 .Xr sigsetops 3
 .Sh STANDARDS
 The
-.Nm sigsupend
+.Fn sigsupend
 function call
 conforms to
 .St -p1003.1-88 .
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index e048b46..7482150 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\"	$Id: socket.2,v 1.2 1995/02/15 22:53:04 wollman Exp $
 .\"
 .Dd February 15, 1995
 .Dt SOCKET 2
@@ -265,6 +265,6 @@ The socket cannot be created until sufficient resources are freed.
 .Re
 .Sh HISTORY
 The
-.Nm
+.Fn socket
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 1e8ba24..5f697b4 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -86,6 +86,6 @@ This call is currently implemented only for the
 domain.
 .Sh HISTORY
 The
-.Nm
+.Fn socketpair
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 51a5b2e..cc4e59f 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -271,6 +271,6 @@ conform to IEEE Std 1003.1-1988
 .Pq Dq Tn POSIX .
 .Sh HISTORY
 A
-.Nm lstat
+.Fn lstat
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index a7a1da2..49a8a5a 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -157,5 +157,6 @@ error occurred while reading from or writing to the file system.
 .El
 .Sh HISTORY
 The
-.Nm statfs
-function first appeared in 4.4BSD.
+.Fn statfs
+function first appeared in
+.Bx 4.4 .
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 5f152cc..6a3f6a1 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -108,6 +108,6 @@ dismounted.
 This call will be upgraded in future versions of the system.
 .Sh HISTORY
 The
-.Nm
+.Fn swapon
 function call appeared in
 .Bx 4.0 .
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index cc71cf2..7440ee0 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -137,6 +137,6 @@ points outside the process's allocated address space.
 .Xr unlink 2
 .Sh HISTORY
 The
-.Nm
+.Fn symlink
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index 6309c18c..2b2b664 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -69,5 +69,6 @@ attributes.
 may return before the buffers are completely flushed.
 .Sh HISTORY
 A
-.Nm
-function call appeared in Version 6 AT&T UNIX.
+.Fn sync
+function call appeared in
+.At v6 .
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index 2e020ad..f357366 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -54,7 +54,7 @@ with the specified arguments.
 Symbolic constants for system calls can be found in the header file
 .Ao Pa sys/syscall.h Ac .
 The
-.Nm __syscall
+.Fn __syscall
 form should be used when one or more of the parameters is a
 64-bit argument to ensure that argument alignment is correct.
 This system call is useful for testing new system calls that
@@ -71,6 +71,6 @@ such as
 .Xr pipe 2 .
 .Sh HISTORY
 The
-.Nm syscall
+.Fn syscall
 function call appeared in
 .Bx 4.0 .
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 0503535..73f249b 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -125,6 +125,6 @@ Use of
 to extend a file is not portable.
 .Sh HISTORY
 The
-.Nm
+.Fn truncate
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 1f46945..b0d3b1f 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -109,11 +109,12 @@ points outside the process's allocated address space.
 .Xr symlink 7
 .Sh HISTORY
 An
-.Nm
-function call appeared in Version 6 AT&T UNIX.
+.Fn unlink
+function call appeared in
+.At v6 .
 .Pp
 The
-.Nm
+.Fn unlink
 system call traditionally allows the super-user to unlink directories which
 can damage the filesystem integrity.  This implementation no longer permits
 it.
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 125b619..ef45836 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -113,6 +113,6 @@ The file system containing the file is mounted read-only.
 .Xr stat 2
 .Sh HISTORY
 The
-.Nm utimes
+.Fn utimes
 function call appeared in
 .Bx 4.2 .
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 0d0dbf0..ad726bf 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -121,6 +121,6 @@ are allowed
 and input attempts result in an end-of-file indication.
 .Sh HISTORY
 The
-.Nm
+.Fn vfork
 function call appeared in
 .Bx 3.0 .
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index cd9ab62..d348361 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -292,5 +292,6 @@ call are extensions to the POSIX interface.
 .Xr exit 3
 .Sh HISTORY
 A
-.Nm
-function call appeared in Version 6 AT&T UNIX.
+.Fn wait
+function call appeared in
+.At v6 .
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index a1e4a51..f290628 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -246,7 +246,6 @@ function call
 appeared in
 .Bx 4.2 .
 A
-.Nm write
-function call
-appeared in
-Version 6 AT&T UNIX.
+.Fn write
+function call appeared in
+.At v6 .