diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index 23d1dd03f7df..6f5f0f229be4 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -24,15 +24,13 @@
 .\"
 .\" /usr/bin/catman - preformat man pages
 .\"
-.\" $Id: catman.1,v 1.7 1996/01/23 21:27:39 joerg Exp $
-
+.\" $Id: catman.1,v 1.8 1996/08/27 20:03:59 wosch Exp $
 .Dd Mar 12, 1995
 .Dt CATMAN 1
 .Os
 .Sh NAME
 .Nm catman
 .Nd preformat man pages
-
 .Sh SYNOPSIS
 .Nm catman
 .Op Fl f | Fl force
@@ -41,7 +39,6 @@
 .Op Fl r | Fl remove
 .Op Fl v | Fl verbose
 .Op Ar directories...
-
 .Sh DESCRIPTION 
 .Nm Catman
 format man pages to ASCII.  It's like typing
@@ -56,29 +53,21 @@ Use
 if no 
 .Ar directories
 defined.
-
 .Sh OPTIONS
 .Bl -tag -width Ds
-
 .It Fl f , Fl force
 Force overwriting old cat pages.  Normally only those pages will be formatted
 which are not up to date.  This option is a waste of time, CPU and RAM.
-
 .It Fl h , Fl help
 Print options and exit.
-
 .It Fl p , Fl print
 Don't actually format man pages. Show what would be done.
-
 .It Fl r , Fl remove
 Remove garbage, e.\& g. catpage without manpage, uncompressed catpage but
 a compressed catpage exist, filenames with non-alphanumeric
 characters, uncompressed manpage but a compressed manpage exist.
-
 .It Fl v , Fl verbose
 More warnings.
-
-
 .Sh EXAMPLES
 .Pp
 .Dl $ catman
@@ -86,12 +75,10 @@ More warnings.
 Format man pages in
 .Ar /usr/share/man
 if neccessary.
-
 .Pp
 .Dl $ catman $MANPATH
 .Pp
 Format all your man pages if neccessary.
-
 .Pp
 .Dl $ catman -f /usr/local/man/man1 /usr/local/man/manl
 .Pp
@@ -99,25 +86,21 @@ Force reformatting of all man pages in
 .Pa /usr/local/man/man1
 and
 .Pa /usr/local/man/manl .
-
 .Pp
 .Dl $ catman -p /usr/X11/man
 .Pp
 Show only.
-
 .Sh FILES
-.Bl -tag -width /etc/master.passwdxx -compact
-.Pa /etc/weekly :
-start this program
+.Bl -tag -width /etc/weeklyxxx -compact
+.Pa /etc/weekly
+Starts this program
 .Po
 or
 .Pa /etc/daily
 .Pc
 .El
-
 .Sh FEATURES
 Very fast if all man pages already formatted.
-
 Does not support the
 .Fl w
 option as some other systems do.  Use
@@ -130,23 +113,20 @@ database.
 is a setuid program.  Be careful that user
 .Sq man
 has write permissions to the catman directories.
-
 .Nm Catman
 does not check for any
 .Sq .so
 in man page sources.  Use hard or symlinks
 to avoid redundant formatted man pages.
-
 .Sh SEE ALSO
 .Xr man 1 ,
 .Xr manpath 1 ,
 .Xr makewhatis 1 .
-
 .Sh HISTORY
 This version of
 .Nm catman
-command appeared in FreeBSD 2.1
-
+command appeared in
+.Fx 2.1 .
 .Sh AUTHOR
 Wolfram Schneider
 .Aq wosch@FreeBSD.org ,
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 27922ab22079..3cc20efd3813 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -22,16 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.1,v 1.5 1996/07/08 20:18:28 wosch Exp $
-
-
+.\" $Id: makewhatis.1,v 1.6 1996/08/27 20:04:05 wosch Exp $
 .Dd Jan, 12, 1995
 .Dt MAKEWHATIS 1
 .Os FreeBSD 2.1
 .Sh NAME
 .Nm makewhatis
 .Nd create whatis database
-
 .Sh SYNOPSIS
 .Nm
 .Op Fl a | Fl append
@@ -41,7 +38,6 @@
 .Op Fl o | Fl outfile Ar file
 .Op Fl v | Fl verbose
 .Op Ar directories ...
-
 .Sh DESCRIPTION 
 .Nm
 extracts the name and a short description from unformatted manpages
@@ -50,7 +46,6 @@ and creates the
 database. 
 .Nm
 can read gzip'ed manpages.
-
 .Ar Directory
 names a directory containing manpage subdirectories
 .Pq named Pa man.+ .
@@ -59,7 +54,6 @@ Colons are treated as spaces, hence
 or
 .Ic makewhatis `manpath`
 are allowed.
-
 .Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl a , Fl append
@@ -67,26 +61,21 @@ Append mode. Don't delete old entries in whatis database. Note:
 the new database will be sorted without repeated lines and
 .Nm
 does not check if old entries are valid.
