Eliminate mdocNG warnings caused by misplaced or extraneous macro calls.

svn path=/head/; revision=73233

bin/ed/ed.1

@@ -378,7 +378,7 @@ Define a subexpression
 .Em re .
 Subexpressions may be nested.
 A subsequent backreference of the form
-.Em Pf \e n ,
+.Pf \e Em n ,
 where
 .Em n
 is a number in the range [1,9], expands to the text matched by the

bin/stty/stty.1

@@ -514,7 +514,7 @@ If set, enables
 .Cm brkint , ixon , imaxbel , opost ,
 .Cm isig , iexten ,
 and
-.Cm Fl icanon .
+.Fl icanon .
 If unset, same as
 .Cm sane .
 .It Cm new

lib/libc/net/nsdispatch.3

@@ -154,7 +154,7 @@ exists which contains a single default entry for
 for use by callers which don't require complicated default rules.
 .Ed
 .Pp
-.Va Sq ...\&
+.Sq Va ...
 are optional extra arguments, which
 are passed to the appropriate callback function as a variable argument
 list of the type

sbin/adjkerntz/adjkerntz.8

@@ -67,7 +67,7 @@ To handle these different situations,
 .Nm
 is invoked in two ways:
 .Bl -tag -width 4n
-.It Cm Fl i
+.It Fl i
 This form handles system startups and shutdowns.
 .Nm Adjkerntz
 is invoked with this option from
@@ -101,7 +101,7 @@ to ensure that it reflects the current local time zone.
 Then
 .Nm
 exits.
-.It Cm Fl a Op Fl s
+.It Fl a Op Fl s
 This form is used to update the local time CMOS clock and kernel
 .Pa machdep.adjkerntz
 variable when time zone changes occur,

sbin/fdisk/fdisk.8

@@ -279,30 +279,30 @@ a specification, and whitespace (except for newlines) are ignored:
 .Bl -tag -width Ds
 .It Xo
 .Ic #
-.No Ar comment ...
+.Ar comment ...
 .Xc
 Lines beginning with a "#" are comments and are ignored.
 .It Xo
 .Ic g
-.No Ar spec1
+.Ar spec1
-.No Ar spec2
+.Ar spec2
-.No Ar spec3
+.Ar spec3
 .Xc
 Set the BIOS geometry used in partition calculations.  There must be
 three values specified, with a letter preceding each number:
 .Bl -tag -width Ds
 .Sm off
-.It Cm c No Ar num
+.It Cm c Ar num
 .Sm on
 Set the number of cylinders to
 .Ar num .
 .Sm off
-.It Cm h No Ar num
+.It Cm h Ar num
 .Sm on
 Set the number of heads to
 .Ar num .
 .Sm off
-.It Cm s No Ar num
+.It Cm s Ar num
 .Sm on
 Set the number of sectors/track to
 .Ar num .
@@ -337,10 +337,10 @@ g       s63     h39     c1019
 .Ed
 .It Xo
 .Ic p
-.No Ar partition
+.Ar partition
-.No Ar type
+.Ar type
-.No Ar start
+.Ar start
-.No Ar length
+.Ar length
 .Xc
 Set the partition given by
 .Ar partition
@@ -396,7 +396,7 @@ p       1       165     1       2503871
 .Pp
 .It Xo
 .Ic a
-.No Ar partition
+.Ar partition
 .Xc
 Make
 .Ar partition

sbin/fdisk_pc98/fdisk.8

@@ -307,30 +307,30 @@ a specification, and whitespace (except for newlines) are ignored:
 .Bl -tag -width Ds
 .It Xo
 .Ic #
-.No Ar comment ...
+.Ar comment ...
 .Xc
 Lines beginning with a "#" are comments and are ignored.
 .It Xo
 .Ic g
-.No Ar spec1
+.Ar spec1
-.No Ar spec2
+.Ar spec2
-.No Ar spec3
+.Ar spec3
 .Xc
 Set the BIOS geometry used in partition calculations.  There must be
 three values specified, with a letter preceding each number:
 .Bl -tag -width Ds
 .Sm off
-.It Cm c No Ar num
+.It Cm c Ar num
 .Sm on
 Set the number of cylinders to
 .Ar num .
 .Sm off
-.It Cm h No Ar num
+.It Cm h Ar num
 .Sm on
 Set the number of heads to
 .Ar num .
 .Sm off
