120 files changed, 160 insertions, 151 deletions

diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 638925e001d1b..e7abcab63cb17 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -32,7 +32,7 @@
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm ethers ,
 .Nm ether_line ,
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index bfbd95f2f00ad..12dc9a6bf22fa 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl
 .Nd introduction to the POSIX.1e ACL security API
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index 3d68c5e754677..bcbc54b7ff4c8 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_DELETE 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_delete_def_file ,
 .Nm acl_delete_fd_np ,
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index 107fc3f366ae9..1e98084ce25ad 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_DUP 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_dup
 .Nd duplicate an ACL
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
index c593e5716615d..df6ac0ecd1d31 100644
--- a/lib/libc/posix1e/acl_free.3
+++ b/lib/libc/posix1e/acl_free.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_FREE 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_free
 .Nd free ACL working state
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index adfbe79cf7acb..37bc4218a0655 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_FROM_TEXT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_from_text
 .Nd create an ACL from text
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index 10acebbd1a54b..af523e4c7d040 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_GET 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_get_fd ,
 .Nm acl_get_fd_np ,
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index 8cf78ed44f3bc..18e51181e2316 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_INIT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_init
 .Nd initialize ACL working storage
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
index 85fe872c7b80e..60459bf82aa11 100644
--- a/lib/libc/posix1e/acl_set.3
+++ b/lib/libc/posix1e/acl_set.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_SET 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_set_fd ,
 .Nm acl_set_fd_np ,
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index 3902653426696..cfc4acbce5f8d 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_TO_TEXT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_to_text
 .Nd convert an ACL to Text
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index ea1cf68bacd4b..e3f05377c4f1c 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_VALID 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_valid ,
 .Nm acl_valid_fd_np ,
diff --git a/lib/libc/posix1e/cap.3 b/lib/libc/posix1e/cap.3
index 15925859ae7d6..81a9e5c90a785 100644
--- a/lib/libc/posix1e/cap.3
+++ b/lib/libc/posix1e/cap.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap
 .Nd introduction to the POSIX.1e Capability security API
diff --git a/lib/libc/posix1e/cap_clear.3 b/lib/libc/posix1e/cap_clear.3
index 56ed87d062d99..8f5b548ab98bb 100644
--- a/lib/libc/posix1e/cap_clear.3
+++ b/lib/libc/posix1e/cap_clear.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_CLEAR 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_clear
 .Nd Initialize a Capability State in Working Store
diff --git a/lib/libc/posix1e/cap_dup.3 b/lib/libc/posix1e/cap_dup.3
index 64b0bfb5f4ea8..fdd4cadf263ba 100644
--- a/lib/libc/posix1e/cap_dup.3
+++ b/lib/libc/posix1e/cap_dup.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_DUP 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_dup
 .Nd Duplicate a Capability State in Working Storage
diff --git a/lib/libc/posix1e/cap_free.3 b/lib/libc/posix1e/cap_free.3
index 21d42ace0b0ec..ed773552ad8c0 100644
--- a/lib/libc/posix1e/cap_free.3
+++ b/lib/libc/posix1e/cap_free.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_FREE 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_free
 .Nd Release Memory Allocated to a Capability State in Working Storage
diff --git a/lib/libc/posix1e/cap_from_text.3 b/lib/libc/posix1e/cap_from_text.3
index a83c31efcb450..345d558493624 100644
--- a/lib/libc/posix1e/cap_from_text.3
+++ b/lib/libc/posix1e/cap_from_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd September 18, 2000
 .Dt CAP_FROM_TEXT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_from_text
 .Nd Convert Text to a Capability State in Working Store
diff --git a/lib/libc/posix1e/cap_get_flag.3 b/lib/libc/posix1e/cap_get_flag.3
index 1e827c92b1b70..9e39e8086a43d 100644
--- a/lib/libc/posix1e/cap_get_flag.3
+++ b/lib/libc/posix1e/cap_get_flag.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_GET_FLAG 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_get_flag
 .Nd Get the Value of a Capability Flag
