Miscellaneous man page fixes.

29 files changed, 407 insertions, 510 deletions

diff --git a/archivers/gtar-base/files/gtar.1 b/archivers/gtar-base/files/gtar.1
index 399500c01ca..6b1e4a24584 100644
--- a/archivers/gtar-base/files/gtar.1
+++ b/archivers/gtar-base/files/gtar.1
@@ -3,11 +3,11 @@
 .\"
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"
-.\"	$NetBSD: gtar.1,v 1.1.1.2 1999/09/18 14:50:14 kim Exp $
+.\"	$NetBSD: gtar.1,v 1.2 2001/12/03 19:03:19 wiz Exp $
 .\"	from NetBSD: tar.1,v 1.8 1997/06/06 07:59:54 jeremy Exp
 .\"
-.Dd 6 August 1994
-.Os NetBSD
+.Dd August 6, 1994
+.Os
 .Dt GTAR 1
 .Sh NAME
 .Nm gtar
@@ -24,8 +24,8 @@
 .Op Fl C Ar directory-name
 .Sh DESCRIPTION
 .Nm
-is short for 
-.Dq tape archiver,
+is short for
+.Dq tape archiver ,
 so named for historical reasons; the
 .Nm
 program creates, adds files to, or extracts files from an archive file
@@ -69,7 +69,7 @@ to the end of the archive (erasing the old end-of-archive block).
 This has the effect of adding the files contained in the named file to
 the first archive, rather than adding the second archive as an element
 of the first.
-.Em Note:
+.Em Note :
 This option requires a rewritable tarfile,
 and therefore does not work on quarter-inch cartridge tapes.
 .It Fl c
@@ -221,7 +221,7 @@ Extract files to standard output.
 Extract all protection information.
 .It Fl -preserve
 Has the effect of
-.Fl p s.
+.Fl p s .
 .It Fl P
 .It Fl -absolute-paths
 Don't strip leading `/'s from file names.
@@ -246,7 +246,7 @@ one per line.
 Modifies behavior of
 .Fl T
 to expect null-terminated names; disables
-.Fl C.
+.Fl C .
 .It Fl -totals
 Prints total bytes written with
 .Fl -create .
@@ -305,6 +305,33 @@ Don't recurse into subdirectories when creating.
 .It Fl -unlink
 Unlink files before creating them.
 .El
+.Sh ENVIRONMENT
+The
+.Nm
+program examines the following environment variables:
+.Bl -tag -width "POSIXLY-CORRECT"
+.It Ev POSIXLY-CORRECT
+Normally,
+.Nm
+will process flag arguments that appear in the file list.
+If set in the environment, this flag causes
+.Nm
+to consider the first
+non-flag argument to terminate flag processing, as per the POSIX specification.
+.It Ev SHELL
+In interactive mode, a permissible response to the prompt is to
+request to spawn a subshell, which will be "/bin/sh" unless the
+.Ev SHELL
+variable is set.
+.It Ev TAPE
+Changes the default tape drive (which is still overridden by the
+.Fl f
+flag).
+.El
+.Sh FILES
+.Bl -tag -width "/dev/rst0"
+.It Pa /dev/rst0
+The default tape drive.
 .Sh EXAMPLES
 To create an archive on tape drive
 .Pa /dev/rst0
@@ -352,33 +379,6 @@ which will add the files contained in archive2.tar onto the end of
 archive1.tar (note that this can't be done by simply typing
 .Dl cat archive2.tar >> archive1.tar
 because of the end-of-file block at the end of a tar archive).
-.Sh ENVIRONMENT
-The
-.Nm
-program examines the following environment variables:
-.Bl -tag -width "POSIXLY-CORRECT"
-.It Ev POSIXLY-CORRECT
-Normally, 
-.Nm
-will process flag arguments that appear in the file list.
-If set in the environment, this flag causes
-.Nm
-to consider the first
-non-flag argument to terminate flag processing, as per the POSIX specification.
-.It Ev SHELL
-In interactive mode, a permissible response to the prompt is to
-request to spawn a subshell, which will be "/bin/sh" unless the
-.Ev SHELL
-variable is set.
-.It Ev TAPE
-Changes the default tape drive (which is still overridden by the
-.Fl f
-flag).
-.El
-.Sh FILES
-.Bl -tag -width "/dev/rst0"
-.It Pa /dev/rst0
-The default tape drive.
 .El
 .\" This next request is for sections 1, 6, 7 & 8 only
 .\"     (command return values (to shell) and fprintf/stderr type diagnostics)
diff --git a/converters/bbcim/files/bbcim.1 b/converters/bbcim/files/bbcim.1
index 0f1a6d8eff7..0d83d4e0370 100644
--- a/converters/bbcim/files/bbcim.1
+++ b/converters/bbcim/files/bbcim.1
@@ -1,5 +1,7 @@
 .\" -*- nroff -*-
 .\"
+.\" $NetBSD: bbcim.1,v 1.2 2001/12/03 19:03:20 wiz Exp $
+.\"
 .\" bbcim.
 .\" Copyright (C) 1996 W.H.Scholten.
 .\"
@@ -16,7 +18,7 @@
 .\"
 .\"
 .\"
-.Dd June, 1997
+.Dd June 1, 1997
 .Dt BBCIM 1
 .\"
 .\"------------------------------------------------------------------
@@ -86,7 +88,7 @@ utilitiy can be invoked to perform a variety of different
 conversions - each synopsis form provides a different
 conversion. The first synopsis form has the
 following options:
-.Bl -tag -width Ds 
+.Bl -tag -width Ds
 .It Fl H
 Display usage information.
 .It Fl V
@@ -164,7 +166,7 @@ what you want to do
 modifier only extracts the bare files - no information
 files are created.
 .Pp
-If the 
+If the
 .Cm r
 modifier is specified the image is deleted after all files
 have been extracted.
@@ -204,7 +206,7 @@ removes the DFS directory $
 and glues others to the file name. This can be used to
 make archive files from an xbeeb directory
  CAN BE USED TO
-MAKE ARCHIVE FILES FROM AN XBEEB DIRECTORY. 
+MAKE ARCHIVE FILES FROM AN XBEEB DIRECTORY.
 .It Fl x Ar file ...
 .Qq xbeeb
 conversion of archive files in the list.
@@ -245,7 +247,7 @@ DFS disk images
 .Ar image Ns .w1 and
 .Ar image Ns .w2 .
 .El
-.Sh AUTHOR
+.Sh AUTHORS
 .Nm
 was written by Wouter Scholten last known email address
 wouters@cistron.nl. This man page was put together by Nick
diff --git a/converters/uulib/files/uulib.3 b/converters/uulib/files/uulib.3
index 7ce03634cd0..a4a5a6706e8 100644
--- a/converters/uulib/files/uulib.3
+++ b/converters/uulib/files/uulib.3
@@ -1,30 +1,30 @@
-.\" $NetBSD: uulib.3,v 1.2 1998/08/07 10:40:17 agc Exp $
-.Dd October, 1996
+.\" $NetBSD: uulib.3,v 1.3 2001/12/03 19:03:20 wiz Exp $
+.Dd October 1, 1996
 .Dt UULIB 3
 .Sh NAME
 .Nm libuu
 .Nd Decoding Library Programming Interface
 .Sh DESCRIPTION
-This library is used for encoding/unencoding uuencoded, xxencoded, 
+This library is used for encoding/unencoding uuencoded, xxencoded,
 and Base64 encoded files.  It can also unencode BinHex files (but not
 encode them).
 .Sh DOCUMENTATION
 Documentation for uulib is contained in FUNKYTOKENHEREshare/doc/uulib.
-.Sh AUTHOR
-.Ar Libuu
-is written by
-.Nm Frank Pilhofer <fp@informatik.uni-frankfurt.de>
-with thanks to
-.Nm Michael Newcomb,
-.Nm Nico Mak,
-.Nm Stephane Barizien,
-.Nm Kris Karas,
-and
-.Nm Joachim Meyn.
 .Sh SEE ALSO
-.Xr uudeview 1
+.Xr uudeview 1 ,
 .Xr xdeview 1
-
+.Pp
 http://zeus.informatik.uni-frankfurt.de/~fp/uudeview
 .Sh HISTORY
 See the file FUNKYTOKENHEREshare/doc/uulib/HISTORY.
+.Sh AUTHORS
+.Ar Libuu
+is written by
+.Nm Frank Pilhofer <fp@informatik.uni-frankfurt.de>
+with thanks to
+.Nm Michael Newcomb ,
+.Nm Nico Mak ,
+.Nm Stephane Barizien ,
+.Nm Kris Karas ,
+and
+.Nm Joachim Meyn .
diff --git a/cross/bfd-crunchide/files/crunchide.1 b/cross/bfd-crunchide/files/crunchide.1
index 3e3186034ed..a402c29e2d3 100644
--- a/cross/bfd-crunchide/files/crunchide.1
+++ b/cross/bfd-crunchide/files/crunchide.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: crunchide.1,v 1.1.1.1 1999/12/20 05:57:40 sakamoto Exp $
+.\"	$NetBSD: crunchide.1,v 1.2 2001/12/03 19:03:20 wiz Exp $
 .\"
 .\" Copyright (c) 1994 University of Maryland
 .\" All Rights Reserved.
@@ -48,11 +48,11 @@
 .Nm Crunchide
 hides the global symbols of
 .Ar object-file
-such that they are ignored by subsequent runs of the linker, 
+such that they are ignored by subsequent runs of the linker,
 .Xr ld 1 .
 Some symbols may be left visible via the
 .Fl k Ar keep-symbol
-and 
+and
 .Fl f Ar keep-list-file
 options.  The
 .Ar keep-list-file