-.It Cm s No Ar num
+.It Cm s Ar num
 .Sm on
 Set the number of sectors/track to
 .Ar num .
@@ -365,10 +365,10 @@ g       s63     h39     c1019
 .Ed
 .It Xo
 .Ic p
-.No Ar partition
+.Ar partition
-.No Ar type
+.Ar type
-.No Ar start
+.Ar start
-.No Ar length
+.Ar length
 .Xc
 Set the partition given by
 .Ar partition
@@ -422,7 +422,7 @@ p       1       165     1       2503871
 .Ed
 .It Xo
 .Ic a
-.No Ar partition
+.Ar partition
 .Xc
 Make
 .Ar partition

sbin/i386/fdisk/fdisk.8

@@ -279,30 +279,30 @@ a specification, and whitespace (except for newlines) are ignored:
 .Bl -tag -width Ds
 .It Xo
 .Ic #
-.No Ar comment ...
+.Ar comment ...
 .Xc
 Lines beginning with a "#" are comments and are ignored.
 .It Xo
 .Ic g
-.No Ar spec1
+.Ar spec1
-.No Ar spec2
+.Ar spec2
-.No Ar spec3
+.Ar spec3
 .Xc
 Set the BIOS geometry used in partition calculations.  There must be
 three values specified, with a letter preceding each number:
 .Bl -tag -width Ds
 .Sm off
-.It Cm c No Ar num
+.It Cm c Ar num
 .Sm on
 Set the number of cylinders to
 .Ar num .
 .Sm off
-.It Cm h No Ar num
+.It Cm h Ar num
 .Sm on
 Set the number of heads to
 .Ar num .
 .Sm off
-.It Cm s No Ar num
+.It Cm s Ar num
 .Sm on
 Set the number of sectors/track to
 .Ar num .
@@ -337,10 +337,10 @@ g       s63     h39     c1019
 .Ed
 .It Xo
 .Ic p
-.No Ar partition
+.Ar partition
-.No Ar type
+.Ar type
-.No Ar start
+.Ar start
-.No Ar length
+.Ar length
 .Xc
 Set the partition given by
 .Ar partition
@@ -396,7 +396,7 @@ p       1       165     1       2503871
 .Pp
 .It Xo
 .Ic a
-.No Ar partition
+.Ar partition
 .Xc
 Make
 .Ar partition

sbin/pc98/fdisk/fdisk.8

@@ -307,30 +307,30 @@ a specification, and whitespace (except for newlines) are ignored:
 .Bl -tag -width Ds
 .It Xo
 .Ic #
-.No Ar comment ...
+.Ar comment ...
 .Xc
 Lines beginning with a "#" are comments and are ignored.
 .It Xo
 .Ic g
-.No Ar spec1
+.Ar spec1
-.No Ar spec2
+.Ar spec2
-.No Ar spec3
+.Ar spec3
 .Xc
 Set the BIOS geometry used in partition calculations.  There must be
 three values specified, with a letter preceding each number:
 .Bl -tag -width Ds
 .Sm off
-.It Cm c No Ar num
+.It Cm c Ar num
 .Sm on
 Set the number of cylinders to
 .Ar num .
 .Sm off
-.It Cm h No Ar num
+.It Cm h Ar num
 .Sm on
 Set the number of heads to
 .Ar num .
 .Sm off
-.It Cm s No Ar num
+.It Cm s Ar num
 .Sm on
 Set the number of sectors/track to
 .Ar num .
@@ -365,10 +365,10 @@ g       s63     h39     c1019
 .Ed
 .It Xo
 .Ic p
-.No Ar partition
+.Ar partition
-.No Ar type
+.Ar type
-.No Ar start
+.Ar start
-.No Ar length
+.Ar length
 .Xc
 Set the partition given by
 .Ar partition
@@ -422,7 +422,7 @@ p       1       165     1       2503871
 .Ed
 .It Xo
 .Ic a
-.No Ar partition
+.Ar partition
 .Xc
 Make
 .Ar partition

share/man/man4/da.4

@@ -251,7 +251,7 @@ block mode
 .Tn SCSI
 disk unit
 .Ar u ,
-.No Ar n Ns th
+.Ar n Ns th
 slice, partition
 .Ar p
 .Sm off
