15 files changed, 86 insertions, 86 deletions

diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 93c14b5cb8ed..3bfcbc54ebdf 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -269,7 +269,7 @@ Marks a process that is idle (sleeping for longer than about 20 seconds).
 Marks a process which is in
 .Xr jail 2 .
 The hostname of the prison can be found in
-.Ql Li /proc/<pid>/status .
+.Ql /proc/<pid>/status .
 .It L
 Marks a process that is waiting to acquire a lock.
 .It R
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 67866f6e15cc..6a9be42f94fb 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -80,19 +80,19 @@ not the file or directory to which it points.
 .\".Sh CAVEAT
 .\"The system can deadlock if a loop in the file system graph is present.
 .\"This loop takes the form of an entry in directory
-.\".Ql Pa a ,
+.\".Pa a ,
 .\"say
-.\".Ql Pa a/foo ,
+.\".Pa a/foo ,
 .\"being a hard link to directory
-.\".Ql Pa b ,
+.\".Pa b ,
 .\"and an entry in
 .\"directory
-.\".Ql Pa b ,
+.\".Pa b ,
 .\"say
-.\".Ql Pa b/bar ,
+.\".Pa b/bar ,
 .\"being a hard link
 .\"to directory
-.\".Ql Pa a .
+.\".Pa a .
 .\"When such a loop exists and two separate processes attempt to
 .\"perform
 .\".Ql rename a/foo b/bar
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index bd16017ba3dc..0d65b0315fdf 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -58,7 +58,7 @@ is the special device file in
 .Pa /dev
 to open for the terminal (for example, ``ttyh0'').
 If there is no argument or the argument is
-.Ql Fl ,
+.Sq Fl ,
 the tty line is assumed to be open as file descriptor 0.
 .Pp
 The
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index 39a7444ec0cc..8a240e9fc6c9 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -148,7 +148,7 @@ type facilities and propagate
 interrupt signals to the remote programs.  The login process
 propagates the client terminal's baud rate and terminal type,
 as found in the environment variable,
-.Ql Ev TERM ;
+.Ev TERM ;
 see
 .Xr environ 7 .
 The screen or window size of the terminal is requested from the client,
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index b13d7898215c..b1b61750b152 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -158,7 +158,7 @@ like
 (a floppy disk drive),
 an ordinary file,
 or
-.Ql Fl
+.Sq Fl
 (the standard output).
 Multiple file names may be given as a single argument separated by commas.
 Each file will be used for one dump volume in the order listed;
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 56d675606a9b..24bac13ce80f 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -299,7 +299,7 @@ like
 (a disk drive),
 an ordinary file,
 or
-.Ql Fl
+.Sq Fl
 (the standard input).
 If the name of the file is of the form
 .Dq host:file ,
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 2d6aa00f8d37..9786f259d9d2 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -124,7 +124,7 @@ Any other arguments comprise the warning message that is broadcast
 to users currently logged into the system.
 .It Fl
 If
-.Ql Fl
+.Sq Fl
 is supplied as an option, the warning message is read from the standard
 input.
 .El
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index d0ba8b54a950..cabd3d024574 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -113,7 +113,7 @@ If not specified, the
 default of 9600 is used.
 .It Fl u Ar unit-command
 When the line is switched to slip discipline, run
-.Ql Nm "sh -c" Ar unit-command old new
+.Dq Nm "sh -c" Ar unit-command old new
 where
 .Ar old
 and
@@ -125,18 +125,18 @@ using more than one slip line.
 When
 .Nm
 is connected for the first time,
-.Ql Nm "sh -c" Ar unit-command \-1 new
+.Dq Nm "sh -c" Ar unit-command \-1 new
 is run.
 When
 .Nm
 is disconnected,
-.Ql Nm "sh -c" Ar unit-command old \-1
+.Dq Nm "sh -c" Ar unit-command old \-1
 is run.
 The
 .Nm
 utility will abort if the unit number
 changes and
-.Ql Fl u Ar \%unit-command
+.Dq Fl u Ar \%unit-command
 was not specified.
 .It Fl z
 Force redial
diff --git a/share/man/man4/man4.i386/rdp.4 b/share/man/man4/man4.i386/rdp.4
index a613c1600eca..37ceb5d87df8 100644
--- a/share/man/man4/man4.i386/rdp.4
+++ b/share/man/man4/man4.i386/rdp.4
@@ -73,7 +73,7 @@ KB/s.  As always, your mileage may vary.
 In case the adapter isn't recognized at boot-time, setting the
 .Em bootverbose
 flag