@@ -62,10 +62,10 @@ The names given by
 or in
 .Ar keep-list-file
 should be C names.  For example,
-to keep the C function 
+to keep the C function
 .Dq foo
-visible, the option 
-.Dq -k foo 
+visible, the option
+.Dq -k foo
 should be used.
 .Pp
 To recognize kernel executable format, the
@@ -73,7 +73,7 @@ To recognize kernel executable format, the
 flag specifies BFD name of kernel.
 .Pp
 .Nm Crunchide
-is designed as a companion program for 
+is designed as a companion program for
 .Xr crunchgen 1 ,
 which automates the process of creating crunched binaries from
 multiple component programs.
diff --git a/cross/bfd-mdsetimage/files/mdsetimage.8 b/cross/bfd-mdsetimage/files/mdsetimage.8
index 04f156311db..bef474ea822 100644
--- a/cross/bfd-mdsetimage/files/mdsetimage.8
+++ b/cross/bfd-mdsetimage/files/mdsetimage.8
@@ -1,8 +1,8 @@
-.\"	$NetBSD: mdsetimage.8,v 1.2 2001/10/01 23:39:25 cgd Exp $
+.\"	$NetBSD: mdsetimage.8,v 1.3 2001/12/03 19:03:20 wiz Exp $
 .\"
 .\" Copyright (c) 1996 Christopher G. Demetriou
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -13,7 +13,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -24,7 +24,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
 .\"
 .Dd October 3, 1996
diff --git a/devel/bcc/files/as86.1 b/devel/bcc/files/as86.1
index ab795837d6e..ff449309739 100644
--- a/devel/bcc/files/as86.1
+++ b/devel/bcc/files/as86.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: as86.1,v 1.2 1998/08/07 10:40:20 agc Exp $
+.\" $NetBSD: as86.1,v 1.3 2001/12/03 19:03:21 wiz Exp $
 .\"
 .\" This manual page has been assembled after Bruce's original bcc.doc
 .\" file by Jörg Wunsch <joerg@FreeBSD.org>.
@@ -21,111 +21,78 @@
 .Op Fl s Ar sym
 .Ar src
 .Sh DESCRIPTION
-
 .Ss Overview
 .Nm As86
 is an assembler for 8086 or 80386 CPUs.  Its syntax resembles rather
 the usual 8086 assembler syntax than the AT&T-like syntax as used by
 the system's assembler
 .Xr as 1 .
-
+.Pp
 It can also be compiled to support the Motorola 6809 CPU.  The name
 .Nm as86
 has only been chosen to make it distinct from the system's assembler.
-
 .Ss Options
-
 .Bl -tag -width indent -compact
-
 .It Fl 0
 .Pq the digit 0
 start with 16-bit code segment
-
 .It Fl 3
 start with 32-bit code segment
-
 .It Fl a
 enable partial compatibility with asld
-
 .It Fl b
 produce binary file, filename may follow
 .Pq obsolete
-
 .It Fl g
 only put global symbols in object file
-
 .It Fl j
 force all jumps to be long
-
 .It Fl l
 produce list file, filename may follow
-
 .It Fl m
 print macro expansions in listing
-
 .It Fl n
 name of module follows
 .Pq goes in object instead of source name
-
 .It Fl o
 produce object file, filename follows
-
 .It Fl s
 produce symbol file, filename follows
 .Pq obsolete
-
 .It Fl u
 take undefined symbols as imported-with-unspecified segment
-
 .It Fl w
 don't print warnings
-
 .El
-
+.Pp
 The 6809 version does not support
 .Fl 0 ,
 .Fl 3 ,
 .Fl a
 or
 .Fl j .
-
-
 .Ss Defaults
 Off or none except for these; no output is produced without a flag:
-
 .Bl -tag -width indenct -compact
-
 .It Fl 0 | Fl 3
 native, i.\& e. 80386
-
 .It Ar list
 stdout
 .Pq beware of clobbering next arg
-
 .It Ar name
 basename of the source name
-
 .El
-
 .Ss Input syntax
-
 The following lists all acceptable names except the CPU instructions:
-
 .Bl -tag -width "XXXXXXX" -compact -offset indent
-
 .It Register names
-
 bp, bx, di, si, eax, ebp, ecx, edi, edx, esi, esp,
 ax, cx, dx, sp, ah, al, bh, bl, ch, cl, dh, dl,
 cs, ds, es, fs, gs, ss, cr0, cr2, cr3, dr0, dr1,
 dr3, dr6, dr7, tr3, tr4, tr5, tr6, tr7, st.
-
 .It Type sizes
-
 byte, dword, fword, far, ptr, pword, qword, tbyte, word.
-
 .It Pseudo-operations
-
 else, elseif, elseifc, endif, if, ifc;
 \&.align, .ascii, .blkb, .blkw, block, .bss, .byte, comm, .comm,
 \&.data, .data1, .data2, .data4, db, dd, .define, dw, end, endb,
@@ -134,20 +101,14 @@ fcb, fcc, fdb, get, .globl, ident, import, include, lcomm, .lcomm,
 \&.list, loc, .long, .maclist, macro, .map, org, .org, public,
 rmb, .rom, .sect, set, setdp, .short, .space, .text, use16,
 use32, .warn, .word, .zero.
-
 .El
 .Sh SEE ALSO
-
-.Xr as 1 ;
-.Xr ld86 1 ,
-.Xr bcc 1 .
-
+.Xr as 1 ,
+.Xr bcc 1 ,
+.Xr ld86 1
 .Sh AUTHORS
-
 This program has been developed by Bruce Evans.
-
 .Sh BUGS
-
 The
 .Fl u
 and
@@ -156,4 +117,3 @@ options are perhaps back to front because they are needed for cc1
 output and Minix's make does the wrong thing with .s files left
 around.  However, all assembler code not written by compilers should
 assemble with them turned off.
-
diff --git a/devel/bcc/files/bcc-cc1.1 b/devel/bcc/files/bcc-cc1.1
index 99757b7e8e1..6a44f4edde5 100644
--- a/devel/bcc/files/bcc-cc1.1
+++ b/devel/bcc/files/bcc-cc1.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: bcc-cc1.1,v 1.2 1998/08/07 10:40:20 agc Exp $
+.\" $NetBSD: bcc-cc1.1,v 1.3 2001/12/03 19:03:21 wiz Exp $
 .\"
 .\" This manual page has been assembled after Bruce's original bcc.doc
 .\" file by Jörg Wunsch <joerg@FreeBSD.org>.
@@ -19,68 +19,50 @@
 .Op Fl U Ns Ar undef
 .Op Fl o Ar outfile
 .Op Ar infile
-
 .Sh DESCRIPTION
-
 .Nm Bcc-cc1
 is the backend for the
 .Xr bcc 1
 C compiler.
-
+.Pp
 It understands the following options:
-
 .Bl -tag -width indent -compact
-
 .It Fl 0
 .Pq the digit 0
 8086 target
 .Pq works even on 80386 host
-
 .It Fl 3
 80386 target
 .Pq works even on 8086 host
-
 .It Fl D
 define
-
 .It Fl E
 produce preprocessor output
-
 .It Fl I
 include search path
-
 .It Fl P
 produce preprocessor output with no line numbers
-
 .It Fl c
 produce code with caller saving regs before function calls
-
 .It Fl d
 print debugging information in assembly output
-
 .It Fl f
 produce code with 1st argument passed in a register
-
 .It Fl l
 produce code for 2 3 1 0 long byte order
 .Pq only works in 16-bit versions
-
 .It Fl o
 assembler output file name follows
-
 .It Fl p
 produce
 .Pq almost
 position-independent code
-
 .It Fl t
 print source code in assembly output
-
 .It Fl w
 print what cc1 thinks is the location counter in assembly output
-
 .El
-
+.Pp
 All the options except
 .Fl D ,
 .Fl I
@@ -90,15 +72,13 @@ may be turned off by following the
 option letter by a
 .Sq - .
 Options are processed left to right so the last setting has precedence.
-
+.Pp
 The following is defined before option processing:
-
 .Bd -literal
 __BCC__			1
 .Ed
-
+.Pp
 The following may be defined after option processing:
-
 .Bd -literal
 __AS09__		1 if 6809 version
 __AS386_16__		1 if -0 option on 80*86
@@ -109,21 +89,15 @@ __FIRST_ARG_IN_X__	1 if -f option on 6809
 __LONG_BIG_ENDIAN__	1 if -l option
 __POS_INDEPENDENT__	1 if -p option on 6809
 .Ed
-
+.Pp
 The following are standard builtins:
-
 .Bd
 __FILE__		stringized name of current input file
 __LINE__		current line number
 .Ed
-
 .Sh FILES
 .Pa /usr/local/lib/bcc/bcc-cc1
-
 .Sh SEE ALSO
-
-.Xr bcc 1 .
-
+.Xr bcc 1
 .Sh AUTHORS
-
 This program has been written by Bruce Evans.
diff --git a/devel/bcc/files/bcc.1 b/devel/bcc/files/bcc.1
index 80a0c56671d..5b2d7acf466 100644
--- a/devel/bcc/files/bcc.1
+++ b/devel/bcc/files/bcc.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: bcc.1,v 1.2 1998/08/07 10:40:20 agc Exp $
+.\" $NetBSD: bcc.1,v 1.3 2001/12/03 19:03:21 wiz Exp $
 .\"
 .\" This manual page has been assembled after Bruce's original bcc.doc
 .\" file by Jörg Wunsch <joerg@FreeBSD.org>.
@@ -27,11 +27,8 @@
 .Op Fl fpt Ar error
 .Op ld_options
 .Op Ar infiles
