18 files changed, 27 insertions, 26 deletions

diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index bb48afbc44b41..7bdc021894177 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -31,7 +31,7 @@
 .\" 
 .Dd August 31, 2000
 .Dt ACPIDUMP 8
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm acpidump
 .Nd dump ACPI tables
diff --git a/usr.sbin/acpi/amldb/amldb.8 b/usr.sbin/acpi/amldb/amldb.8
index db692a8a36379..b4800015d533a 100644
--- a/usr.sbin/acpi/amldb/amldb.8
+++ b/usr.sbin/acpi/amldb/amldb.8
@@ -30,7 +30,7 @@
 .\"
 .Dd August 31, 2000
 .Dt AMLDB 8
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm amldb
 .Nd executing and debugging AML interpreter
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index c1c3f4f0dfefb..de35bd3840c40 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -26,7 +26,7 @@
 .\"
 .Dd January 9, 1995
 .Dt ADDUSER 8
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm adduser
 .Nd command for adding new users
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 53a2876a806e4..751d693007519 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/usr.sbin/ancontrol/ancontrol.8
@@ -32,7 +32,7 @@
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm ancontrol
 .Nd configure Aironet 4500/4800 devices
diff --git a/usr.sbin/elf2exe/elf2exe.8 b/usr.sbin/elf2exe/elf2exe.8
index e3447b9996572..6f9349ba63ddd 100644
--- a/usr.sbin/elf2exe/elf2exe.8
+++ b/usr.sbin/elf2exe/elf2exe.8
@@ -13,7 +13,7 @@
 .\"
 .Dd July 26, 1999
 .Dt ELF2EXE 8
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm elf2exe
 .Nd convert Alpha ELF executable to AlphaBIOS / ARCS format
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 150fac5fe54c0..c81c6aeecb9c8 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -62,7 +62,7 @@
 .\"
 .Dd December 22, 1997
 .Dt IOSTAT 8
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm iostat
 .Nd report
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 557c3daeea0e3..655f13b7ec4ab 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -35,7 +35,7 @@
 .\"
 .Dd April 28, 1999
 .Dt JAIL 8
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm jail
 .Nd imprison process and its descendants
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index e0675b08797f5..22c39f2fd6e55 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -33,7 +33,7 @@
 .\"
 .Dd May 22, 1995
 .Dt KERNBB 8
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm kernbb
 .Nd generate a dump of the kernels basic-block profile buffers
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index 9fa1764f0408a..518158a23f4ff 100644
--- a/usr.sbin/lptcontrol/lptcontrol.8
+++ b/usr.sbin/lptcontrol/lptcontrol.8
@@ -13,7 +13,7 @@
 .\" $FreeBSD$
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
-.Os FreeBSD 2
+.Os FreeBSD
 .Sh NAME
 .Nm \&lptcontrol 
 .Nd a utility for manipulating the lpt printer driver
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index 2639c0c7283ae..196dfe1c4179e 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd October 14, 1999
 .Dt MOUNT_NWFS 8
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm mount_nwfs
 .Nd mount NetWare volume from a NetWare file server
@@ -55,7 +55,8 @@ command line arguments (the
 .Fl U
 and
 .Fl V
-options aren't used in this case). This allows use of
+options aren't used in this case).
+This allows use of
 .Xr fstab 5
 file (see
 .Sx EXAMPLES
@@ -117,7 +118,7 @@ The values must be specified as octal numbers.
 Default value for the file mode
 is taken from mount point, default value for the dir mode adds execute
 permission where the file mode gives read permission.
-
+.Pp
 Note that these permissions can differ from the rights granted by NetWare
 server. 
 .It Fl n Ar namespace
@@ -197,10 +198,13 @@ for nwfs mounts:
 /nwserv:guest/sys       /nw/s1/sys     nwfs  rw,noauto 0   0
 /nwserv:guest/vol1      /nw/s1/vol2    nwfs  rw,noauto 0   0
 .Ed
-
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 4.0 .
 .Sh BUGS
 to number a few
-
 .Sh CREDITS
 In development of NetWare client for
 .Fx ,
@@ -209,7 +213,7 @@ the following sources were used:
 Documentation from NetWare NDK.
 .Pp
 Ncpfs for Linux - written by
-.An Volker Lendecke Aq lendecke@math.uni-goettingen.de .
+.An Volker Lendecke Aq lendecke@math.uni\-goettingen.de .
 He granted me permission to publish parts of his code under BSD-style license,
 .Pp
 "Interrupt List" from
@@ -218,7 +222,6 @@ He granted me permission to publish parts of his code under BSD-style license,
 Many files from
 .Pa /sys
 directory.
-
 .Sh AUTHORS
 .An Boris Popov Aq bp@butya.kz ,
 .Aq rbp@chat.ru
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index 34481ae89059e..bd4a909891796 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -35,7 +35,7 @@
 .\"
 .Dd January 19, 1999
 .Dt NGCTL 8
-.Os FreeBSD 3
+.Os FreeBSD
 .Sh NAME
 .Nm ngctl
 .Nd netgraph control utility
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index abab2c2f5a5ac..0cb050bd961f8 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -35,7 +35,7 @@
 .\"
 .Dd January 19, 1999
 .Dt NGHOOK 8
-.Os FreeBSD 3
+.Os FreeBSD
 .Sh NAME
 .Nm nghook
 .Nd connect to a
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index 0b4d2906267f1..b009481a2eaaa 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -34,7 +34,7 @@
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm nologin
 .Nd disallow logins
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index da150adf34bba..4ce88317b3431 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd August 13, 1997
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Dt PERIODIC 8
 .Sh NAME
 .Nm periodic
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 463c3dc598f04..fb7f4b65bdd50 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -19,7 +19,7 @@
 .\"
 .Dd November 25, 1994
 .Dt PKG_DELETE 1
-.Os FreeBSD 2.0
+.Os
 .Sh NAME
 .Nm pkg_delete
 .Nd a utility for deleting previously installed software package distributions
diff --git a/usr.sbin/raycontrol/raycontrol.8 b/usr.sbin/raycontrol/raycontrol.8
index 90cfe665e608e..3ba11b7df4cee 100644
--- a/usr.sbin/raycontrol/raycontrol.8
+++ b/usr.sbin/raycontrol/raycontrol.8
@@ -65,7 +65,7 @@
 .\"
 .Dd March 21, 2000
 .Dt RAYCONTROL 8
-.Os FreeBSD 3.3
+.Os FreeBSD
 .Sh NAME
 .Nm raycontrol
 .Nd configure Raytheon Raylink/Webgear Aviator devices
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 8a4b1825219f7..ce6cacbb4f85c 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -32,7 +32,7 @@
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm wicontrol
 .Nd configure WaveLAN/IEEE devices
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 8f630912f0ab3..2260f499bb347 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -32,7 +32,7 @@
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm ypinit
 .Nd build and install NIS databases
@@ -176,8 +176,6 @@ is based on the
 script in
 .Ox .
 It first appeared in
-.Fx
-in
 .Fx 3.0 .
 .Sh AUTHORS
 .An -nosplit