-.Pq Ql Fl v
+.Pq Sq Fl v
 might help in diagnosing the reason.  Since the RTL 8002 requires
 the availability of a working interrupt for the printer adapter (unlike
 the
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index 20a2e22232a2..6a06eb6fd1be 100644
--- a/share/man/man8/adding_user.8
+++ b/share/man/man8/adding_user.8
@@ -44,7 +44,7 @@ A new user must choose a login name, which must not already appear in
 or
 .Pa /etc/mail/aliases .
 It must also not begin with the hyphen
-.Ql Fl
+.Sq Fl
 character.
 It is strongly recommended that it be all lower-case, and not contain
 the dot
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 2dfd0d81a43c..c8b21eb2cd02 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -85,7 +85,7 @@ tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
 .Xr ul 1
 .Sh BUGS
 Should fold underlines onto blanks even with the
-.Ql Fl
+.Sq Fl
 option so that
 a true underline character would show.
 .Pp
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index ba0cc03ebc10..6c33367b85ab 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -68,7 +68,7 @@ All times are converted to a 12 hour clock, and assumed to
 be in the next 12 hours.
 .It Cm \&+
 If the time is preceded by
-.Ql Cm \&+ ,
+.Sq Cm \&+ ,
 the alarm will go off in hours and minutes
 from the current time.
 .El
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index fd01d2390d79..54defed37dac 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -62,16 +62,16 @@ Its input is a list of specifications
 describing dependency relationships between the generation of
 files and programs.
 The first of
-.Ql Pa BSDmakefile ,
-.Ql Pa makefile
+.Pa BSDmakefile ,
+.Pa makefile
 and
-.Ql Pa Makefile
+.Pa Makefile
 that can be found in either the current directory or a special object directory
 (see
-.Ql Va .OBJDIR )
+.Va .OBJDIR )
 will be read for this list of specifications.
 If the file
-.Ql Pa .depend
+.Pa .depend
 can be found, it is also read (see
 .Xr mkdep 1 ) .
 .Pp
@@ -145,13 +145,13 @@ Specify that environment values override macro assignments within
 makefiles for all variables.
 .It Fl f Ar makefile
 Specify a makefile to read instead of the default
-.Ql Pa makefile
+.Pa makefile
 and
-.Ql Pa Makefile .
+.Pa Makefile .
 If
 .Ar makefile
 is
-.Ql \- ,
+.Sq Fl ,
 standard input is read.
 Multiple makefiles may be specified, and are read in the order specified.
 .It Fl I Ar directory
@@ -162,7 +162,7 @@ option) is automatically included as part of this list.
 .It Fl i
 Ignore non-zero exit of shell commands in the makefile.
 Equivalent to specifying
-.Ql \-
+.Sq Ic \-
 before each command line in the makefile.
 .It Fl j Ar max_jobs
 Specify the maximum number of jobs that
@@ -208,7 +208,7 @@ option during recursive builds.
 .It Fl s
 Do not echo any commands as they are executed.
 Equivalent to specifying
-.Ql Ic @
+.Sq Ic @
 before each command line in the makefile.
 .It Fl t
 Rather than re-building a target as specified in the makefile, create it
@@ -311,19 +311,19 @@ Each of the commands in this script
 be preceded by a tab.
 While any target may appear on a dependency line, only one of these
 dependencies may be followed by a creation script, unless the
-.Ql Ic ::
+.Sq Ic ::
 operator is used.
 .Pp
 If the first or first two characters of the command line are
-.Ql Ic @
+.Sq Ic @
 and/or
-.Ql Ic \- ,
+.Sq Ic \- ,
 the command is treated specially.
 A
-.Ql Ic @
+.Sq Ic @
 causes the command not to be echoed before it is executed.
 A
-.Ql Ic \-
+.Sq Ic \-
 causes any non-zero exit status of the command line to be ignored.
 .Sh VARIABLE ASSIGNMENTS
 Variables in
@@ -390,51 +390,51 @@ The seven local variables are as follows:
 .Bl -tag -width ".ARCHIVE"
 .It Va .ALLSRC
 The list of all sources for this target; also known as
-.Ql Va \&> .
+.Sq Va \&> .
 .It Va .ARCHIVE
 The name of the archive file; also known as
-.Ql Va \&! .
+.Sq Va \&! .
 .It Va .IMPSRC
 The name/path of the source from which the target is to be transformed
 (the
 .Dq implied
 source); also known as
-.Ql Va \&< .
+.Sq Va \&< .
 .It Va .MEMBER
 The name of the archive member; also known as
-.Ql Va \&% .
+.Sq Va \&% .
 .It Va .OODATE
 The list of sources for this target that were deemed out-of-date; also
 known as
-.Ql Va \&? .
+.Sq Va \&? .
 .It Va .PREFIX
 The file prefix of the file, containing only the file portion, no suffix
 or preceding directory components; also known as
-.Ql Va * .
+.Sq Va * .
 .It Va .TARGET
 The name of the target; also known as
-.Ql Va @ .
+.Sq Va @ .
 .El
 .Pp
 The shorter forms
-.Ql Va @ ,
-.Ql Va \&! ,
-.Ql Va \&< ,
-.Ql Va \&% ,
-.Ql Va \&? ,
-.Ql Va \&> ,
+.Sq Va @ ,
+.Sq Va \&! ,
+.Sq Va \&< ,
+.Sq Va \&% ,
+.Sq Va \&? ,
+.Sq Va \&> ,
 and
-.Ql Va *
+.Sq Va *
 are permitted for backward
 compatibility and are not recommended.
 The six variables