-
 .Sh DESCRIPTION
-
 .Ss Overview
-
 .Nm Bcc
 is a simple C compiler suitable for generating 8086 or 80386 code.
 It basically understands the old K&R C input syntax, with some
@@ -39,29 +36,23 @@ restrictions on bit fields.  It interacts with the programs
 .Xr as86 1
 and
 .Xr ld86 1 .
-
+.Pp
 As a compile-time option, it is also possible to convince
 .Nm bcc
 to generate code for the Motorola 6809 CPU.
-
 .Ss Options
-
 .Bl -tag -width indent -compact
-
 .It Fl 0
 .Pq the digit 0
 8086 target
 .Pq works even on 80386 host
-
 .It Fl 3
 80386 target
 .Pq works even on 8086 host
-
 .It Fl A
 pass remainder of option to assembler; e.\& g.
 .Ql -A-l -Alistfile
 for a listing
-
 .It Fl B
 prefix for executable search path; the search order is all paths
 specified using
@@ -71,42 +62,31 @@ in order, then the path given in the environment variable
 if that is set, then the compiled-in defaults
 .Pa /usr/local/lib/bcc ,
 followed by
-.Pa /usr/local/bin 
-
+.Pa /usr/local/bin
 .It Fl C
 pass remainder of option to bcc-cc1; e.\& g.
 .Ql -C-c
 for caller-saves
-
 .It Fl D
 define
-
 .It Fl E
 produce preprocessor output
-
 .It Fl G
 produce gnu-Minix objects
 .Pq link with gnu ld
-
 .It Fl I
 include search path
-
 .It Fl L
 pass remainder of option to linker
-
 .It Fl O
 optimize
 .Pq does nothing
-
 .It Fl P
 produce preprocessor output with no line numbers
-
 .It Fl Q
 pass full option to c386
-
 .It Fl S
 produce assembler file
-
 .It Fl T
 temporary directory;
 overrides previous value and default; default is
@@ -114,43 +94,33 @@ from the environment variable
 .Ev TMPDIR
 if that is set, otherwise
 .Pa /tmp
-
 .It Fl U
 undefine
-
 .It Fl V
 print names of files being compiled
-
 .It Fl c
 produce object file
-
 .It Fl e
 run the preprocess pass separately.  This takes less memory, and may
 help or harm by giving more traditional semantics like token pasting
 with
 .Ql /**/
 \&.
-
 .It Fl f
 error
 .Pq float emulation not supported
-
 .It Fl g
 produce debugging info
 .Pq does nothing
-
 .It Fl o
-output file name follows 
+output file name follows
 .Pq assembler, object or executable
-
 .It Fl p
 error
 .Pq profiling not supported
-
 .It Fl t
 error
 .Pq substitution of some cc passes not supported
-
 .It Fl v
 print names and args of subprocesses being run.
 .Pp
@@ -161,26 +131,21 @@ Two or more
 Three or more
 .Fl v
 \&'s: print names of paths being searched.
-
 .El
-
+.Pp
 The 6809 version does not support
 .Fl 0 ,
 .Fl 3
 or
-.Fl G.
-
+.Fl G .
+.Pp
 Only the c386 version supports
 .Fl Q .
-
 .Ss Defaults
 Off or none except for these:
-
 .Bl -tag -width indent -compact
-
 .It Fl 0 | Fl 3
 native, i.\& e. 80386
-
 .It Ar outfile
 stdout for preprocessor output
 .Pp
@@ -196,9 +161,8 @@ for assembler output
 .Pp
 .Pa a.out
 for ld output
-
 .El
-
+.Pp
 Other options are passed to the linker, in particular
 .Fl i- ,
 .Fl l Ns Ar x ,
@@ -209,26 +173,17 @@ The
 .Fl i
 option is always passed to the linker but can be cancelled using
 .Fl i- .
-
 .Sh ENVIRONMENT
-
 .Bl -tag -width indent -compact
-
 .It Ev BCC_EXEC_PREFIX
 directory to search for compiler passes
-
 .It Ev TMPDIR
 where to place temporary files
-
 .El
-
 .Sh SEE ALSO
-
 .Xr as86 1 ,
-.Xr ld86 1 ,
-.Xr bcc-cc1 1 ;
-.Xr cc 1 .
-
+.Xr bcc-cc1 1 ,
+.Xr cc 1 ,
+.Xr ld86 1
 .Sh AUTHORS
-
 This program has been written by Bruce Evans.
diff --git a/devel/bcc/files/ld86.1 b/devel/bcc/files/ld86.1
index 4176c4dd3e7..cb4e9245929 100644
--- a/devel/bcc/files/ld86.1
+++ b/devel/bcc/files/ld86.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ld86.1,v 1.2 1998/08/07 10:40:20 agc Exp $
+.\" $NetBSD: ld86.1,v 1.3 2001/12/03 19:03:21 wiz Exp $
 .\"
 .\" This manual page has been assembled after Bruce's original bcc.doc
 .\" file by Jörg Wunsch <joerg@FreeBSD.org>.
@@ -23,117 +23,84 @@
 .Ar infile
 .Op Ar ...
 .Sh DESCRIPTION
-
 .Ss Overview
-
 .Nm Ld86
 is the loader that understands how to link the output of
 .Xr as86 1
 together.
-
 .Ss Options
-
 .Bl -tag -width indent -compact
-
 .It Fl 0
 .Pq the digit 0
 produce header with 16-bit magic and use library subdir
 .Pa i86
 for
 .Fl l Ns Ar x
-
 .It Fl 3
 produce header with 32-bit magic and use library subdir
 .Pa i386
 for
 .Fl l Ns Ar x
-
 .It Fl C Ns Ar x
 add file
 .Pa libdir-from-search/crt Ns Ar x Ns \&.o
 to list of files linked
-
 .It Fl L Ns Ar x
 add dir name
 .Ar x
 to the head of the list of library dirs searched
-
 .It Fl M
 print symbols linked on stdout
-
 .It Fl O Ns Ar x
 add library
 .Pa libdir-from-search/ Ns Ar x
 to list of files linked
-
 .It Fl T
 text base address follows
 .Pq in format suitable for strtoul
-
 .It Fl i
 separate I&D output
-
 .It Fl l Ns Ar x
 add library
 .Pa libdir-from-search/lib Ns Ar x Ns \&.a
 to list of files linked
-
 .It Fl m
 print modules linked on stdout
-
 .It Fl o
 output file name follows
-
 .It Fl r
 produce output suitable for further relocation
-
 .It Fl s
 strip symbols
-
 .It Fl t
 trace modules being looked at on stdout
-
 .It Fl z
 produce
 .Dq unmapped zero page
 executables
-
-
 .El
-
+.Pp
 The 6809 version does not support -i or -r.
-
+.Pp
 All the options not taking an argument may be turned off by following the
 option letter by a
 .Sq \&- ,
 as for bcc-cc1.
-
 .Ss Defaults
-
 Off or none except for these:
-
 .Bl -tag -width indent -compact
-
 .It Fl 0 | Fl 3
 native, i.\& e. 80386
-
 .It Fl L Ns Pa /usr/local/lib/bcc/ Ns Ar m/
 .Po
 .Ar m
 is machine dependent
 .Pc
-
 .It Ar outfile
 .Pa a.out
-
 .El
-
 .Sh SEE ALSO
-
 .Xr as86 1 ,
-.Xr bcc 1 .
-
+.Xr bcc 1
 .Sh AUTHORS
-
 This programm has been written by Bruce Evans.
-
diff --git a/devel/cpuflags/files/cpuflags.1 b/devel/cpuflags/files/cpuflags.1
index ba089686e23..1052653390b 100644
--- a/devel/cpuflags/files/cpuflags.1
+++ b/devel/cpuflags/files/cpuflags.1
@@ -1,8 +1,7 @@
-.\"	$NetBSD: cpuflags.1,v 1.3 2001/06/29 11:24:51 abs Exp $
-
+.\"	$NetBSD: cpuflags.1,v 1.4 2001/12/03 19:03:21 wiz Exp $
 .Dd May 31, 2001
 .Dt CPUFLAGS 1
-.Os 
+.Os
 .Sh NAME
 .Nm cpuflags
 .Nd determine compiler flags to best target current cpu
@@ -15,7 +14,6 @@ compiler options to best target code for that cpu. If no options exist
 to target the current cpu then nothing is output.
 .Pp
 In the event of the cpu not being recognised, a warning is sent to stderr.
-.Pp
 .Sh ENVIRONMENT
 The makefile fragment
 .Pa /usr/pkg/share/mk/cpuflags.mk
@@ -41,8 +39,9 @@ for inclusion by /etc/mk.conf
 .Sh EXAMPLES
 .Nm
 can be used to set default flags for building entries from pkgsrc
-and recompiling the NetBSD kernel or userland by adding the
-following to /etc/mk.conf.
+and recompiling the
+.Nx
+kernel or userland by adding the following to /etc/mk.conf.
 .Bd -literal -offset indent
  .sinclude "/usr/pkg/share/mk/cpuflags.mk"
 .Ed
diff --git a/emulators/xbeeb/files/xbeeb.1 b/emulators/xbeeb/files/xbeeb.1
index b38fd4317a6..c48f94faae9 100644
--- a/emulators/xbeeb/files/xbeeb.1
+++ b/emulators/xbeeb/files/xbeeb.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: xbeeb.1,v 1.1 2001/01/29 11:34:26 wiz Exp $
+.\" $NetBSD: xbeeb.1,v 1.2 2001/12/03 19:03:21 wiz Exp $
 .\"
 .Dd May 27, 2000
 .Dt XBEEB 1