@@ -267,7 +267,7 @@ raw mode
 .Tn SCSI
 disk unit
 .Ar u ,
-.No Ar n Ns th
+.Ar n Ns th
 slice, partition
 .Ar p
 .El

share/man/man4/ddb.4

@@ -191,7 +191,7 @@ except that the last start address subtracted by the size displayed by it
 is used as the start address.
 .It Cm print Ns Op Cm /acdoruxz
 Print 
-.No Ar addr Ns s
+.Ar addr Ns s
 according to the modifier character (as described above for
 .Li examine ) .
 Valid formats are:
@@ -218,7 +218,7 @@ ecx = yyyyyy
 .Ed
 .It Xo
 .Cm write Ns Op Cm /bhl
-.No Ar addr Ar expr1 Op Ar "expr2 ..."
+.Ar addr Ar expr1 Op Ar "expr2 ..."
 .Xc
 Write the expressions specified after
 .Ar addr
@@ -239,7 +239,7 @@ things may happen.
 It's best to enclose each expression in parentheses.
 .It Xo
 .Cm set
-.No Li \&$ Ns Ar variable
+.Li \&$ Ns Ar variable
 .Op Li =
 .Ar expr
 .Xc
@@ -326,7 +326,7 @@ modifier is specified, print the call nesting depth and the
 cumulative instruction count at each call or return.  Otherwise,
 only print when the matching return is hit.
 .It Xo
-.No Cm trace Ns Op Cm /u
+.Cm trace Ns Op Cm /u
 .Op Ar frame
 .Op , Ns Ar count
 .Xc
@@ -346,7 +346,7 @@ is omitted, all frames are printed.
 User space stack trace is valid
 only if the machine dependent code supports it.
 .It Xo
-.No Cm search Ns Op Cm /bhl
+.Cm search Ns Op Cm /bhl
 .Ar addr
 .Ar value
 .Op Ar mask
@@ -405,7 +405,7 @@ complete object is printed.
 Displays all watchpoints.
 .It Xo
 .Cm watch
-.No Ar addr Ns Li \&, Ns Ar size
+.Ar addr Ns Li \&, Ns Ar size
 .Xc
 Set a watchpoint for a region.  Execution stops
 when an attempt to modify the region occurs.
@@ -433,7 +433,7 @@ abbreviations.
 .El
 .Sh VARIABLES
 The debugger accesses registers and variables as
-.No Li \&$ Ns Em name .
+.Li \&$ Ns Em name .
 Register names are as in the
 .Dq Cm show registers
 command.

share/man/man4/netgraph.4

@@ -1001,7 +1001,7 @@ This message converts a binary control message to its
 form.
 The entire control message to be converted is contained within the
 arguments field of the
-.Dv Dv NGM_BINARY2ASCII
+.Dv NGM_BINARY2ASCII
 message itself.  If successful, the reply will contain the same control
 message in
 .Tn ASCII

share/man/man4/ng_ksocket.4

@@ -69,12 +69,12 @@ associated socket is closed.
 .Sh HOOKS
 This node type supports a single hook connection at a time.
 The name of the hook must be of the form
-.Dv Em <family>/<type>/<proto> ,
+.Em <family>/<type>/<proto> ,
 where the
-.Dv Em family ,
+.Em family ,
-.Dv Em type ,
+.Em type ,
 and
-.Dv Em proto
+.Em proto
 are the decimal equivalent of the same arguments to
 .Xr socket 2 .
 Alternately, aliases for the commonly used values are accepted as

share/man/man4/pt.4

@@ -79,7 +79,7 @@ driver read and write timeouts.  The value should be in seconds.
 .Bl -tag -width /dev/ptQQQ -compact
 .It Pa /dev/pt Ns Ar N
 the
-.No Ar N Ns th processor device.
+.Ar N Ns th processor device.
 .El
 .Sh SEE ALSO
 .Xr scsi 4

share/man/man4/yp.4

@@ -93,9 +93,9 @@ The canonical copies of all
 .Tn NIS
 information are stored on a single machine
 called the
-.Em Tn NIS master server .
+.Tn NIS Em master server .
 The databases used to store the information are called
-.Em Tn NIS maps .
+.Tn NIS Em maps .
 In
 .Fx ,
 these maps are stored in

share/man/man5/rc.conf.5

@@ -1113,7 +1113,7 @@ and
 daemons.  This variable is only applicable if 
 .So 
 .No atm_arpserver_ Ns Va <netif> 
