Prepare for mdoc(7)NG.

9 files changed, 19 insertions, 25 deletions

diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 3741299..a3653f4 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -43,11 +43,11 @@
 .Sh SYNOPSIS
 .Nm ar
 .Fl d
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive file ...
 .Nm ar
 .Fl m
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive file ...
 .Nm ar
 .Fl m
@@ -55,7 +55,7 @@
 .Ar position archive file ...
 .Nm ar
 .Fl p
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive [file ...]
 .Nm ar
 .Fl q
@@ -71,7 +71,7 @@
 .Ar position archive file ...
 .Nm ar
 .Fl t
-.Op Fl \Tv
+.Op Fl \&Tv
 .Ar archive [file ...]
 .Nm ar
 .Fl x
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 0ab1fd0..37d7fac 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -44,7 +44,7 @@
 .Op Fl A Ar num
 .Op Fl B Ar num
 .Op Fl f Ar calendarfile
-.Oo Fl t Ar dd
+.Oo Fl t Ar dd Ns
 .Sm off
 .Op . Ar mm Op . Ar year
 .Sm on
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 32f1621..06169e1 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -44,14 +44,7 @@
 .Nd display file checksums and block counts
 .Sh SYNOPSIS
 .Nm
-.Oo 
-.Fl o Ar \&1 Xo
-.No \&|
-.Ar \&2
-.No \&|
-.Ar \&3
-.Xc
-.Oc
+.Op Fl o Ar 1 | 2 | 3
 .Op Ar
 .Nm sum
 .Op Ar
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index cdd6f0b..f28b9a0 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -48,6 +48,7 @@
 .Op Cm \&.
 .Op Cm Bb
 .Oc
+.Sm on
 .Ar file
 .Sh DESCRIPTION
 .Nm Od
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index 1509f9f..aa675f8 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -140,6 +140,7 @@ Text Segment
 Undefined
 .It ?
 None of the above
+.El
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr a.out 5 ,
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index 498382f..6858e7f 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -41,11 +41,9 @@
 .Sh SYNOPSIS
 .Nm
 .Oo
-.Fl Op csCS
-.Op Ar x
-.Op kKgGw
-.Op Ar N
-tTeEnyjhHmz
+.Fl Oo Cm csCS Oc Ns Op Ar x
+.Oo Cm kKgGw Oc Ns Op Ar N
+.Cm tTeEnyjhHmz
 .Oc
 .Op Ar rows Op Ar cols
 .Sh DESCRIPTION
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 41e0a43..b6e6b79 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1287,10 +1287,12 @@ has ever been enabled, then
 is sent as
 .Ic abort  ,
 and
-.Ic eof and
+.Ic eof
+and
 .Ic suspend
 are sent as
-.Ic eof and
+.Ic eof
+and
 .Ic susp
 (see
 .Ic send
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 3b993ec..b7f4cdb 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -46,11 +46,12 @@
 .Nm
 .Op Fl 0
 .Op Fl t
-.Oo Op Fl x
+.Oo
 .Fl n Ar number
+.Op Fl x
 .Oc
 .Op Fl s Ar size
-.Op Ar utility Op Ar arguments ...
+.Op Ar utility Op Ar argument ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 73f3c5c..58ac68d 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -41,9 +41,7 @@
 .Op Fl d Ar domain
 .Oo
 .Op Fl t
-.Fl m Op Ar mname
-|
-.Ar host
+.Fl m Oo Ar mname Oc | Ar host
 .Oc
 .Nm
 .Fl x