@@ -18,7 +18,7 @@
 .Op Fl m Ar mode
 .Op Fl d Ar dir
 .Op Ar file
-.Sh DESCRIPTION   
+.Sh DESCRIPTION
 The
 .Nm
 program is an X11 based emulator of the Acorn BBC
@@ -28,7 +28,7 @@ of Cambridge.
 .Pp
 The BBC Micro was based on the 6502 processor with a 16k
 operating system ROM, upto 32k RAM and 15 paged 16k ROMs for
-utilities.       
+utilities.
 .Ss Options
 The options are as follows:
 .Bl -tag -width Ds
@@ -37,7 +37,7 @@ Display usage information.
 .It Fl a
 Emulate the Model A only - if available.
 .It Fl d Ar dir
-Use 
+Use
 .Ar dir
 as the directory for disk emulation.
 .It Fl h
@@ -81,7 +81,7 @@ Load the snapshot
 as the start point of the emulator.
 .El
 .Ss Implementation
-All of the instruction set of a standard 6502 CPU, 
+All of the instruction set of a standard 6502 CPU,
 Illegal or undocumented opcodes on the NMOS 6502
 and changes for the CMOS R65C02 and R65C12 are implemented.
 .Pp
@@ -126,7 +126,7 @@ machine state.
 The emulated disk system requires a directory containing a
 set of files present on a given disk, exactly as they
 would appear on a BBC disk. In addition there is a file
-called 
+called
 .Qq __CATALOG__
 which contains the name, load and
 execution address, length and sector number for each file
@@ -134,8 +134,7 @@ as it would be displayed by *INFO
 .Pp
 The sectory number is unused in this emulation - it's
 there for the sake of completeness and maybe used in the
-future. 
-
+future.
 .Sh FILES
 .Bl -tag -width @PREFIX@/@XBEEBROOT@/roms/xdfs0.70.rom -compact
 .It Pa @PREFIX@/@XBEEBROOT@/roms/OS1.2.rom
@@ -145,6 +144,12 @@ the BBC Basic rom image
 .It Pa @PREFIX@/@XBEEBROOT@/roms/xdfs0.70.rom
 the XDFS rom image required for disc emulation
 .El
+.Sh SEE ALSO
+The best site for information about BBC Micro is
+.Pa http://www.nvg.ntnu.no/bbc
+.Sh AUTHORS
+This program was written by James Fidell. This man page was
+put together by Nick Hudson (nick@nthcliff.demon.co.uk)
 .Sh BUGS
 The following are known bugs:
 .Bl -bullet
@@ -191,7 +196,7 @@ honest.
 .It
 Handling of hardware-scrolled screens isn't perfect.  In
 the efs-demo and xdfs-demo directories there's a program
-called B.DEMO that will usually demonstrate the problem.  
+called B.DEMO that will usually demonstrate the problem.
 .It
 Changing the Horizontal Sync. register in the
 CRTC isn't implemented but is required for some games.
@@ -202,9 +207,3 @@ working at once stage, but I've broken it again.
 The screen window overlaps the window with the LED
 status in sometimes.
 .El
-.Sh WEB Resources
-The best site for information about BBC Micro is
-.B http://www.nvg.ntnu.no/bbc
-.Sh AUTHORS
-This program was written by James Fidell. This man page was
-put together by Nick Hudson (nick@nthcliff.demon.co.uk)
diff --git a/net/6to4/files/6to4.8 b/net/6to4/files/6to4.8
index 2671fb12128..b6d6517e2a4 100644
--- a/net/6to4/files/6to4.8
+++ b/net/6to4/files/6to4.8
@@ -1,6 +1,6 @@
-.\"     $NetBSD: 6to4.8,v 1.4 2001/11/22 03:00:07 hubertf Exp $
+.\"     $NetBSD: 6to4.8,v 1.5 2001/12/03 19:03:21 wiz Exp $
 .Dd February 18, 2001
-.Dt 6to4 8
+.Dt 6TO4 8
 .Os
 .Sh NAME
 .Nm 6to4
@@ -38,7 +38,7 @@ Do not. Only print the commands that would be run, but do not execute
 them.
 .It Fl v
 Verbose operation. Print the commands that are about to be run, before
-running them. Displays some additional information.  
+running them. Displays some additional information.
 .It Fl h
 Show usage.
 .El
@@ -69,20 +69,21 @@ sysctl needs to be set to
 You can arrange that by setting
 .Dq ip6mode=autohost
 in
-.Pa /etc/rc.conf . 
+.Pa /etc/rc.conf .
 .It Sy rtadvd-stop
 Stops router advertizement and IPv6 packet forwarding.
 .Xr rtadvd 8
 is stopped, and the
 .Xr rtadvd.conf 5
 config file is removed from
-.Pa /var/run .  
+.Pa /var/run .
 .El
 .Sh REQUIREMENTS
 Besides IPv4 connectivity, you need support for IPv6 and the
 .Xr stf 4
-device in your kernel. While the GENERIC NetBSD 1.5 kernel does
-support IPv6, it does not contain support for the
+device in your kernel. While the GENERIC
+.Nx
+1.5 kernel does support IPv6, it does not contain support for the
 .Xr stf 4
 device.
 .Pp
@@ -93,8 +94,9 @@ options         INET6           # IPV6
 pseudo-device	stf	1	# 6to4 IPv6 over IPv4 encapsulation
 .Ed
 .Pp
-In systems that run past-1.5 NetBSD-current, you will have to
-explicitly create an
+In systems that run past-1.5
+.Nx Ns -current ,
+you will have to explicitly create an
 .Xr stf 4
 device after compiling it in the kernel. You do this by running
 the following command before calling the
@@ -114,15 +116,15 @@ command!
 .Sh CONFIGURATION
 The
 .Nm
-script reads it's configuration from a config file named
-.Pa 6to4.conf. 
+script reads its configuration from a config file named
+.Pa 6to4.conf .
 The
 .Pa 6to4.conf
 file is in
 .Xr perl 1
 syntax, and contains several
 variables that can be tuned to adjust your setup. Default values
-should work for use on a modem dialup. 
+should work for use on a modem dialup.
 .Bl -tag -width rtadvd-stop
 .It Sy out_if
 The outbound interface that has a valid IPv4 address
@@ -132,34 +134,34 @@ addresses from. Usually
 for a modem setup, or your ethernet interface if you have
 IPv4 connectivity via LAN. This
 can't be empty, and is assigned the IPv6 address
-2002:x:x:v6_net:hostbits6, see below. 
+2002:x:x:v6_net:hostbits6, see below.
 .It Sy in_if
 The inside interface. If non-empty, this interface is
 assigned the IPv6 address
 2002:x:x:v6_innernet:hostbits6, see below.
 This is only useful on machines that
 have more than one network interfaces, e.g. with a modem and a
-local ethernet. 
+local ethernet.
 .It Sy v6_net
 The subnet address you want to use on the address of
 your outbound interface. Defaults to
-.Dq 1 . 
+.Dq 1 .
 .It Sy v6_innernet
 The subnet address you want to use on the address of
 your inbound interface. Defaults to
-.Dq 2 . 
+.Dq 2 .
 .It Sy hostbits6
 The lower 64 bits of both the inbound and outbound interface's
-addresses.  
+addresses.
 .It Sy peer
 Name of the remote 6to4 server that'll take our
 IPv6-in-IPv4 encapsulated packets and route them on
-via IPv6. A special value of 
+via IPv6. A special value of
 .Dq 6to4-anycast
 can be used for the anycast service defined in RFC 3068.
 Other possible values are given in the example config file.
 .El
-.Sh EXAMPLE USAGE
+.Sh EXAMPLES
 The
 .Nm
 script can be run automatically by
@@ -181,7 +183,8 @@ To shut down properly, put this into
 .Dq 6to4 IPv6 Explained
 at
 .Pa http://www.feyrer.de/NetBSD/6to4.html ,
-NetBSD IPv6 Documentation at
+.Nx
+IPv6 Documentation at
 .Pa http://www.netbsd.org/Documentation/network/ipv6/ ,
 RFC 3068.
 .Sh HISTORY
@@ -190,6 +193,8 @@ The
 utility and manpage were written by
 Hubert Feyrer <hubert@feyrer.de>.
 .Sh BUGS
-On systems running past-1.5 NetBSD-current, the
+On systems running past-1.5
+.Nx Ns -current ,
+the
 .Dq ifconfig stf0 create
 should be run automatically.
diff --git a/net/netcat/files/nc.1 b/net/netcat/files/nc.1
index 5cc1b759cff..bc27e2e9616 100644
--- a/net/netcat/files/nc.1
+++ b/net/netcat/files/nc.1
@@ -1,3 +1,4 @@
+.\" $NetBSD: nc.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
 .Dd October 1, 1999
 .Dt NC 1
 .Sh NAME
@@ -24,7 +25,7 @@
 .Op Fl o Ar file
 .Ar [hostname] [port]
 .\" ae:g:G:hi:lno:p:rs:tuvw:z
-.\"connect to somewhere:   nc [-options] hostname port[s] [ports] ... 
+.\"connect to somewhere:   nc [-options] hostname port[s] [ports] ...
 .\"listen for inbound:     nc -l -p port [-options] [hostname] [port]
 .\"options:
 .\"        -g gateway              source-routing hop point[s], up to 8
@@ -110,9 +111,6 @@ have been closed.  It doesn't do this very well, and relies rather
 heavily on the network layers at both ends for this, and as such, if
 microsoft products are used, it might not notice a close because microsoft
 sucks.
-.Sh BUGS
-I don't know...I didn't write the damn thing.  But there are probably
-a bunch.  Go blame microsoft.
 .Sh SEE ALSO
 .Xr cat 1
 .Sh HISTORY