diff --git a/lib/libc/posix1e/cap_get_proc.3 b/lib/libc/posix1e/cap_get_proc.3
index 8d2c69da2f8de..5032a67dd21b0 100644
--- a/lib/libc/posix1e/cap_get_proc.3
+++ b/lib/libc/posix1e/cap_get_proc.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_GET_PROC 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_get_proc
 .Nd Obtain the Current Process Capability State
diff --git a/lib/libc/posix1e/cap_init.3 b/lib/libc/posix1e/cap_init.3
index 33c4117af49b6..47e4fe302c6f3 100644
--- a/lib/libc/posix1e/cap_init.3
+++ b/lib/libc/posix1e/cap_init.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_INIT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_init
 .Nd Allocate and Initialize a Capability State in Working Storage
diff --git a/lib/libc/posix1e/cap_set_flag.3 b/lib/libc/posix1e/cap_set_flag.3
index ea06f469f52af..bbfe063cc90d2 100644
--- a/lib/libc/posix1e/cap_set_flag.3
+++ b/lib/libc/posix1e/cap_set_flag.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_SET_FLAG 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_set_flag
 .Nd Set the Value of a Capability Flag
diff --git a/lib/libc/posix1e/cap_set_proc.3 b/lib/libc/posix1e/cap_set_proc.3
index 869490fbe2ee2..bd7ac91e5f5fe 100644
--- a/lib/libc/posix1e/cap_set_proc.3
+++ b/lib/libc/posix1e/cap_set_proc.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_SET_PROC 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_set_proc
 .Nd Set the Process Capability State
diff --git a/lib/libc/posix1e/cap_to_text.3 b/lib/libc/posix1e/cap_to_text.3
index b3717ea52a997..a3bd76202486b 100644
--- a/lib/libc/posix1e/cap_to_text.3
+++ b/lib/libc/posix1e/cap_to_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd September 18, 2000
 .Dt CAP_TO_TEXT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_to_text
 .Nd Convert a Capability State in Working Storage to Text
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 3581c97ecdc77..9a5afea68bed5 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 17, 2000
 .Dt POSIX1E 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm posix1e
 .Nd introduction to the POSIX.1e security API
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index e7d53f955d080..0928f94c7cb4c 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -38,7 +38,7 @@
 .\"
 .Dd August 27, 1996
 .Dt MALLOC 3
-.Os FreeBSD 2
+.Os FreeBSD
 .Sh NAME
 .Nm malloc, calloc, realloc, free, reallocf
 .Nd general purpose memory allocation functions
diff --git a/lib/libc/stdtime/tzfile.5 b/lib/libc/stdtime/tzfile.5
index ffed962f3f2cb..e29d4d73350e5 100644
--- a/lib/libc/stdtime/tzfile.5
+++ b/lib/libc/stdtime/tzfile.5
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd September 13, 1994
 .Dt TZFILE 5
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm tzfile
 .Nd timezone information
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 9f03459819124..5a3c907707585 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -52,7 +52,7 @@
 .\"
 .Dd November 27, 1998
 .Dt STRTOK 3
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm strtok, strtok_r
 .Nd string tokens
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 9b36eb66bb58a..95752885e2263 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -10,7 +10,7 @@
 .\"
 .Dd April 28, 1999
 .Dt JAIL 2
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm jail
 .Nd Imprison current process and future decendants.
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index e3e11695c6d8b..44db9f87f2667 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -4,7 +4,7 @@
 .\" This file is in the public domain.
 .Dd January 20, 1996
 .Dt PTRACE 2