-
 .It Fl h , Fl help
 Print options and exit.
-
 .It Fl i , Fl indent Ar column
 Justify description strings to
 .Ar column Pq default 24 .
-
 .It Fl n , Fl name Ar name
 Use
 .Ar name
 instead of
 .Pa whatis Ns .
-
 .It Fl o , Fl outfile Ar file
 Write all output to
 .Ar file
 instead of
 .Pa dirname/whatis Ns .
-
 .It Fl v, Fl verbose
 Issue more warnings
 .Pq to stderr .
@@ -98,8 +87,6 @@ for a compressed page, and
 .Ql +
 for a link.
 .El
-
-
 .Sh EXAMPLES
 .Pp
 .Ic makewhatis $MANPATH
@@ -127,7 +114,6 @@ Create whatis database
 instead of
 .Pa whatis Ns .
 May be useful for Solaris.
-
 .Sh FILES
 .Bl -tag -width /etc/master.passwdxx -compact
 .It Pa */man/whatis
@@ -137,7 +123,6 @@ run
 .Nm makewhatis.local
 every week
 .El
-
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr catman 1 ,
@@ -148,11 +133,10 @@ every week
 .Xr sort 1 ,
 .Xr uniq 1 ,
 .Xr whatis 1 .
-
 .Sh HISTORY
 This
 .Nm
-command appeared in FreeBSD 2.1.
-
+command appeared in
+.Fx 2.1 .
 .Sh AUTHOR
 Wolfram Schneider, Berlin.
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
index ac7545061ca3..f81fae53d781 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
@@ -22,16 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.local.8,v 1.1 1996/05/22 00:57:40 wosch Exp $
-
+.\" $Id: makewhatis.local.8,v 1.2 1996/08/27 20:04:06 wosch Exp $
 .Dd April, 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
-
 .Sh NAME
 .Nm makewhatis.local , catman.local
 .Nd start makewhatis for local file systems
-
 .Sh SYNOPSIS
 .Nm /usr/libexec/makewhatis.local
 .Op options
@@ -39,8 +36,6 @@
 .Nm /usr/libexec/catman.local
 .Op options
 .Ar directories ...
-
-
 .Sh DESCRIPTION 
 .Nm
 start 
@@ -55,8 +50,7 @@ for rw nfs-mounted /usr may kill
 your NFS server -- all NFS clients start makewhatis at the same time!
 So use this wrapper for 
 .Xr cron 8
-instead calling makewhatis directly.
-
+instead of calling makewhatis directly.
 .Sh FILES
 .Bl -tag -width /etc/weekly.XXX -compact
 .It Pa /etc/weekly 
@@ -64,14 +58,13 @@ run
 .Nm
 every week
 .El
-
 .Sh SEE ALSO
-.Xr makewhatis 1 ,
 .Xr catman 1 ,
 .Xr find 1 ,
+.Xr makewhatis 1 ,
 .Xr cron 8 .
-
 .Sh HISTORY
 The
 .Nm
-command appeared in FreeBSD 2.2.
+command appeared in
+.Fx 2.2 .
diff --git a/usr.bin/makewhatis/makewhatis.local.8 b/usr.bin/makewhatis/makewhatis.local.8
index ac7545061ca3..f81fae53d781 100644
--- a/usr.bin/makewhatis/makewhatis.local.8
+++ b/usr.bin/makewhatis/makewhatis.local.8
@@ -22,16 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.local.8,v 1.1 1996/05/22 00:57:40 wosch Exp $
-
+.\" $Id: makewhatis.local.8,v 1.2 1996/08/27 20:04:06 wosch Exp $
 .Dd April, 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
-
 .Sh NAME
 .Nm makewhatis.local , catman.local
 .Nd start makewhatis for local file systems
-
 .Sh SYNOPSIS
 .Nm /usr/libexec/makewhatis.local
 .Op options
@@ -39,8 +36,6 @@
 .Nm /usr/libexec/catman.local
 .Op options
 .Ar directories ...
-
-
 .Sh DESCRIPTION 
 .Nm
 start 
@@ -55,8 +50,7 @@ for rw nfs-mounted /usr may kill
 your NFS server -- all NFS clients start makewhatis at the same time!
 So use this wrapper for 
 .Xr cron 8
-instead calling makewhatis directly.
-
+instead of calling makewhatis directly.
 .Sh FILES
 .Bl -tag -width /etc/weekly.XXX -compact
 .It Pa /etc/weekly 
@@ -64,14 +58,13 @@ run
 .Nm
 every week
 .El
-
 .Sh SEE ALSO
-.Xr makewhatis 1 ,
 .Xr catman 1 ,
 .Xr find 1 ,
+.Xr makewhatis 1 ,
 .Xr cron 8 .
-
 .Sh HISTORY
 The
 .Nm
-command appeared in FreeBSD 2.2.
+command appeared in
+.Fx 2.2 .