@@ -125,3 +123,6 @@ standard Unix utility.  IMHO,
 .Nm
 could take its place right next to cat,
 cp, rm, mv, dd, ls, and all those other cryptic and Unix-like things.
+.Sh BUGS
+I don't know...I didn't write the damn thing.  But there are probably
+a bunch.  Go blame microsoft.
diff --git a/pkgtools/cdpack/files/cdpack.1 b/pkgtools/cdpack/files/cdpack.1
index 1859327dfd6..e5c9717b9df 100644
--- a/pkgtools/cdpack/files/cdpack.1
+++ b/pkgtools/cdpack/files/cdpack.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cdpack.1,v 1.5 2001/06/24 21:46:34 dmcmahill Exp $
+.\" $NetBSD: cdpack.1,v 1.6 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Dan McMahill, All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .Dd April 25, 2001
 .Dt CDPACK 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm cdpack
 .Nd produce multi-CD binary package images
@@ -59,9 +59,9 @@ used to determine which packages are placed on which CD.  The
 directory
 .Ar cd_image_directory
 is used as a staging area and the final ISO 9660 images are left in
-that directory.  A file, 
+that directory.  A file,
 .Ar .index ,
-which lists the contents of each CD will be left in the root 
+which lists the contents of each CD will be left in the root
 directory of each CD image.
 .Bl -tag -width "-x directory "
 .It Fl l Ar logfile
@@ -70,10 +70,10 @@ Log the output of mkisofs -v -v to the file
 .It Fl n
 Do not duplicate packages in order to prevent inter-CD dependencies.
 The default without the
-.Fl n 
+.Fl n
 option will place a package and all of its dependencies on the same
 CD.  If a particular package is also required by pacakges on other
-CD's, it will be placed there as well.  
+CD's, it will be placed there as well.
 When the
 .Fl n
 option is used packages are not duplicated.  This results in slightly
@@ -102,13 +102,22 @@ to be present on each CD in the set.
 Includes the contents of
 .Ar directory
 on the last CD in the set.  This is useful for adding
-a pkgsrc.tar.gz tarball, i.e. a file which does not 
+a pkgsrc.tar.gz tarball, i.e. a file which does not
 need to be on each CD.
 .El
 .Pp
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
+.Sh ENVIRONMENT
+.Nm
+uses the fillowing environment variables if set.
+.Bl -tag -width "TMPDIR"
+.It Ev TMPDIR
+Directory for holding temporary files during the image creation.
+Defaults to
+.Dq Li /tmp .
+.El
 .Sh EXAMPLES
 This example takes all of the binary packages found in
 /usr/pkgsrc/packages/All and creates cd images in
@@ -118,19 +127,10 @@ This example takes all of the binary packages found in
 .Pp
 To include a common set of files on all CD's, place them in a
 directory, /tmp/foo, in this example, and pass in the directory name
-with the 
+with the
 .Fl x
 option.
 .Dl cdpack -x /tmp/foo /usr/pkgsrc/packages/All /u2/cdimages
-.Sh ENVIRONMENT
-.Nm
-uses the fillowing environment variables if set.
-.Bl -tag -width "TMPDIR"
-.It Ev TMPDIR
-Directory for holding temporary files during the image creation.
-Defaults to
-.Dq Li /tmp .
-.El
 .Sh SEE ALSO
 .Xr mkisofs 1
 .Sh HISTORY
@@ -139,7 +139,7 @@ The
 utility first appeared in the
 .Nx
 packages collection in April, 2001.
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility was written by Dan McMahill (dmcmahill@netbsd.org).  The
diff --git a/pkgtools/digest/files/digest.1 b/pkgtools/digest/files/digest.1
index aebc56c4767..fe2d3a20485 100644
--- a/pkgtools/digest/files/digest.1
+++ b/pkgtools/digest/files/digest.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: digest.1,v 1.2 2001/03/12 09:08:40 agc Exp $
+.\" $NetBSD: digest.1,v 1.3 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\"
 .\" Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -33,14 +33,14 @@
 .\"
 .Dd February 28, 2001
 .Dt DIGEST 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm digest
-.Nd calculate message digests 
+.Nd calculate message digests
 .Sh SYNOPSIS
-.Nm ""
+.Nm
 .Ar algorithm
-.Op file...
+.Op file ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -94,7 +94,8 @@ The
 .Nm
 utility first appeared in
 .Nx 1.6 .
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
-utility was written by Alistair G. Crooks (agc@netbsd.org).
+utility was written by
+.An Alistair G. Crooks Aq agc@netbsd.org .
diff --git a/pkgtools/pkgchk/files/pkgchk.8 b/pkgtools/pkgchk/files/pkgchk.8
index 84a6301f7c8..2ce1c2311ac 100644
--- a/pkgtools/pkgchk/files/pkgchk.8
+++ b/pkgtools/pkgchk/files/pkgchk.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgchk.8,v 1.8 2001/11/21 23:01:56 abs Exp $
+.\"	$NetBSD: pkgchk.8,v 1.9 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -85,7 +85,6 @@ will be left with missing packaged.
 Verbose - list the tags set when checking pkgchk.conf, and all packages checked.
 .El
 .Sh FILE FORMAT
-.Pp
 Each non comment line in pkgsrc.conf should contain a package
 directory (such as sysutils/skill) followed by an optional list of
 tags. Tags are checked against the current machine's set:
@@ -118,7 +117,7 @@ match the current machine.
 .Pp
 The default set of tags used to determine which packages to match in
 pkgsrc.conf are equivalent to the output of the following with any spaces
-converted to hypens (-): hostname -s, hostname, uname -srm, uname -sr, uname -sm, uname -s, uname -r, uname -m. If 
+converted to hypens (-): hostname -s, hostname, uname -srm, uname -sr, uname -sm, uname -s, uname -r, uname -m. If
 .Pa /usr/X11R6/lib/libX11.so
 or
 .Pa /usr/X11R6/lib/libX11.a
@@ -144,7 +143,7 @@ Defaults to
 Location of binary packages. If not set in environment then read from
 .Pa /etc/mk.conf .
 Defaults to
-.Pa ${PKGSRCDIR}/packages.
+.Pa ${PKGSRCDIR}/packages .
 .Pp
 Unless in a completely homogeneous environment (every machine running
 exactly the same OS version and architecture) setting