-.Os FreeBSD 2
+.Os FreeBSD
 .Sh NAME
 .Nm ptrace
 .Nd process tracing and debugging
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index dede35284cefe..213718d186f78 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -28,7 +28,7 @@
 .\" $FreeBSD$
 .\"
 .Dd October 10, 1998
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Dt CAM 3
 .Sh NAME
 .Nm cam_open_device ,
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index f4ad6e4ecc6a5..905e652fc9fe4 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -62,7 +62,7 @@
 .\"
 .\"
 .Dd October 13, 1998
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Dt CAM_CDBPARSE 3
 .Sh NAME
 .Nm csio_build ,
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index d2c929c4d4c75..d5194c163333f 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -29,7 +29,7 @@
 .\"
 .Dd May 21, 1998
 .Dt DEVSTAT 3
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm devstat ,
 .Nm getnumdevs ,
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index 401b5e3b49977..cc4412294f10f 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -10,7 +10,7 @@
 .\"
 .Dd February 11, 1999
 .Dt MDX 3
-.Os FreeBSD 2
+.Os FreeBSD
 .Sh NAME
 .Nm MDXInit ,
 .Nm MDXUpdate ,
@@ -166,4 +166,3 @@ There is on the other hand no guarantee that such a method doesn't exist.
 .Pp
 MD2 has only been licensed for use in Privacy Enhanced Mail.
 Use MD4 or MD5 if that isn't what you're doing.
-.Sh COPYRIGHT
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 25d34b44004d6..352d4522ca326 100644
--- a/lib/libmd/ripemd.3
+++ b/lib/libmd/ripemd.3
@@ -11,7 +11,7 @@
 .\"
 .Dd February 26, 1999
 .Dt RIPEMD 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm RIPEMD160_Init ,
 .Nm RIPEMD160_Update ,
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index 28574a2ddd67c..c670ad5160e2d 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -11,7 +11,7 @@
 .\"
 .Dd February 25, 1999
 .Dt SHA 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm SHA_Init ,
 .Nm SHA_Update ,
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index 67a037055b174..82d502d52c1b9 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -37,7 +37,7 @@
 .\"
 .Dd January 19, 1999
 .Dt NETGRAPH 3
-.Os FreeBSD 3
+.Os FreeBSD
 .Sh NAME
 .Nm NgMkSockNode ,
 .Nm NgNameNode ,
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 690c2c183970f..05f89ff767ba1 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -40,7 +40,7 @@
 .\"
 .Dd August 2, 1999
 .Dt pam_radius 8
-.Os FreeBSD 3.3
+.Os FreeBSD
 .Sh NAME
 .Nm pam_radius
 .Nd RADIUS authentication PAM module
diff --git a/lib/libposix1e/acl.3 b/lib/libposix1e/acl.3
index bfbd95f2f00ad..12dc9a6bf22fa 100644
--- a/lib/libposix1e/acl.3
+++ b/lib/libposix1e/acl.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl
 .Nd introduction to the POSIX.1e ACL security API
diff --git a/lib/libposix1e/acl_delete.3 b/lib/libposix1e/acl_delete.3
index 3d68c5e754677..bcbc54b7ff4c8 100644
--- a/lib/libposix1e/acl_delete.3
+++ b/lib/libposix1e/acl_delete.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_DELETE 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_delete_def_file ,
 .Nm acl_delete_fd_np ,
diff --git a/lib/libposix1e/acl_dup.3 b/lib/libposix1e/acl_dup.3
index 107fc3f366ae9..1e98084ce25ad 100644
--- a/lib/libposix1e/acl_dup.3
+++ b/lib/libposix1e/acl_dup.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_DUP 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_dup
 .Nd duplicate an ACL
diff --git a/lib/libposix1e/acl_free.3 b/lib/libposix1e/acl_free.3
index c593e5716615d..df6ac0ecd1d31 100644
--- a/lib/libposix1e/acl_free.3
+++ b/lib/libposix1e/acl_free.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_FREE 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_free
 .Nd free ACL working state