-.No Ns = Ns Qq local
+.No = Ns Qq local
 .Sc 
 is defined.
 .It Ar atm_pvcs

share/man/man8/yp.8

@@ -93,9 +93,9 @@ The canonical copies of all
 .Tn NIS
 information are stored on a single machine
 called the
-.Em Tn NIS master server .
+.Tn NIS Em master server .
 The databases used to store the information are called
-.Em Tn NIS maps .
+.Tn NIS Em maps .
 In
 .Fx ,
 these maps are stored in

sys/boot/common/loader.8

@@ -346,7 +346,7 @@ by the kernel during the boot phase.
 .It Va bootfile
 List of semicolon-separated search path for bootable kernels.
 The default is
-.Li Dq kernel;kernel.old .
+.Dq Li kernel;kernel.old .
 .It Va console
 Defines the current console.
 .It Va currdev
@@ -356,10 +356,10 @@ Syntax for devices is odd.
 Sets the list of binaries which the kernel will try to run as initial
 process.
 The default is
-.Li Dq /sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall .
+.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall .
 .It Va interpret
 Has the value 
-.Li Dq ok
+.Dq Li ok
 if the Forth's current state is interpreting.
 .It Va LINES
 Define the number of lines on the screen, to be used by the pager.
@@ -367,7 +367,7 @@ Define the number of lines on the screen, to be used by the pager.
 Sets the list of directories which will be searched in for modules
 named in a load command or implicitly required by a dependancy.
 The default value for this variable is
-.Li Dq /;/boot;/modules .
+.Dq Li /;/boot;/modules .
 .It Va num_ide_disks
 Sets the number of IDE disks as a work around for some problems in
 finding the root disk at boot.
@@ -378,7 +378,7 @@ Value of
 .Nm Ns 's
 prompt.
 Defaults to
-.Li Dq "${currdev}>" .
+.Dq Li "${currdev}>" .
 .It Va root_disk_unit
 If the code which detects the disk unit number for the root disk is
 confused, eg. by a mix of SCSI and IDE disks, or IDE disks with