@@ -154,14 +153,14 @@ in
 to a value such as
 .Bd -literal
 ${PKGSRCDIR}/packages/${LOWER_OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
-
 .Ed
-is strongly recommended. If 
+.Pp
+is strongly recommended. If
 .Em cpuflags
 (devel/cpuflags) is being used to optimally target individual CPU types,
 then
 .Ev ${CPU_DIR}
-should be appended to 
+should be appended to
 .Ev ${PACKAGES} .
 .It Ev PKGCHK_CONF
 Pathname to pkg_chk configuration file. If not set in environment
@@ -189,9 +188,9 @@ www/communicator                x11+sparc x11+sparc64
 www/navigator                	x11+i386
 x11/xlockmore                   x11 -wopr
 .Ed
-.Sh AUTHOR
+.Sh AUTHORS
 David Brownlee <abs@netbsd.org>, plus much from Stoned Elipot.
-.Sh CAVEATS
+.Sh BUGS
 Updating packages on which other packages depend can currently only be done
 via source (not binary packages).
 .Pp
@@ -206,7 +205,7 @@ depends on
 .Nm
 will correctly skip the update of
 .Em a .
-However, if 
+However, if
 .Em a
 depends on
 .Em b
diff --git a/pkgtools/pkgdiff/files/mkpatches.1 b/pkgtools/pkgdiff/files/mkpatches.1
index 24f87af8b2a..4e75f2ca82b 100644
--- a/pkgtools/pkgdiff/files/mkpatches.1
+++ b/pkgtools/pkgdiff/files/mkpatches.1
@@ -1,10 +1,10 @@
-.\"	$NetBSD: mkpatches.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\"	$NetBSD: mkpatches.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd June 25, 2000
-.Dt mkpatches
+.Dt MKPATCHES 1
 .Os
 .Sh NAME
 .Nm mkpatches
@@ -16,21 +16,27 @@
 .Nm
 is a perl script that simplifies creating patches from a changed work
 tree if for each changed file the original was kept with an added
-extension '.orig'.
-
+extension
+.Dq .orig .
+.Pp
 .Nm
 must be called from the package's main directory, that is
-$PKGSRC/category/program. It then proceeds to find all files that
-match the pattern '*.orig'. Each of these is then compared to the
-changed file of the same name (with no '.orig' extension) using
+.Pa ${PKGSRC}/category/program .
+It then proceeds to find all files that
+match the pattern
+.Dq *.orig .
+Each of these is then compared to the
+changed file of the same name (with no
+.Dq .orig
+extension) using
 .Xr pkgdiff 1 .
-
-The resulting patches are saved in the directory $WRKDIR/.newpatches
+.Pp
+The resulting patches are saved in the directory
+.Pa ${WRKDIR}/.newpatches
 or the directory specified after
 .Fl d ,
 and can be easily compared to the currently existing set using
 .Xr patchdiff 1 .
-.Pp
 .Sh SEE ALSO
 .Xr patchdiff 1 ,
 .Xr pkgdiff 1
diff --git a/pkgtools/pkgdiff/files/patchdiff.1 b/pkgtools/pkgdiff/files/patchdiff.1
index c12db91e81d..9ccb3c557e3 100644
--- a/pkgtools/pkgdiff/files/patchdiff.1
+++ b/pkgtools/pkgdiff/files/patchdiff.1
@@ -1,10 +1,10 @@
-.\"	$NetBSD: patchdiff.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\"	$NetBSD: patchdiff.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd June 25, 2000
-.Dt patchdiff
+.Dt PATCHDIFF 1
 .Os
 .Sh NAME
 .Nm patchdiff
@@ -17,18 +17,19 @@
 is a perl script that simplifies comparing a set of previously
 existing patches with a new one created with
 .Xr mkpatches 1 .
-
+.Pp
 .Nm
 must be called from the package's main directory, that is
-$PKGSRC/category/program. For each patch existing in either the
-patches or the $WRKDIR/.newpatches directory (the second of which can
-be overridden by the argument of the
+.Pa ${PKGSRC}/category/program .
+For each patch existing in either the
+patches or the
+.Pa ${WRKDIR}/.newpatches
+directory (the second of which can be overridden by the argument of the
 .Fl d
 option), a matching patch is
 looked for in the other directory, and, if one is found, the two are
 compared with
 .Xr diff 1 .
-.Pp
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr patchdiff 1 ,
diff --git a/pkgtools/pkgdiff/files/pkgdiff.1 b/pkgtools/pkgdiff/files/pkgdiff.1
index 8af3a92f480..f4435816a5f 100644
--- a/pkgtools/pkgdiff/files/pkgdiff.1
+++ b/pkgtools/pkgdiff/files/pkgdiff.1
@@ -1,32 +1,37 @@
-.\"	$NetBSD: pkgdiff.1,v 1.2 2001/06/13 17:50:31 zuntum Exp $
+.\"	$NetBSD: pkgdiff.1,v 1.3 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd May 14, 2000
-.Dt pkgdiff
+.Dt PKGDIFF 1
 .Os
 .Sh NAME
 .Nm pkgdiff
 .Nd diff files in a way appropriate for pkgsrc
 .Sh SYNOPSIS
 .Nm
-.Op Ar diff(1) options
+.Op Ar options
 .Ar oldfile
 .Ar newfile
 .Sh DESCRIPTION
-The 
+The
 .Nm
-utility runs 
+utility runs
 .Xr diff 1
 on the named files, and generates output on stdout that is appropriate
-to be put as patch file into pkgsrc. An empty NetBSD RCS ID is output
+to be put as patch file into pkgsrc.  An empty
+.Nx
+RCS ID is output
 first, and some effort is made to ensure that the generated patch does
 not include any RCS IDs.
 .Pp
+.Ar options
+can be any options that are allowed for
+.Xr diff 1 .
 .Sh SEE ALSO
-.Xr pkgvi 1 ,
 .Xr cvs 1 ,
 .Xr diff 1 ,
 .Xr mkpatches 1 ,
-.Xr patch 1
+.Xr patch 1 ,
+.Xr pkgvi 1
diff --git a/pkgtools/pkgdiff/files/pkgvi.1 b/pkgtools/pkgdiff/files/pkgvi.1
index dc12730507d..82b9d47ae32 100644
--- a/pkgtools/pkgdiff/files/pkgvi.1
+++ b/pkgtools/pkgdiff/files/pkgvi.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgvi.1,v 1.4 2001/10/31 07:58:20 zuntum Exp $
+.\"	$NetBSD: pkgvi.1,v 1.5 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Tomasz Luchowski. All rights reserved.
 .\"
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by Tomasz Luchowski 
+.\"	This product includes software developed by Tomasz Luchowski
 .\"	for the NetBSD Project
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
@@ -29,9 +29,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
-.Dd Jan 17, 2001
-.Dt pkgvi 1
+.Dd January 17, 2001
+.Dt PKGVI 1
 .Os
 .Sh NAME
 .Nm pkgvi
@@ -41,7 +40,7 @@
 .Ar file
 .Sh DESCRIPTION
 The
-.Nm 
+.Nm
 utility runs the user's favourite editor
 on a copy of specified file.
 If no changes are made in the editor, nothing happens.
@@ -49,22 +48,22 @@ Else the original file is kept as
 .Pa filename.orig ,
 and the modified file
 is saved as
-.Pa filename.
-If 
+.Pa filename .
+If
 .Nm
 finds
 .Pa filename.orig ,
-it behaves as normal editor and changes are only made to 
+it behaves as normal editor and changes are only made to
 .Pa filename ,
 not affecting
 .Pa filename.orig .
 .Sh ENVIRONMENT
 .Nm
 uses $PKGEDITOR if defined, then it looks for $EDITOR,
-if neither is defined, it uses 
+if neither is defined, it uses
 .Xr vi 1 .
-.Pp
 .Sh SEE ALSO
-.Xr pkgdiff 1 ,
-.Sh AUTHOR
-The pkgvi utility was written by Tomasz Luchowski <zuntum@netbsd.org>.
+.Xr pkgdiff 1
+.Sh AUTHORS
+The pkgvi utility was written by
+.An Tomasz Luchowski Aq zuntum@netbsd.org .
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index cbd239aa483..3bc906f7775 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lintpkgsrc.1,v 1.19 2001/07/07 18:21:29 dmcmahill Exp $
+.\"	$NetBSD: lintpkgsrc.1,v 1.20 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -7,7 +7,7 @@
 .Dt LINTPKGSRC 1
 .Sh NAME
 .Nm lintpkgsrc
-.Nd a verifier for the pkgsrc tree
+.Nd verifier for the pkgsrc tree
 .Sh SYNOPSIS
 .Nm
 .Op Fl BDLORSVdhilmopru
@@ -23,21 +23,26 @@ tries to verify the entire contents of the pkgsrc tree.
 uses simple regular-expression matching for verifying
 files that make up a pkgsrc directory.
 Note that it does NOT implement complete Makefile parser.
-.Pp
-.Sy Options
+.Ss Options
 .Bl -tag -width xxxxxxxxxxxx
 .It Fl B
 List packages marked as BROKEN.
 .It Fl D Ar paths
-Parse Makefiles and output contents (Useful for debugging).
+Parse Makefiles and output contents (useful for debugging).
 .It Fl K Ar PACKAGES
 Override binary packages base directory, normally set from
 .Pa /etc/mk.conf
-or defaulted to PKGSRCDIR/packages.
+or defaulted to
+.Pa ${PKGSRCDIR}/packages .
 .Pp
 Note: lintpkgsrc treats
 .Em PACKAGES
-slightly differently to the pkgsrc build system. -p, -R and -V check for
+slightly differently to the pkgsrc build system.
+.Fl p ,
+.Fl R
+and
+.Fl V
+check for
 binary packages in any depth of PACKAGES subdirs - this allows packages for all
 architectures/OS versions to be checked simultaneously with an
 .Pa /etc/mk.conf
@@ -49,12 +54,14 @@ PACKAGES=${PKGSRCDIR}/packages
 PACKAGES=${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH}
 \&.endif
 .Pp
-Which would be an alternative to -K.
+Which would be an alternative to
+.Fl K .
 .Ed
 .It Fl L
 List the filenames of Makefiles as they are parsed (for debugging).
 .It Fl M Ar DISTDIR
-Set directory for distfiles, defaults to PKGSRCDIR/distfiles.
+Set directory for distfiles, defaults to
+.Pa ${PKGSRCDIR}/distfiles .
 .It Fl O
 Report any binary packages in any subdirs of
 .Em PACKAGES ,
@@ -82,7 +89,7 @@ lists.
 List any prebuilt packages in any subdirs of
 .Em PACKAGES
 with known vulnerabilities, based on the data in
-PKGSRCDIR/distfiles/vulnerabilities .
+.Pa ${PKGSRCDIR}/distfiles/vulnerabilities .
 .It Fl d
 Extract the
 .Ql DEPENDS
@@ -91,21 +98,22 @@ verify the version specified in each DEPEND correctly matches a current
 pkgsrc package.
 .It Fl g Ar pkgsrcmap
 Generate pkgsrcmap file containing an entry for each package of
-.Ql pkgname pkgdir pkgver
-.
+.Ql pkgname pkgdir pkgver .
 .It Fl h
 Basic help and usage.
 .It Fl i
 Check the version of each installed package against the current version in
 pkgsrc.
 .It Fl l
-Run pkglint on every package in pkgsrc.
+Run
+.Xr pkglint 1
+on every package in pkgsrc.
 .It Fl m
 For each current distfile, verify its checksum against the appropriate
 package's distinfo file. Also report if any package's distinfo file references
 the same distfile with a different distinfo checksum.
 .It Fl o
-Report any old distfile (not referenced by any package's distinfo file).
+Report any old distfiles (not referenced by any package's distinfo file).
 .It Fl p
 Report any old binary packages in any subdirs of
 .Em PACKAGES .
@@ -113,9 +121,14 @@ Report any old binary packages in any subdirs of
 Remove distfiles which are not referenced from any package's distinfo file,
 or have an incorrect checksum (usually due to an interrupted download),
 and any old binary packages. To remove any given type, additionally
-specify the -o, -m, or -p flags respectively.
+specify the
+.Fl o ,
+.Fl m ,
+or
+.Fl p
+flags respectively.
 .It Fl u
-As 
+As
 .Fl i
 plus for mismatched packages, display REQUIRED details and run
 .Ql make fetch-list | sh
@@ -124,9 +137,9 @@ the latest version are present.
 .Pp
 Warning: The behaviour of this command may change in a later version.
 .El
-.Sh AUTHOR
-David Brownlee <abs@netbsd.org>
-.Sh CAVEATS
+.Sh AUTHORS
+.An David Brownlee Aq abs@netbsd.org
+.Sh BUGS
 The
 .Fl R ,
 .Fl V ,
@@ -136,16 +149,16 @@ options default to using
 .Em PACKAGES
 as the base directory from which to
 search for binary packages. If this includes OS or architecture information
-then packages for other OS/architecture combinations will be missed. 
+then packages for other OS/architecture combinations will be missed.
 In this case
 .Em PACKAGES
-can be overridden with 
+can be overridden with
 .Fl K
 or set conditionally in
 .Pa /etc/mk.conf
 based on the value of
 .Em LINTPKGSRC .
-.Sh BUGS
+.Pp
 The
 .Ql Makefile parsing
 algorithm used to obtain package versions
diff --git a/pkgtools/port2pkg/files/port2pkg.1 b/pkgtools/port2pkg/files/port2pkg.1
index 5daed21749a..18864cb8941 100644
--- a/pkgtools/port2pkg/files/port2pkg.1
+++ b/pkgtools/port2pkg/files/port2pkg.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: port2pkg.1,v 1.1.1.1 1999/07/27 11:33:06 sakamoto Exp $
+.\"	$NetBSD: port2pkg.1,v 1.2 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 1999 by Kazuki Sakamoto (sakamoto@netbsd.org)
 .\" Absolutely no warranty.
@@ -7,7 +7,7 @@
 .Dt PORT2PKG 1
 .Sh NAME
 .Nm port2pkg
-.Nd convert FreeBSD ports to NetBSD pkgsrc
+.Nd convert a FreeBSD port to a NetBSD package
 .Sh SYNOPSIS
 .Nm
 .Op Fl m Ar maintainer
@@ -15,38 +15,41 @@
 .Ar pkgsrcdir
 .Sh DESCRIPTION
 .Nm
-tries convet FreeBSD ports to NetBSD pkgsrc.
+tries to convert a
+.Fx
+port to a
+.Nx
+package.
 .Nm
 copies files
 from
 .Ar portsdir
 to
 .Ar pkgsrcdir
-(if noexists, mkdir
-.Ar pkgsrcdir),
-and tries adapting Makefile, patches and some files
-to NetBSD in
-.Ar pkgsrcdir .
-.Pp
-.Sy Options
+(if
+.Ar pkgsrcdir
+doesn't exists, it is created first),
+and tries adapting the Makefile, patches and some other files
+to
+.Nx
+pkgsrc.
+.Ss Options
 .Bl -tag -width Fl
 .It Fl m
-Adjust maintainer this package
+Adjust maintainer of this package
 (default: packages@netbsd.org).
 .El
 .Sh EXAMPLES
-.Pp
 .Dl port2pkg /mnt/ports/<category>/foo /usr/pkgsrc/<category>/foo
 or
 .Dl port2pkg -m your@email /mnt/ports/<category>/foo /usr/pkgsrc/<category>/foo
-.Pp
 .Sh SEE ALSO
 Read
 .Ar Package Constructor's Guide
 in
-.Ar pkgsrc/Packages.txt .
+.Pa pkgsrc/Packages.txt .
+.Sh AUTHORS
+.An Kazuki Sakamoto Aq sakamoto@netbsd.org
 .Sh BUGS
 .Nm
 is not a magic wand, please double-check converted pkgsrc.
-.Sh AUTHOR
-Kazuki Sakamoto <sakamoto@netbsd.org>
diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.8 b/pkgtools/rpm2pkg/files/rpm2pkg.8
index d5d2277e758..26b3362138f 100644
--- a/pkgtools/rpm2pkg/files/rpm2pkg.8
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rpm2pkg.8,v 1.4 2001/03/20 20:18:07 manu Exp $
+.\"	$NetBSD: rpm2pkg.8,v 1.5 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -51,15 +51,17 @@
 .Sh DESCRIPTION
 .Nm
 helps in building BSD packages from RPM files by unpacking each specified
-.Ar rpm_file, 
-and by building a 
+.Ar rpm_file ,
+and by building a
 .Ar package_list
 according to what was extracted. The
 .Ar package_list
-has the format expected by the NetBSD package system.
-.Pp 
-.Nm 
-also provides a mechanism that helps in selecting what is actually 
+has the format expected by the
+.Nx
+package system.
+.Pp
+.Nm
+also provides a mechanism that helps in selecting what is actually
 extracted from the RPM files. It is therefore possible to reject files
 that are of no interest when building a BSD package. This is especially
 useful for files that are to be extracted in
@@ -70,10 +72,12 @@ or
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar directory
-Change working directory to 
+Change working directory to
 .Ar directory .
 .It Fl f Ar package_list
-Produce a NetBSD package list 
+Produce a
+.Nx
+package list
 .Ar package_list
 from what was actually extracted from the RPM files archives.
 .It Fl i Ar ignored_dir
@@ -81,11 +85,11 @@ Do not extract files contained in the
 .Ar ignored_dir
 directory of the RPM file's archives.
 .It Fl p Ar prefix
-Use 
-.Ar prefix 
+Use
+.Ar prefix
 when extracting files.
 .It Fl s Ar strip_path_count
-Strip 
+Strip
 .Ar strip_path_count
 leading directories in file names.
 .El
@@ -97,26 +101,26 @@ leading directories in file names.
 .Fl i Ar tmp
 .Fl i Ar var
 .Fl i Ar usr/tmp
-.Ar /usr/pkgsrc/distfiles/more_linux_lib/foo.rpm 
+.Ar /usr/pkgsrc/distfiles/more_linux_lib/foo.rpm
 .Ar /usr/pkgsrc/distfiles/more_linux_lib/bar.rpm
 .Pp
-This will extract 
-.Pa foo.rpm 
+This will extract
+.Pa foo.rpm
 and
 .Pa bar.rpm
-into 
+into
 .Pa /usr/pkg/emul/linux .
-A packing list called 
+A packing list called
 .Pa PLIST_DYNAMIC
-will be created, with pathnames relative to 
+will be created, with pathnames relative to
 .Pa /usr/pkg ,
-because this is the directory into which we asked 
+because this is the directory into which we asked
 .Nm
 to change with the
 .Fl d
 option.
 .Pp
-.Nm 
+.Nm
 will not extract files contained in the
 .Pa tmp ,
 .Pa var ,
@@ -129,9 +133,9 @@ directories of the RPM file's archives.
 .Fl d Ar /usr/pkg
 .Ar /usr/pkgsrc/distfiles/pack/bar.rpm
 .Pp
-This will extract the 
+This will extract the
 .Ar bar.rpm
-file in 
+file in
 .Pa /usr/pkg
 while striping the leading directory of files path in
 .Ar bar.rpm .
@@ -140,18 +144,18 @@ This is useful for dealing with RPM archives that contains files like
 which you would like to go in
 .Pa /usr/pkg/bin .
 .Sh COMPATIBILITY
-.Nm 
+.Nm
 should work with any regular RPM file.
-.Sh AUTHOR(S)
-.An Matthias Scheler Aq tron@netbsd.org
-.br
-This man page was written by 
-.An Emmanuel Dreyfus Aq manu@netbsd.org
 .Sh SEE ALSO
+.Xr cpio 1 ,
 .Xr rpm 8 ,
-.Xr rpm2cpio 8 ,
-.Xr cpio 1
+.Xr rpm2cpio 8
 .br
-.Em Dq Documentation on the NetBSD Package System , 
+.Em Dq Documentation on the NetBSD Package System ,
 .An Hubert Feyrer Aq hubert.feyrer@informatik.fh-regensburg.de ,
 .An Alistair Crooks Aq agc@pkgsrc.org
+.Sh AUTHORS
+.An Matthias Scheler Aq tron@netbsd.org
+.br
+This man page was written by
+.An Emmanuel Dreyfus Aq manu@netbsd.org
diff --git a/pkgtools/url2pkg/files/url2pkg.8 b/pkgtools/url2pkg/files/url2pkg.8
index 34fe8aca8fc..a2bd46ca10b 100644
--- a/pkgtools/url2pkg/files/url2pkg.8
+++ b/pkgtools/url2pkg/files/url2pkg.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: url2pkg.8,v 1.2 2001/04/09 14:51:47 hubertf Exp $
+.\"	$NetBSD: url2pkg.8,v 1.3 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -45,16 +45,16 @@
 .Op Ar URL
 .Sh DESCRIPTION
 .Nm
-takes the 
-.Ar URL 
+takes the
+.Ar URL
 to a package's distfile that should be
 turned into a package. The
-generated package includes a 
-.Pa Makefile 
+generated package includes a
+.Pa Makefile
 and a basic set of files to get the
 package going. Any customisations to get the package going need to be
-adjusted manually after 
-.Nm 
+adjusted manually after
+.Nm
 has finished it's job.
 .Pp
 .Nm
@@ -64,36 +64,30 @@ intended to fly on autopilot, though.
 The
 .Pa Makefile
 contains all the requiered variable, such as DISTNAME or MASTER_SITES, but some of them cannot be automatically set. Hence, the user's usual editor is invoked to edit the
-.Pa Makefile.
+.Pa Makefile .
 .Pp
 After the
-.Pa Makefile 
-is completed, 
-.Nm 
+.Pa Makefile
+is completed,
+.Nm
 fetches the archive, and computes its checksum via the
 .Ic make makesum
-target. Then archive extraction is done, via the 
+target. Then archive extraction is done, via the
 .Ic make extract
-target, and finally, 
+target, and finally,
 .Nm
 attempts to detect if
-the software uses a 
-.Ic configure 
-script, and if it's from GNU 
-.Ic autoconf.
+the software uses a
+.Ic configure
+script, and if it's from GNU
+.Ic autoconf .
 .Pp
 If the user does not supply the
 .Ar URL
-on the command line, then 
+on the command line, then
 .Nm
 will prompt for it.
-.Sh EXAMPLES
-.Nm
-.Ar http://www.foo.com/bar/buz.tgz
-.Pp
-Will generate a template NetBSD package for the software that can be found at
-.Ar http://www.foo.com/bar/buz.tgz
-.Sh ENVIRONMENTAL VARIABLES
+.Sh ENVIRONMENT
 .Bl -tag -width indent
 .It PKGEDITOR, EDITOR
 Editor used for
@@ -101,23 +95,31 @@ Editor used for
 edition.
 .It PKGMAINTAINER, REPLYTO
 Name used for the MAINTAINER field in the package
-.Pa Makefile.
+.Pa Makefile .
 .El
-.Sh BUGS
+.Sh EXAMPLES
 .Nm
-does not generate an empty 
-.Pa patches
-directory
-.Sh AUTHOR(S)
-.Nm 
-was written by
-.An Hubert Feyrer Aq hubertf@netbsd.org
-.br
-This man page was written by 
-.An Emmanuel Dreyfus Aq manu@netbsd.org
+.Ar http://www.foo.com/bar/buz.tgz
+.Pp
+Will generate a template
+.Nx
+package for the software that can be found at
+.Ar http://www.foo.com/bar/buz.tgz
 .Sh SEE ALSO
 .Xr packages 7
 .br
-.Em "Documentation on the NetBSD Package System", 
+.Em "Documentation on the NetBSD Package System" ,
 .An Hubert Feyrer Aq hubertf@netbsd.org
 .An Alistair Crooks Aq agc@pkgsrc.org
+.Sh AUTHORS
+.Nm
+was written by
+.An Hubert Feyrer Aq hubertf@netbsd.org
+.br
+This man page was written by
+.An Emmanuel Dreyfus Aq manu@netbsd.org
+.Sh BUGS
+.Nm
+does not generate an empty
+.Pa patches
+directory
diff --git a/print/papersize/files/getpapersize.1 b/print/papersize/files/getpapersize.1
index 43635245b7f..16b7617cda3 100644
--- a/print/papersize/files/getpapersize.1
+++ b/print/papersize/files/getpapersize.1
@@ -1,12 +1,13 @@
+.\" $NetBSD: getpapersize.1,v 1.2 2001/12/03 19:03:24 wiz Exp $
 .Dd November 9, 1998
 .Dt GETPAPERSIZE 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm getpapersize
 .Nd Show the default paper size for various packages
 .Sh SYNOPSIS
 .Nm
-.Op Package...
+.Op package ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -17,7 +18,7 @@ If no package argument is given, all packages are assumed.
 The
 .Xr setpapersize 1
 utility can be used to set the default paper size for the packages.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/print/papersize/files/setpapersize.1 b/print/papersize/files/setpapersize.1
index b56acc41f9f..b04961593d6 100644
--- a/print/papersize/files/setpapersize.1
+++ b/print/papersize/files/setpapersize.1
@@ -1,13 +1,14 @@
+.\" $NetBSD: setpapersize.1,v 1.2 2001/12/03 19:03:24 wiz Exp $
 .Dd November 9, 1998
 .Dt SETPAPERSIZE 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm setpapersize
 .Nd Set the default paper size for various packages
 .Sh SYNOPSIS
 .Nm
 PAPERSIZE
-.Op Package...
+.Op Package ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -21,7 +22,7 @@ argument can be one of A4, Letter, or Letterdj.
 The
 .Xr getpapersize 1
 utility can be used to show the default paper size for the packages.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/print/pcps/files/pcps.1 b/print/pcps/files/pcps.1
index fdbf29889e4..3ea73bc882a 100644
--- a/print/pcps/files/pcps.1
+++ b/print/pcps/files/pcps.1
@@ -1,10 +1,13 @@
-.TH PCPS 1
-.SH NAME
-pcps \- A utility to print text files on a PostScript(tm) printer.
-.SH DESCRIPTION
+.\" $NetBSD: pcps.1,v 1.2 2001/12/03 19:03:24 wiz Exp $
+.Dd December 3, 2001
+.Dt PCPS 1
+.Sh NAME
+.Nm pcps
+.Nd utility to print text files on a PostScript(tm) printer
+.Sh DESCRIPTION
 Many features are included: word wrapping, scaling, rotation,
 2-up and 4-up printing, duplex, banners, etc.  See
-share/doc/pcps/pcps.man (within your package tree) for
-additonal details, or run the program
+@PREFIX@/share/doc/pcps/pcps.man for
+additional details, or run the program
 without arguments.  This is shareware and requires payment.  See
-share/doc/pcps/license.doc for details.
+@PREFIX@/share/doc/pcps/license.doc for details.
diff --git a/sysutils/lambd/files/lambd.8 b/sysutils/lambd/files/lambd.8
index 5cb211ebf11..a5d8176ba9d 100644
--- a/sysutils/lambd/files/lambd.8
+++ b/sysutils/lambd/files/lambd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lambd.8,v 1.4 2001/07/19 20:23:43 itojun Exp $
+.\"	$NetBSD: lambd.8,v 1.5 2001/12/03 19:03:24 wiz Exp $
 .\"
 .\" Copyright (C) 2001 WIDE Project.  All rights reserved.
 .\"
@@ -33,7 +33,7 @@
 .Nm lambd
 .Nd shutdown switch monitoring daemon for Wildlab LAMB
 .Sh SYNOPSIS
-.Nm ""
+.Nm
 .Op Fl Ldfn
 .Op Fl M Ar str
 .Op Ar usec
diff --git a/textproc/xalan-c/files/testXSLT.1 b/textproc/xalan-c/files/testXSLT.1
index ba5a315ca3f..a8b60fcbe0b 100644
--- a/textproc/xalan-c/files/testXSLT.1
+++ b/textproc/xalan-c/files/testXSLT.1
@@ -1,6 +1,7 @@
-.Dd November 23rd, 2000
+.\" $NetBSD: testXSLT.1,v 1.2 2001/12/03 19:03:24 wiz Exp $
+.Dd November 23, 2000
 .Dt TESTXSLT 1
-.Os "Xalan XSL engine"
+.Os
 .Sh NAME
 .Nm testXSLT
 .Nd Command line tool for XSL transformations
@@ -13,8 +14,11 @@
 .Op Fl dom
 .Op Fl xml | Fl text | Fl html
 .Sh DESCRIPTION
-.Nm 
-is the command line tool for the Xalan XSLT engine. It is used to make a transformaion described in an XSL stylesheet on an XML file. The output file can be either plain text, HTML, or it can be just another XML file. 
+.Nm
+is the command line tool for the Xalan XSLT engine.
+It is used to make a transformation described in an XSL stylesheet on an
+XML file.  The output file can be either plain text, HTML, or it can be
+just another XML file.
 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl in Ar xml_file
@@ -26,28 +30,28 @@ Uses
 .Ar xsl_stylesheet
 as the URL for the XSL stylesheet.
 .It Fl out Ar output_file
-write output to 
+write output to
 .Ar output_file .
 .It Fl escape Ar chars
 esape characters
 .Ar chars ,
 the default is <>&"'\en\er.
 .It Fl eer
-Expands entity references. Default is to not expand.
+Expands entity references.  Default is to not expand.
 .It Fl v
 Show version info.
 .It Fl qc
 Quiet Pattern Conflicts Warnings
 .It Fl q
 Quiet mode.
-.It Fl indent Ar space_number 
+.It Fl indent Ar space_number
 Uses
 .Ar space_number
-as the number of spaces to indent each level in output tree. Default is 0. 
+as the number of spaces to indent each level in output tree.  Default is 0.
 .It Fl validate
-Validate XML and XSL input. Default is to not validate.
+Validate XML and XSL input.  Default is to not validate.
 .It Fl tt
-Traces the templates as they are being called.  
+Traces the templates as they are being called.
 .It Fl tg
 Traces each result tree generation event.
 .It Fl ts
@@ -61,15 +65,15 @@ Uses plain text formatter.
 .It Fl html
 Uses HTML formatter
 .It Fl nh
-Suppress XML headers. Require 
+Suppress XML headers.  Require
 .Fl xml .
 .It Fl stripcdata
-Strip CDATA sections of their brackets, but do not escape. Require
+Strip CDATA sections of their brackets, but do not escape.  Require
 .Fl xml
 or
 .Fl html .
 .It Fl escapedata
-Strip CDATA sections of their brackets, and escape. Require
+Strip CDATA sections of their brackets, and escape.  Require
 .Fl xml
 or
 .Fl html .
@@ -78,31 +82,24 @@ Test for well-formed output --format to DOM then to XML for output.
 .It Fl param Ar name Ar expr
 Sets the stylesheet parameter
 .Ar param
-to 
+to
 .Ar expr .
 .El
 .Sh EXAMPLES
 .Bd -litteral -offset indent
 .Nm
 -in input.xml -xsl stylesheet.xsl -out output.html -html
-.Ed 
+.Ed
 .Pp
-Format 
-.Ar input.xml 
-to 
+Format
+.Ar input.xml
+to
 .Ar output.html
 using the stylesheet file
 .Ar stylesheet.xsl ,
-and uing the HTML formatter.
-.Sh DIAGNOSTICS 
-Various diagnostic messages.
-.Sh BUGS
-None known yet.
-.Sh AUTHOR(S)
-.An The Apache Xalan-C project Aq http://xml.apache.org 
+and using the HTML formatter.
+.Sh AUTHORS
+.An The Apache Xalan-C project Aq http://xml.apache.org
 .br
 This man page by
-.An Emmanuel Dreyfus Aq p99dreyf@criens.u-psud.fr
-.Pp
-.Sh SEE ALSO 
-Nothing yet!
+.An Emmanuel Dreyfus Aq p99dreyf@criens.u-psud.fr .