diff --git a/lib/libposix1e/acl_from_text.3 b/lib/libposix1e/acl_from_text.3
index adfbe79cf7acb..37bc4218a0655 100644
--- a/lib/libposix1e/acl_from_text.3
+++ b/lib/libposix1e/acl_from_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_FROM_TEXT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_from_text
 .Nd create an ACL from text
diff --git a/lib/libposix1e/acl_get.3 b/lib/libposix1e/acl_get.3
index 10acebbd1a54b..af523e4c7d040 100644
--- a/lib/libposix1e/acl_get.3
+++ b/lib/libposix1e/acl_get.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_GET 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_get_fd ,
 .Nm acl_get_fd_np ,
diff --git a/lib/libposix1e/acl_init.3 b/lib/libposix1e/acl_init.3
index 8cf78ed44f3bc..18e51181e2316 100644
--- a/lib/libposix1e/acl_init.3
+++ b/lib/libposix1e/acl_init.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_INIT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_init
 .Nd initialize ACL working storage
diff --git a/lib/libposix1e/acl_set.3 b/lib/libposix1e/acl_set.3
index 85fe872c7b80e..60459bf82aa11 100644
--- a/lib/libposix1e/acl_set.3
+++ b/lib/libposix1e/acl_set.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_SET 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_set_fd ,
 .Nm acl_set_fd_np ,
diff --git a/lib/libposix1e/acl_to_text.3 b/lib/libposix1e/acl_to_text.3
index 3902653426696..cfc4acbce5f8d 100644
--- a/lib/libposix1e/acl_to_text.3
+++ b/lib/libposix1e/acl_to_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_TO_TEXT 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_to_text
 .Nd convert an ACL to Text
diff --git a/lib/libposix1e/acl_valid.3 b/lib/libposix1e/acl_valid.3
index ea1cf68bacd4b..e3f05377c4f1c 100644
--- a/lib/libposix1e/acl_valid.3
+++ b/lib/libposix1e/acl_valid.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 28, 2000
 .Dt ACL_VALID 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm acl_valid ,
 .Nm acl_valid_fd_np ,
diff --git a/lib/libposix1e/cap.3 b/lib/libposix1e/cap.3
index 15925859ae7d6..81a9e5c90a785 100644
--- a/lib/libposix1e/cap.3
+++ b/lib/libposix1e/cap.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap
 .Nd introduction to the POSIX.1e Capability security API
diff --git a/lib/libposix1e/cap_clear.3 b/lib/libposix1e/cap_clear.3
index 56ed87d062d99..8f5b548ab98bb 100644
--- a/lib/libposix1e/cap_clear.3
+++ b/lib/libposix1e/cap_clear.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_CLEAR 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_clear
 .Nd Initialize a Capability State in Working Store
diff --git a/lib/libposix1e/cap_dup.3 b/lib/libposix1e/cap_dup.3
index 64b0bfb5f4ea8..fdd4cadf263ba 100644
--- a/lib/libposix1e/cap_dup.3
+++ b/lib/libposix1e/cap_dup.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_DUP 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_dup
 .Nd Duplicate a Capability State in Working Storage
diff --git a/lib/libposix1e/cap_free.3 b/lib/libposix1e/cap_free.3
index 21d42ace0b0ec..ed773552ad8c0 100644
--- a/lib/libposix1e/cap_free.3
+++ b/lib/libposix1e/cap_free.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_FREE 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_free
 .Nd Release Memory Allocated to a Capability State in Working Storage
diff --git a/lib/libposix1e/cap_from_text.3 b/lib/libposix1e/cap_from_text.3
index a83c31efcb450..345d558493624 100644
--- a/lib/libposix1e/cap_from_text.3
+++ b/lib/libposix1e/cap_from_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd September 18, 2000
 .Dt CAP_FROM_TEXT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_from_text
 .Nd Convert Text to a Capability State in Working Store