@@ -498,9 +498,9 @@ be passed, even if the builtin accepts no arguments.
 .Pp
 While this behavior has benefits, it has its trade-offs.
 If the execution token of a builtin is acquired (through
-.Ic No '
+.Ic '
 or
-.Ic No ['] ) ,
+.Ic ['] ) ,
 and then passed to
 .Ic catch
 or
@@ -782,7 +782,7 @@ bye, forget, see, words,
 \&[else]
 .Ef
 .Em and
-.Li No [then]
+.Li [then]
 .Bf Em
 from the Programming-Tools extension word set, Providing the
 Search-Order extensions word set.

usr.bin/colldef/colldef.1

@@ -69,11 +69,11 @@ usable by system commands and routines.
 .Pp
 Options list:
 .Bl -tag -width 4n
-.It Cm Fl I Ar map_dir
+.It Fl I Ar map_dir
 This option set directory name where
 .Ar charmap
 files can be found, current directory by default.
-.It Cm Fl o Ar out_file
+.It Fl o Ar out_file
 This option set output file name,
 .Ar LC_COLLATE
 by default.

usr.bin/mail/mail.1

@@ -319,7 +319,7 @@ the current message, the search proceeds backwards, and if there are no
 good messages at all,
 .Nm
 types
-.Dq Li No applicable messages
+.Dq Li \&No applicable messages
 and
 aborts the command.
 .Bl -tag -width delete

usr.sbin/inetd/inetd.8

@@ -163,7 +163,7 @@ server program arguments
 .Ed
 .Pp
 To specify an
-.No Tn "ONC RPC" Ns -based
+.Tn "ONC RPC" Ns -based
 service, the entry would contain these fields:
 .Pp
 .Bd -unfilled -offset indent -compact
@@ -209,7 +209,7 @@ should
 be the official name of the service (that is, the first entry in
 .Pa /etc/services ) .
 When used to specify an
-.No Tn "ONC RPC" Ns -based
+.Tn "ONC RPC" Ns -based
 service, this field is a valid RPC service name in
 the file
 .Pa /etc/rpc . 

usr.sbin/pkg_install/add/pkg_add.1

@@ -274,9 +274,9 @@ The
 .Ar PRE-INSTALL
 keyword will not appear if separate scripts for pre-install and post-install
 are given during package creation time (using the
-.Cm Fl i
+.Fl i
 and 
-.Cm Fl I
+.Fl I
 flags to 
 .Xr pkg_create 1 ) .
 .It
@@ -331,9 +331,9 @@ The
 .Ar POST-INSTALL
 keyword will not appear if separate scripts for pre-install and post-install
 are given during package creation time (using the
-.Cm Fl i
+.Fl i
 and 
-.Cm Fl I
+.Fl I
 flags to 
 .Xr pkg_create 1 ) .
 .Pp

usr.sbin/pkg_install/create/pkg_create.1

@@ -122,7 +122,7 @@ first argument.
 .Pp
 .Sy Note :
 if the
-.Cm Fl I
+.Fl I
 option is not given, this script will serve as both the pre-install and the
 post-install script for the package, differentiating between the
 functionality by passing the keywords
@@ -163,7 +163,7 @@ name as the first argument.
 .Pp
 .Sy Note :
 if the
-.Cm Fl K
+.Fl K
 option is not given, this script will serve as both the de-install and the
 post-deinstall script for the package, differentiating between the
 functionality by passing the keywords

usr.sbin/pkg_install/delete/pkg_delete.1

@@ -184,9 +184,9 @@ The
 .Ar DEINSTALL
 keyword will not appear if separate scripts for deinstall and post-deinstall
 are given during package creation time (using the
-.Cm Fl k
+.Fl k
 and 
-.Cm Fl K
+.Fl K
 flags to 
 .Xr pkg_create 1 ) .
 .Pp
@@ -218,9 +218,9 @@ The
 .Ar POST-DEINSTALL
 keyword will not appear if separate scripts for deinstall and post-deinstall
 are given during package creation time (using the
-.Cm Fl k
+.Fl k
 and 
-.Cm Fl K
+.Fl K
 flags to 
 .Xr pkg_create 1 ) .
 .Pp

usr.sbin/ppp/ppp.8

@@ -3868,7 +3868,7 @@ Received identification packets are logged to the LCP log (see
 .Ic set log
 for details) and are never responded to.
 .It set Ns Xo
-.No Op up
+.Op up
 .Ar var value
 .Xc
 This option allows the setting of any of the following variables:

usr.sbin/ppp/ppp.8.m4

@@ -3868,7 +3868,7 @@ Received identification packets are logged to the LCP log (see
 .Ic set log
 for details) and are never responded to.
 .It set Ns Xo
-.No Op up
+.Op up
 .Ar var value
 .Xc
 This option allows the setting of any of the following variables:

usr.sbin/sicontrol/sicontrol.8

@@ -9,7 +9,7 @@
 .Sh SYNOPSIS
 .Nm
 device
-.Ar command Op Cm Ar param ...
+.Ar command Op Ar param ...
 .Sh DESCRIPTION
 .Nm Sicontrol
 is used to configure and monitor the SI/XIO device driver.

usr.sbin/vidcontrol/vidcontrol.1

@@ -204,7 +204,7 @@ If the required size of font has not been loaded to the kernel,
 will fail if the user attempts to set a new video mode.
 .Pp
 .Bl -column "25 line modes" "8x16 (VGA), 8x14 (EGA)" -compact
-.Li Sy Modes Ta Sy Font size
+.Sy Modes Ta Sy Font size
 .Li 25 line modes Ta 8x16 (VGA), 8x14 (EGA)
 .Li 30 line modes Ta 8x16
 .Li 43 line modes Ta 8x8

usr.sbin/vnconfig/vnconfig.8

@@ -189,17 +189,17 @@ option:
 Swapping is enabled on the special file.
 See
 .Xr swapon 2 .
-.It Dv Pf mountro= Pa mount_point
+.It Dv mountro Ns = Ns Pa mount_point
 The special file is mounted read-only on
 .Ar mount_point .
 See
 .Xr mount 2 .
-.It Dv Pf mountrw= Pa mount_point
+.It Dv mountrw Ns = Ns Pa mount_point
 The special file is mounted read-write on
 .Ar mount_point .
 See
 .Xr mount 2 .
-.It Dv Pf mount= Pa mount_point
+.It Dv mount Ns = Ns Pa mount_point
 Same as ``mountrw=''.
 .El
 .Pp