-.Ql Va "@F" ,
-.Ql Va "@D" ,
-.Ql Va "<F" ,
-.Ql Va "<D" ,
-.Ql Va "*F" ,
+.Sq Va @F ,
+.Sq Va @D ,
+.Sq Va <F ,
+.Sq Va <D ,
+.Sq Va *F ,
 and
-.Ql Va "*D"
+.Sq Va *D
 are
 permitted for compatibility with
 .At V
@@ -443,11 +443,11 @@ makefiles and are not recommended.
 Four of the local variables may be used in sources on dependency lines
 because they expand to the proper value for each target on the line.
 These variables are
-.Ql Va .TARGET ,
-.Ql Va .PREFIX ,
-.Ql Va .ARCHIVE ,
+.Va .TARGET ,
+.Va .PREFIX ,
+.Va .ARCHIVE ,
 and
-.Ql Va .MEMBER .
+.Va .MEMBER .
 .El
 .Pp
 In addition,
@@ -636,7 +636,7 @@ The standard shell wildcard characters
 .Pf ( Ql * ,
 .Ql \&? ,
 and
-.Ql Op )
+.Ql [] )
 may
 be used.
 The wildcard characters may be escaped with a backslash
@@ -802,45 +802,45 @@ Reverse the sense of the last conditional.
 .Op Ar operator expression ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .if .
+.Ic .if .
 .It Xo
 .Ic .elifdef
 .Oo \&! Oc Ns Ar variable
 .Op Ar operator variable ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifdef .
+.Ic .ifdef .
 .It Xo
 .Ic .elifndef
 .Oo \&! Oc Ns Ar variable
 .Op Ar operator variable ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifndef .
+.Ic .ifndef .
 .It Xo
 .Ic .elifmake
 .Oo \&! Oc Ns Ar target
 .Op Ar operator target ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifmake .
+.Ic .ifmake .
 .It Xo
 .Ic .elifnmake
 .Oo \&! Oc Ns Ar target
 .Op Ar operator target ...
 .Xc
 A combination of
-.Ql Ic .else
+.Ic .else
 followed by
-.Ql Ic .ifnmake .
+.Ic .ifnmake .
 .It Ic .endif
 End the body of the conditional.
 .El
@@ -852,11 +852,11 @@ may be any one of the following:
 .It Cm \&|\&|
 logical
 .Tn OR
-.It Cm \&&&
+.It Cm &&
 Logical
 .Tn AND ;
 of higher precedence than
-.Ql Ic || .
+.Sq Ic || .
 .El
 .Pp
 As in C,
@@ -865,11 +865,11 @@ will only evaluate a conditional as far as is necessary to determine
 its value.
 Parentheses may be used to change the order of evaluation.
 The boolean operator
-.Ql Ic !\&
+.Sq Ic !\&
 may be used to logically negate an entire
 conditional.
 It is of higher precedence than
-.Ql Ic \&&& .
+.Sq Ic && .
 .Pp
 The value of
 .Ar expression
@@ -910,9 +910,9 @@ preceded by 0x, otherwise it is decimal; octal numbers are not supported.
 The standard C relational operators are all supported.
 If after
 variable expansion, either the left or right hand side of a
-.Ql Ic ==
+.Sq Ic ==
 or
-.Ql Ic "!="
+.Sq Ic !=
 operator is not an integral value, then
 string comparison is performed between the expanded
 variables.
@@ -928,17 +928,17 @@ or
 .Dq defined
 expression is applied to it, depending on the form of the conditional.
 If the form is
-.Ql Ic .if ,
-.Ql Ic .ifdef
+.Ic .if ,
+.Ic .ifdef
 or
-.Ql Ic .ifndef ,
+.Ic .ifndef ,
 the
 .Dq defined
 expression is applied.
 Similarly, if the form is
-.Ql Ic .ifmake
+.Ic .ifmake
 or
-.Ql Ic .ifnmake ,
+.Ic .ifnmake ,
 the
 .Dq make
 expression is applied.
@@ -947,9 +947,9 @@ If the conditional evaluates to true the parsing of the makefile continues
 as before.
 If it evaluates to false, the following lines are skipped.
 In both cases this continues until a
-.Ql Ic .else
+.Ic .else
 or
-.Ql Ic .endif
+.Ic .endif
 is found.
 .Pp
 For loops are typically used to apply a set of rules to a list of files.
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index b028c8797bae..f9a1dc376033 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -105,11 +105,11 @@ option.
 .El
 .Pp
 If
-.Ql Fl
+.Sq Fl
 is specified for one or more of the input files, the standard
 input is used; standard input is read one line at a time, circularly,
 for each instance of
-.Ql Fl .
+.Sq Fl .
 .Sh EXAMPLES
 List the files in the current directory in three columns:
 .Pp
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index 31aeca12dbdf..2f858951fbb2 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -59,7 +59,7 @@ do not normally do this; it allows the placement of individual tables
 in separate files to be run as a part of a large document.
 .Pp
 An argument consisting of a single minus
-.Ql Fl
+.Sq Fl
 is taken to be
 a file name corresponding to the standard input.
 .Pp