diff --git a/lib/libposix1e/cap_get_flag.3 b/lib/libposix1e/cap_get_flag.3
index 1e827c92b1b70..9e39e8086a43d 100644
--- a/lib/libposix1e/cap_get_flag.3
+++ b/lib/libposix1e/cap_get_flag.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_GET_FLAG 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_get_flag
 .Nd Get the Value of a Capability Flag
diff --git a/lib/libposix1e/cap_get_proc.3 b/lib/libposix1e/cap_get_proc.3
index 8d2c69da2f8de..5032a67dd21b0 100644
--- a/lib/libposix1e/cap_get_proc.3
+++ b/lib/libposix1e/cap_get_proc.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_GET_PROC 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_get_proc
 .Nd Obtain the Current Process Capability State
diff --git a/lib/libposix1e/cap_init.3 b/lib/libposix1e/cap_init.3
index 33c4117af49b6..47e4fe302c6f3 100644
--- a/lib/libposix1e/cap_init.3
+++ b/lib/libposix1e/cap_init.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_INIT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_init
 .Nd Allocate and Initialize a Capability State in Working Storage
diff --git a/lib/libposix1e/cap_set_flag.3 b/lib/libposix1e/cap_set_flag.3
index ea06f469f52af..bbfe063cc90d2 100644
--- a/lib/libposix1e/cap_set_flag.3
+++ b/lib/libposix1e/cap_set_flag.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_SET_FLAG 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_set_flag
 .Nd Set the Value of a Capability Flag
diff --git a/lib/libposix1e/cap_set_proc.3 b/lib/libposix1e/cap_set_proc.3
index 869490fbe2ee2..bd7ac91e5f5fe 100644
--- a/lib/libposix1e/cap_set_proc.3
+++ b/lib/libposix1e/cap_set_proc.3
@@ -29,7 +29,7 @@
 .\"
 .Dd April 1, 2000
 .Dt CAP_SET_PROC 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_set_proc
 .Nd Set the Process Capability State
diff --git a/lib/libposix1e/cap_to_text.3 b/lib/libposix1e/cap_to_text.3
index b3717ea52a997..a3bd76202486b 100644
--- a/lib/libposix1e/cap_to_text.3
+++ b/lib/libposix1e/cap_to_text.3
@@ -27,7 +27,7 @@
 .\"
 .Dd September 18, 2000
 .Dt CAP_TO_TEXT 3
-.Os FreeBSD 5.0
+.Os FreeBSD
 .Sh NAME
 .Nm cap_to_text
 .Nd Convert a Capability State in Working Storage to Text
diff --git a/lib/libposix1e/posix1e.3 b/lib/libposix1e/posix1e.3
index 3581c97ecdc77..9a5afea68bed5 100644
--- a/lib/libposix1e/posix1e.3
+++ b/lib/libposix1e/posix1e.3
@@ -27,7 +27,7 @@
 .\"
 .Dd January 17, 2000
 .Dt POSIX1E 3
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm posix1e
 .Nd introduction to the POSIX.1e security API
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 7d0c65ac4970a..204a88fde1ad6 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -26,7 +26,7 @@
 .\"
 .Dd June 22, 1998
 .Dt LIBSTAND 3
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm libstand
 .Nd support library for standalone executables
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 4559a1b20c844..1cbb53f1de21b 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .Dd November 7, 1999
 .Dt VGL 3
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm VGLBitmapAllocateBits ,
 .Nm VGLBitmapCopy ,
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index a157f2af4cb54..8e58661f64002 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd April 12, 1995
 .Dt ATRUN 8
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm atrun
 .Nd run jobs queued for later execution
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index 27e85bd13ba84..de05fceffd69e 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -23,10 +23,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-
 .Dd July 8, 1996
 .Dt getNAME 1
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm getNAME
 .Nd get name sections from manual pages
@@ -38,7 +37,8 @@
 The
 .Nm
 utility 
