24 files changed, 49 insertions, 46 deletions
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index c2b5789..791c8ab 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -50,7 +50,7 @@
 .Fl v
 .Oc
 .Ar mode
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 8a99c40..1076a37 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -44,7 +44,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl ABCFGHLPRTWabcdfgiklnoqrstu1
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 For each operand that names a
 .Ar file
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 10b7bb7..052d57b 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -146,7 +146,7 @@
 .Oc
 .Ar ...\&
 .Ek
-.Op Ar file ...\&
+.Op Ar
 .Nm
 .Fl r
 .Fl w
@@ -176,7 +176,7 @@
 .Oc
 .Ar ...\&
 .Ek
-.Op Ar file ...\&
+.Op Ar
 .Ar directory
 .Sh DESCRIPTION
 .Nm Pax
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 4f32bac..a56f6f1 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -46,7 +46,7 @@
 .Nm
 .Op Fl Kprx
 .Op Fl k Ar realm
-.Ar file ...
+.Ar
 .Ar directory
 .Sh DESCRIPTION
 .Nm Rcp
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 42c2860..7d50274 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -45,7 +45,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dfiPRrvW
-.Ar file ...
+.Ar
 .Nm unlink
 .Ar file
 .Sh DESCRIPTION
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 559663d..9c59fd5 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -9,7 +9,7 @@
 .Nm
 .Op Fl pqrtx
 .Op Fl s Ar string
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 .Nm Md5
 takes as input a message of arbitrary length and produces
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index f4cda8d..3d7c3b3 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -64,14 +64,14 @@
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
-.Op file ...
+.Op Ar
 .Nm
 .Fl x
 .Op Fl chkmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
-.Op file ...
+.Op Ar
 .Pp
 .in \" XXX
 (The
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 96db67b..fd11644 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -45,39 +45,39 @@
 .Nm
 .Fl d
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl abiTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Nm
 .Fl q
 .Op Fl cTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl cuTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl abciuTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index c4a3c53..fd11644 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -37,6 +37,7 @@
 .\"
 .Dd June 29, 1993
 .Dt AR 1
+.Os
 .Sh NAME
 .Nm ar
 .Nd create and maintain library archives
@@ -44,39 +45,39 @@
 .Nm
 .Fl d
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl abiTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Nm
 .Fl q
 .Op Fl cTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl cuTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl abciuTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive Op Ar file ...
+.Ar archive Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index 8d16d6e..9cf6ee7 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -9,7 +9,7 @@
 .Nd generate linker set definitions
 .Sh SYNOPSIS
 .Nm
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index bef3302..acfda05 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -42,7 +42,7 @@
 .Nm
 .Op Fl n Ar count
 .Op Fl c Ar bytes
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 This filter displays the first
 .Ar count
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1169f80..b5c5c9d 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -47,7 +47,7 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file ...
+.Ar
 .Nm hd
 .Op Fl bcdovx
 .Op Fl e Ar format_string
@@ -56,7 +56,7 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file  ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 447ef4f..45af885 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -43,12 +43,12 @@
 .Op Fl f Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
-.Ar file ...
+.Ar
 .Nm
 .Op Fl p Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Lam
 copies the named files side by side onto the standard output.
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index ed688b4..e87678e 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -43,7 +43,7 @@
 .Op Fl df
 .Op Fl t Ar termchar
 .Ar string
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The 
 .Nm
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index fad6fa6..02f347d 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -33,7 +33,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl d
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 .Nm Minigzip
 is a minimal implementation of the
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index c26d244..024c685 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -43,7 +43,7 @@
 .Op Fl ap
 .Op Fl f Ar file
 .Op Ar flags
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Mkdep
 takes a set of flags for the C compiler and a list
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index c13fd49..c656630 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -42,7 +42,7 @@
 .Nm
 .Op Fl
 .Ar messagefile
-.Ar prefix file ...
+.Ar prefix Ar
 .Sh DESCRIPTION
 .Nm Mkstr
 creates files containing error messages extracted from C source,
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 5225ccf..fef232b 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -46,7 +46,7 @@
 .Nm
 .Op Fl s
 .Op Fl d Ar list
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index a9902b4..01f36a2 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -94,7 +94,7 @@
 .Op Fl w Ar width
 .Ek
 .Op -
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 177baf5..cac26f8 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl t
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Ranlib
 creates a table of external references for archive libraries,
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index d57cf98..cac26f8 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl t
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Ranlib
 creates a table of external references for archive libraries,
@@ -55,7 +55,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl t
 Set the modification time of the __.SYMDEF file.
-Some loaders (but not the FreeBSD one)
+Some loaders (but not the
+.Fx
+one)
 compared this time with the modification time of the
 archive to verify that the table is up-to-date with respect to the
 archive.
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index d8775c1..68b00bf 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -40,7 +40,7 @@
 .Nd reverse lines of a file
 .Sh SYNOPSIS
 .Nm
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 4edae6a..becc241 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -45,12 +45,12 @@
 .Nm
 .Op Fl Ean
 .Ar command
-.Op Ar file ...
+.Op Ar
 .Nm
 .Op Fl Ean
 .Op Fl e Ar command
 .Op Fl f Ar command_file
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index b0fa668..c1a598e 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -46,7 +46,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Ar owner Ns Op : Ns Ar group
-.Ar file ...
+.Ar
 .Nm
 .Op Fl fhv
 .Oo