-get name sections from manual pages. Without options
+get name sections from manual pages.
+Without options
 .Nm 
 building
 .Xr apropos 1
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index fc4680d30cebb..ed9d4277afcd5 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -34,7 +34,7 @@
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm dumpon
 .Nd "specify a device for crash dumps"
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 1ff6ea0cb2f8f..66e22e9011f75 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -33,7 +33,7 @@
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm mount_ext2fs
 .Nd mount a ext2fs file system
diff --git a/sbin/mount_nwfs/mount_nwfs.8 b/sbin/mount_nwfs/mount_nwfs.8
index 2639c0c7283ae..196dfe1c4179e 100644
--- a/sbin/mount_nwfs/mount_nwfs.8
+++ b/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/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 01d992ba3ee49..f4571cabd55bb 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -38,7 +38,7 @@
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm mount_std ,
 .Nm mount_devfs ,
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index 0b4d2906267f1..b009481a2eaaa 100644
--- a/sbin/nologin/nologin.5
+++ b/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/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index e8eb6533b2a32..1121088446d55 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -10,7 +10,7 @@
 .\" 
 .Dd April 11, 1998
 .Dt NOS-TUN 8
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm nos-tun
 .Nd implement ``nos'' or ``ka9q'' style IP over IP tunnel
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index 6959b0d7759bb..236a8fffbba52 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -34,7 +34,7 @@
 .\" Note: Only specify the operating system when the command
 .\" is FreeBSD specific, otherwise use the .Os macro with no
 .\" arguments.
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm example
 .Nd example command manual page
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index 4ec386553c0d5..d4d495c86d25f 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -34,7 +34,7 @@
 .\" Note: Only specify the operating system when the command
 .\" is FreeBSD specific, otherwise use the .Os macro with no
 .\" arguments.
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm example
 .Nd example library function manual page
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index eb27bd6995890..fe889fd4c681f 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -34,7 +34,7 @@
 .\" Note: Only specify the operating system when the command
 .\" is FreeBSD specific, otherwise use the .Os macro with no
 .\" arguments.
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm example
 .Nd example device driver manual page
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index 669beb91a0fc0..6f231a0464e7b 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -28,7 +28,7 @@
 .\"
 .Dd January 27, 2000
 .Dt ATA 4
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm ata ,
 .Nm acd ,
@@ -128,7 +128,9 @@ Ultra DMA 66 (UDMA4), 66 MB/sec
 .Pp
 All unknown chipsets can be supported at the maximum speed of 16 MB/sec.
 .Pp
-The ata driver also allows for changes to the transfer mode of the devices
+The
+.Nm
+driver also allows for changes to the transfer mode of the devices
 at a later time when the system is up and running.
 .Pp
 The driver attempts to set the maximum performance transfer mode on your disk
@@ -173,7 +175,9 @@ ATAPI floppy drive device nodes
 .It Pa /dev/ast*
 ATAPI tape drive device nodes
 .It Pa /sys/i386/conf/GENERIC
-sample generic kernel config file for ata based systems
+sample generic kernel config file for
+.Nm
+based systems
 .El
 .Sh NOTES
 Static numbering
@@ -188,7 +192,9 @@ ad0 and ad2 exist in the absence of ad1.
 The advantage is that the addition of the formerly absent drive
 does not cause the numbers of the other drives to change.
 .Pp
-The ata driver does not support MFM/RLL/ESDI (ST-506) style disks.
+The
+.Nm
+driver does not support MFM/RLL/ESDI (ST-506) style disks.
 .Pp
 Remember that in order to use UDMA4 mode you
 .Em have
@@ -201,9 +207,16 @@ the same ATA channel is not recommended,
 unless they are run at the non-UDMA4 device's lower speed.
 The driver has been designed to handle that kind of setup but lots of
 older devices do not like this.
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 4.0 .
 .Sh AUTHORS
 .An -nosplit
-The ata driver was written by
+The
+.Nm
+driver was written by
 .An S\(/oren Schmidt
 .Aq sos@FreeBSD.org .
 .Pp
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 67d613b720889..6cb9404e11a5e 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -3,7 +3,7 @@
 .\"
 .Dd January 28, 1998
 .Dt BKTR 4 i386
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm brooktree
 .Nd video capture driver
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index 34c92a1501fca..61e5402cd1f78 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -25,7 +25,7 @@
 .\"
 .Dd October 16, 1998
 .Dt DPT 4 i386
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm dpt
 .Nd DPT RAID Controller SCSI driver
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index c170937cf310c..a156012ef1f07 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -29,7 +29,7 @@
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm ifmib
 .Nd Management Information Base for network interfaces
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index e46dfb8342f81..f2e5ca18ec04d 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -24,21 +24,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
 .Dd January 8, 1999
 .Dt INTPM 4 i386
-.\" Note: Only specify the operating system when the command
-.\" is FreeBSD specific, otherwise use the .Os macro with no
-.\" arguments.
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm intpm
 .Nd Intel PIIX4 Power management controller driver.
 .Sh SYNOPSIS
 .Cd device smbus
 .Cd device intpm
-
 .Sh DESCRIPTION
 This driver provides access to 
 .Tn Intel PIIX4 PCI Controller function 3 ,
@@ -48,15 +42,14 @@ function is implemented.
 But it also have bus idle monitoring function.
 It
 will display mapped I/O address for bus monitoring function when attaching.
-
 .Sh SEE ALSO
 .Xr smb 4 ,
 .Xr smbus 4
 .Sh HISTORY
 The
 .Nm
-manual page example first appeared in
-.Fx 3.0 .
+driver first appeared in
+.Fx 3.4 .
 .Sh AUTHORS
 This
 manual page was written by
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 15071196c8a38..fc2854ed8038a 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -27,7 +27,7 @@
 .\"
 .Dd January 20, 1996
 .Dt INTRO 4
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm intro
 .Nd introduction to devices and device drivers
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index a1a0d091ed12d..56b799acf66fc 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -86,7 +86,7 @@
 .Dd September 24, 1995
 .Dt MATCD 4 i386
 .\"Synchronized to Version 1(25) of matcd.c
-.Os FreeBSD 2.0.5
+.Os FreeBSD
 .Sh NAME
 .Nm matcd
 .Nd Matsushita (Panasonic) CD-ROM driver
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 4c7bbc6ee3f11..d6a0fef7f1363 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -28,7 +28,7 @@
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm mcd
 .Nd Mitsumi CD-ROM driver
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index 17203d0a3fd84..2df77395227d8 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -29,7 +29,7 @@
 .\" $FreeBSD$
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm perfmon
 .Nd CPU performance-monitoring interface
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index b2501acf0e0eb..3c9aec4826d6c 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -28,7 +28,7 @@
 .\"
 .Dd January 1, 1995
 .Dt SCD 4 i386
-.Os FreeBSD 2.0.5
+.Os FreeBSD
 .Sh NAME
 .Nm scd
 .Nd Sony CDU31/33 CD-ROM driver
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index b5cc6cfaded10..8b1b1fc0a7f44 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -37,7 +37,7 @@
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm mtio
 .Nd
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index 0baadeb675033..eb7f64bec952d 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -29,7 +29,7 @@
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm pass
 .Nd CAM application passthrough driver
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index a1d119ae8e616..af51350544cdb 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -26,7 +26,7 @@
 .\"
 .Dd October 24, 1999
 .Dt PCI 4
-.Os FreeBSD 4.0
+.Os FreeBSD
 .Sh NAME
 .Nm pci
 .Nd Generic PCI driver
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index ca1d81a0b4440..a0c664722a419 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .Dd October 15, 1998
 .Dt SCSI 4
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm SCSI ,
 .Nm CAM
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 49462934e32d7..4ae57ce229730 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -25,7 +25,7 @@
 .\"
 .Dd August 4, 1997
 .Dt SMP 4
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm SMP
 .Nd description of the FreeBSD Symmetric MultiProcessor kernel.
diff --git a/share/man/man4/ttcp.4 b/share/man/man4/ttcp.4
index 5faed3379f61d..7018f5c075c09 100644
--- a/share/man/man4/ttcp.4
+++ b/share/man/man4/ttcp.4
@@ -29,7 +29,7 @@
 .\"
 .Dd January 18, 1995
 .Dt TTCP 4
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm ttcp
 .Nd Transmission Control Protocol Extensions for Transactions
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index 9fd4fd313e866..4d400ec06a9cb 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -29,7 +29,7 @@
 .\"
 .Dd October 10, 1998
 .Dt XPT 4
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm xpt
 .Nd CAM transport layer interface
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 69500c4aa004e..b048300431b1e 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -40,7 +40,7 @@
 .\"
 .Dd December 14, 1996
 .Dt DEVFS 5
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm devfs
 .Nd device file system
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 5a16a6d5eeaab..5502a811be9c5 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -26,7 +26,7 @@
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
-.Os FreeBSD 3.3
+.Os FreeBSD
 .Sh NAME
 .Nm elf
 .Nd format of ELF executable binary files
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index aaa665d5ae9c2..dc48beac6952a 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -32,7 +32,7 @@
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm ethers
 .Nd ethernet address database
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index e01f2f0815fd5..61753c693ed5d 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -3,7 +3,7 @@
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm fbtab
 .Nd change device protection upon login
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index 87ed18b4e3df4..6242f7e1d3d79 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -33,7 +33,7 @@
 .\"
 .Dd February 16, 1997
 .Dt INTRO 5
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm intro
 .Nd "introduction to file formats"
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index db541b69cfd71..2c65fd191bf49 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -33,7 +33,7 @@
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm intro
 .Nd "introduction to games"
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 84a5a91d9e3bb..4794c3e7bc6a7 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -27,7 +27,7 @@
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm ports
 .Nd contributed applications
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index d416a5d342e4e..0aed5e7b7e65d 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -29,7 +29,7 @@
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm devstat ,
 .Nm devstat_add_entry ,
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index e5977724feacf..b9e75189f3126 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .Dd January 15, 1997
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Dt IFNET 9
 .Sh NAME
 .Nm ifnet ,
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index d58f5b6624888..33be8ad70b56d 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -33,7 +33,7 @@
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
-.Os FreeBSD 2.2
+.Os FreeBSD
 .Sh NAME
 .Nm intro
 .Nd "introduction to system kernel interfaces"
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index ede4cf368938c..4c8ebe3c8b2af 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -25,13 +25,13 @@
 .\" $FreeBSD$
 .Dd March 1, 1998
 .Dt POSIX.1B 9
-.Os FreeBSD 3.0
+.Os FreeBSD
 .Sh NAME
 .Nm posix1b
 .Nd "Posix P1003-1B extensions"
 .Sh DESCRIPTION
 POSIX.1B adds real time extensions and some commonly used
-Berkeley extensions to POSIX.1
+Berkeley extensions to POSIX.1.
 This section contains preliminary information about avoiding conflicts
 and adding support for the required ability to specify the interface
 version.
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 5bc58e987e8e4..0a14fcfa5b90f 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .Dd April 12, 1995
 .Dt "AT" 1
-.Os FreeBSD 2.1
+.Os FreeBSD
 .Sh NAME
 .Nm at ,
 .Nm batch ,
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index ae8db9c28c58e..aafbb2702ebed 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -31,7 +31,7 @@
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
-.Os FreeBSD 2.0
+.Os
 .Sh NAME
 .Nm ipcs
 .Nd report System V interprocess communication facilities status
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 91a1bccc1d68e..e986a6f12cadc 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd June 25, 1995
-.Os FreeBSD 2.2 
+.Os FreeBSD
 .Dt KILLALL 1
 .Sh NAME
 .Nm killall
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