26 files changed, 173 insertions, 173 deletions
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index dae97f2339c..cc0dbea7a48 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chio.1,v 1.19 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: chio.1,v 1.20 2003/03/12 20:12:34 deraadt Exp $
 .\"	$NetBSD: chio.1,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@@ -88,7 +88,7 @@ the first robotic arm in the changer, the ET would be
 and the EU would be
 .Dq 0 .
 .Sh SUPPORTED COMMANDS
-.Cm # chio move
+.Li # chio move
 .Aq Ar from ET
 .Aq Ar from EU
 .Aq Ar to ET
@@ -103,7 +103,7 @@ If the optional modifier
 .Pa inv
 is specified, the media unit will be inverted before insertion.
 .Pp
-.Cm # chio exchange
+.Li # chio exchange
 .Aq Ar src ET
 .Aq Ar src EU
 .Aq Ar dst1 ET
@@ -144,7 +144,7 @@ Note that not all medium changers support the
 operation; the changer must have multiple free pickers or emulate
 multiple free pickers with transient storage.
 .Pp
-.Cm # chio position
+.Li # chio position
 .Aq Ar to ET
 .Aq Ar to EU
 .Op Ar inv
@@ -157,22 +157,22 @@ is specified, the media unit will be inverted before insertion.
 .Pp
 Note that not all changers behave as expected when issued this command.
 .Pp
-.Cm # chio params
+.Li # chio params
 .Pp
 Report the number of slots, drives, pickers, and portals in the changer,
 and which picker unit the changer is currently configured to use.
 .Pp
-.Cm # chio getpicker
+.Li # chio getpicker
 .Pp
 Report which picker unit the changer is currently configured to use.
 .Pp
-.Cm # chio setpicker
+.Li # chio setpicker
 .Aq Ar unit
 .Pp
 Configure the changer to use picker
 .Aq Ar unit .
 .Pp
-.Cm # chio status
+.Li # chio status
 .Op Aq Ar type
 .Pp
 Report the status of all elements in the changer.
@@ -197,11 +197,11 @@ Element supports passing media (exporting) to an outside human operator.
 Element supports receiving media (importing) from an outside human operator.
 .El
 .Sh EXAMPLES
-.Cm # chio move slot 3 drive 0
+.Li # chio move slot 3 drive 0
 .Pp
 Moves the media in slot 3 (fourth slot) to drive 0 (first drive).
 .Pp
-.Cm # chio setpicker 2
+.Li # chio setpicker 2
 .Pp
 Configures the changer to use picker 2 (third picker) for operations.
 .Sh FILES
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 44d697271c0..2884dadc8c1 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.1,v 1.23 2002/02/11 18:43:50 mpech Exp $
+.\"	$OpenBSD: chmod.1,v 1.24 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -328,38 +328,38 @@ or
 .Sq t ,
 are ignored.
 .Sh EXAMPLES
-.Cm $ chmod 644 file
+.Li $ chmod 644 file
 .Pp
 Set file readable by anyone and writable by the owner only.
 .Pp
-.Cm $ chmod go-w file
+.Li $ chmod go-w file
 .Pp
 Deny write permission to group and others.
 .Pp
-.Cm $ chmod =rw,+X file
+.Li $ chmod =rw,+X file
 .Pp
 Set the read and write permissions to the usual defaults, but
 retain any execute permissions that are currently set.
 .Pp
-.Cm $ chmod +X file
+.Li $ chmod +X file
 .Pp
 Make a directory or file searchable/executable by everyone if it is
 already searchable/executable by anyone.
 .Pp
-.Cm $ chmod 755 file
+.Li $ chmod 755 file
 .br
-.Cm $ chmod u=rwx,go=rx file
+.Li $ chmod u=rwx,go=rx file
 .br
-.Cm $ chmod u=rwx,go=u-w file
+.Li $ chmod u=rwx,go=u-w file
 .Pp
 Any of these commands will make a file readable/executable by everyone and
 writable by the owner only.
 .Pp
-.Cm $ chmod go= file
+.Li $ chmod go= file
 .Pp
 Clear all mode bits for group and others.
 .Pp
-.Cm $ chmod g=u-w file
+.Li $ chmod g=u-w file
 .Pp
 Set the group bits equal to the user bits, but clear the group write bit.
 .Sh SEE ALSO
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 2dfef10d4e1..25f7123bd0c 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cp.1,v 1.19 2002/02/11 18:43:50 mpech Exp $
+.\"	$OpenBSD: cp.1,v 1.20 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -185,20 +185,20 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
-.Cm $ cp foo bar
+.Li $ cp foo bar
 .Pp
 Make a copy of file
 .Pa foo
 named
 .Pa bar .
 .Pp
-.Cm $ cp *.txt /tmp
+.Li $ cp *.txt /tmp
 .Pp
 Copy a group of files to the
 .Pa /tmp
 directory.
 .Pp
-.Cm $ cp -R junk /tmp
+.Li $ cp -R junk /tmp
 .Pp
 Copy the directory
 .Pa junk
diff --git a/bin/date/date.1 b/bin/date/date.1
index 6788d80ff0e..3ec9307f468 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: date.1,v 1.34 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: date.1,v 1.35 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -156,7 +156,7 @@ Everything but the minute is optional.
 Time changes for Daylight Saving Time, standard time, leap seconds,
 and leap years are handled automatically.
 .Sh EXAMPLES
-.Cm $ date \&"+DATE: %Y-%m-%d%nTIME: %H:%M:%S\&"
+.Li $ date \&"+DATE: %Y-%m-%d%nTIME: %H:%M:%S\&"
 .Pp
 Displays
 .Bd -literal -offset indent
@@ -164,12 +164,12 @@ DATE: 1987-11-21
 TIME: 13:36:16
 .Ed
 .Pp
-.Cm # date 8506131627
+.Li # date 8506131627
 .Pp
 Sets the date to
 .Dq Li "June 13, 1985, 4:27 PM" .
 .Pp
-.Cm # date 1432
+.Li # date 1432
 .Pp
 Sets the time to
 .Li "2:32 PM" ,
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index caa6c4a17b6..f7e466436e5 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dd.1,v 1.12 2002/02/11 18:43:51 mpech Exp $
+.\"	$OpenBSD: dd.1,v 1.13 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: dd.1,v 1.5 1995/03/21 09:04:04 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -342,7 +342,7 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
-.Cm # dd if=floppy28.fs of=/dev/fd0a
+.Li # dd if=floppy28.fs of=/dev/fd0a
 .Pp
 Write an
 .Ox
diff --git a/bin/df/df.1 b/bin/df/df.1
index eb1fbe077e9..3837729e142 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: df.1,v 1.28 2003/03/11 00:50:56 tedu Exp $
+.\"	$OpenBSD: df.1,v 1.29 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -115,7 +115,7 @@ the specified type, a warning is issued and no information is given on
 that file system.
 .El
 .Sh EXAMPLES
-.Cm $ df -kP /usr
+.Li $ df -kP /usr
 .Pp
 Output, in a strict format suitable for portable scripts, disk space
 statistics for the
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index fc6ccbb66e4..a7581c8ba97 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: expr.1,v 1.12 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: expr.1,v 1.13 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: expr.1,v 1.9 1995/04/28 23:27:13 jtc Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
@@ -75,12 +75,12 @@ otherwise, returns 0.
 .Pp
 Parentheses are used for grouping in the usual manner.
 .Sh EXAMPLES
-.Cm $ a=`expr $a + 1`
+.Li $ a=`expr $a + 1`
 .Pp
 Add 1 to the variable
 .Va a .
 .Pp
-.Cm $ expr "//$a" \&: '.*/\e(.*\e)'
+.Li $ expr "//$a" \&: '.*/\e(.*\e)'
 .Pp
 Return the filename portion of a pathname stored
 in variable
@@ -89,7 +89,7 @@ The
 .Ql //
 characters act to eliminate ambiguity with the division operator.
 .Pp
-.Cm $ expr $a \&: '.*'
+.Li $ expr $a \&: '.*'
 .Pp
 Return the number of characters in variable
 .Va a .
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index d3e1936d497..14fabbda348 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kill.1,v 1.21 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: kill.1,v 1.22 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -142,12 +142,12 @@ See
 .Xr csh 1
 for details.
 .Sh EXAMPLES
-.Cm $ kill -9 1234
+.Li $ kill -9 1234
 .Pp
 Forcibly terminate process ID 1234.
 .br
 .Pp
-.Cm # kill -HUP `cat /var/run/inetd.pid`
+.Li # kill -HUP `cat /var/run/inetd.pid`
 .Pp
 Send the
 .Xr inetd 8
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index d07fb5cf1dd..764acc628e2 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ln.1,v 1.18 2002/04/29 17:38:38 millert Exp $
+.\"	$OpenBSD: ln.1,v 1.19 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: ln.1,v 1.10 1995/07/25 19:37:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -127,14 +127,14 @@ makes links in
 to all the named source files.
 The links made will have the same name as the files being linked to.
 .Sh EXAMPLES
-.Cm # ln -s /var/www /home/www
+.Li # ln -s /var/www /home/www
 .Pp
 Creates a symbolic link named
 .Pa /home/www
 and points it to
 .Pa /var/www .
 .Pp
-.Cm # ln /usr/local/bin/fooprog-1.0 /usr/local/bin/fooprog
+.Li # ln /usr/local/bin/fooprog-1.0 /usr/local/bin/fooprog
 .Pp
 Hard link
 .Pa /usr/local/bin/fooprog
@@ -156,10 +156,10 @@ command.
 This hard link exists so
 .Xr test 1
 may be invoked from shell scripts, for example, using the
-.Cm "if [ ]"
+.Li "if [ ]"
 construct.
 .Pp
-.Cm "$ mkdir bar baz; ln -s bar foo; ln -shf baz foo"
+.Li "$ mkdir bar baz; ln -s bar foo; ln -shf baz foo"
 .Pp
 The second call to
 .Nm
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 9e3e9bb194c..d3df7b621a4 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.33 2002/02/11 18:43:51 mpech Exp $
+.\"	$OpenBSD: ls.1,v 1.34 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -394,18 +394,18 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
-.Cm $ ls -l
+.Li $ ls -l
 .Pp
 List the contents of the current working directory in long format.
 .Pp
-.Cm $ ls -lioF
+.Li $ ls -lioF
 .Pp
 In addition to listing the contents of the current working directory in
 long format, show inode numbers, file flags (see
 .Xr chflags 1 ) ,
 and suffix each filename with a symbol representing its file type.
 .Pp
-.Cm $ ls -lt /var/log
+.Li $ ls -lt /var/log
 .Pp
 List the files in
 .Pa /var/log ,
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index df6e01bf0bf..0484232c0d3 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkdir.1,v 1.16 2002/02/11 18:43:51 mpech Exp $
+.\"	$OpenBSD: mkdir.1,v 1.17 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: mkdir.1,v 1.9 1995/07/25 19:37:13 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -90,18 +90,18 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
-.Cm $ mkdir foobar
+.Li $ mkdir foobar
 .Pp
 Create a directory named
 .Pa foobar .
 .Pp
-.Cm $ mkdir -m 700 foobar
+.Li $ mkdir -m 700 foobar
 .Pp
 Create a directory named
 .Pa foobar
 and set its file mode to 700.
 .Pp
-.Cm $ mkdir -p cow/horse/monkey
+.Li $ mkdir -p cow/horse/monkey
 .Pp
 Create a directory named
 .Pa cow/horse/monkey ,
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 4e6a567823a..f3448af7520 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mv.1,v 1.16 2002/02/18 21:01:58 mark Exp $
+.\"	$OpenBSD: mv.1,v 1.17 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: mv.1,v 1.8 1995/03/21 09:06:51 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -125,7 +125,7 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
-.Cm $ mv -f foo bar
+.Li $ mv -f foo bar
 .Pp
 Rename file
 .Pa foo
@@ -135,9 +135,9 @@ overwriting
 .Pa bar
 if it already exists.
 .Pp
-.Cm $ mv -i -- -f bar
+.Li $ mv -i -- -f bar
 .br
-.Cm $ mv -i ./-f bar
+.Li $ mv -i ./-f bar
 .Pp
 Either of these commands will rename the file
 .Pa -f
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 8790f2c412b..80d087715dd 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.34 2002/10/18 15:38:11 millert Exp $
+.\"	$OpenBSD: pax.1,v 1.35 2003/03/12 20:12:35 deraadt Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -1055,26 +1055,26 @@ options are specified along with the
 option, a file is not considered selected unless it is newer
 than the file to which it is compared.
 .Sh EXAMPLES
-.Cm $ pax -w -f /dev/rst0 \&.
+.Li $ pax -w -f /dev/rst0 \&.
 .Pp
 Copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp
-.Cm $ pax -v -f filename
+.Li $ pax -v -f filename
 .Pp
 Gives the verbose table of contents for an archive stored in
 .Pa filename .
 .Pp
-.Cm $ mkdir newdir ;
-.Cm cd olddir ;
-.Cm pax -rw \&. newdir
+.Li $ mkdir newdir ;
+.Li cd olddir ;
+.Li pax -rw \&. newdir
 .Pp
 This sequence of commands will copy the entire
 .Pa olddir
 directory hierarchy to
 .Pa newdir .
 .Pp
-.Cm $ pax -r -s ',^//*usr//*,,' -f a.pax
+.Li $ pax -r -s ',^//*usr//*,,' -f a.pax
 .Pp
 Reads the archive
 .Pa a.pax ,
@@ -1082,13 +1082,13 @@ with all files rooted in
 .Pa /usr
 into the archive extracted relative to the current directory.
 .Pp
-.Cm $ pax -rw -i \&. dest_dir
+.Li $ pax -rw -i \&. dest_dir
 .Pp
 Can be used to interactively select the files to copy from the current
 directory to
 .Pa dest_dir .
 .Pp
-.Cm $ pax -r -pe -U root -G bin -f a.pax
+.Li $ pax -r -pe -U root -G bin -f a.pax
 .Pp
 Extract all files from the archive
 .Pa a.pax
@@ -1098,7 +1098,7 @@ with group
 .Em bin
 and preserve all file permissions.
 .Pp
-.Cm "$ pax -r -w -v -Y -Z home /backup"
+.Li "$ pax -r -w -v -Y -Z home /backup"
 .Pp
 Update (and list) only those files in the destination directory
 .Pa /backup
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index eae6606dcd4..f9760d2190f 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tar.1,v 1.39 2002/06/09 05:33:42 todd Exp $
+.\"	$OpenBSD: tar.1,v 1.40 2003/03/12 20:12:35 deraadt Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: tar.1,v 1.39 2002/06/09 05:33:42 todd Exp $
+.\"	$OpenBSD: tar.1,v 1.40 2003/03/12 20:12:35 deraadt Exp $
 .\"
 .Dd February 7, 2001
 .Dt TAR 1
@@ -227,7 +227,7 @@ The options
 can be used to select one of the compiled-in backup devices,
 .Pa /dev/rstN .
 .Sh EXAMPLES
-.Cm $ tar c bonvole sekve
+.Li $ tar c bonvole sekve
 .Pp
 Creates an archive on the default tape drive, containing the files named
 .Pa bonvole
@@ -235,7 +235,7 @@ and
 .Pa sekve
 .
 .Pp
-.Cm $ tar zcf foriru.tar.gz bonvole sekve
+.Li $ tar zcf foriru.tar.gz bonvole sekve
 .Pp
 Outputs a
 .Xr gzip 1
@@ -246,7 +246,7 @@ and
 to a file called
 .Pa foriru.tar.gz
 .Pp
-.Cm $ tar zcvf backup.tar.gz *.c
+.Li $ tar zcvf backup.tar.gz *.c
 .Pp
 Verbosely creates an archive, called
 .Pa backup.tar.gz
@@ -255,7 +255,7 @@ Verbosely creates an archive, called
 function
 .Pa *.c
 .Pp
-.Cm $ tar tvzf backup.tar.gz '*.jpeg'
+.Li $ tar tvzf backup.tar.gz '*.jpeg'
 .Pp
 Verbosely lists, but does not extract, all files ending in
 .Pa .jpeg
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 8de8a1ec822..4e9522e9bc6 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ps.1,v 1.37 2003/03/06 19:45:24 jmc Exp $
+.\"	$OpenBSD: ps.1,v 1.38 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -525,7 +525,7 @@ wait channel (as a symbolic name)
 exit or stop status (valid only for stopped or zombie process)
 .El
 .Sh EXAMPLES
-.Cm $ ps -auxw
+.Li $ ps -auxw
 .Pp
 Display information on all system processes.
 .Sh FILES
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 63d89ff65ea..7666611d05d 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rm.1,v 1.20 2003/01/11 11:03:53 hugh Exp $
+.\"	$OpenBSD: rm.1,v 1.21 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: rm.1,v 1.8 1995/07/25 19:37:30 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -139,15 +139,15 @@ If an error occurs,
 .Nm
 exits with a value >0.
 .Sh EXAMPLES
-.Cm $ rm -rf foobar
+.Li $ rm -rf foobar
 .Pp
 Recursively remove all files contained within the
 .Pa foobar
 directory hierarchy.
 .Pp
-.Cm $ rm -- -f
+.Li $ rm -- -f
 .br
-.Cm $ rm ./-f
+.Li $ rm ./-f
 .Pp
 Either of these commands will remove the file
 .Pa -f .
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index a0b49232255..9b6be161a71 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmdir.1,v 1.13 2002/02/11 18:43:51 mpech Exp $
+.\"	$OpenBSD: rmdir.1,v 1.14 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: rmdir.1,v 1.10 1995/07/25 19:37:35 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -88,13 +88,13 @@ argument referred to an empty directory and was removed successfully.
 An error occurred.
 .El
 .Sh EXAMPLES
-.Cm $ rmdir foobar
+.Li $ rmdir foobar
 .Pp
 Remove the directory
 .Pa foobar
 if it is empty.
 .Pp
-.Cm $ rmdir -p cow/horse/monkey
+.Li $ rmdir -p cow/horse/monkey
 .Pp
 Remove all directories up to and including
 .Pa cow ,
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index 542edcfda7b..c2fb47f64f4 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atactl.8,v 1.22 2003/01/29 16:53:37 jmc Exp $
+.\"	$OpenBSD: atactl.8,v 1.23 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: atactl.8,v 1.5 1999/02/24 18:49:14 jwise Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,25 +62,25 @@ If the
 is specified without a
 .Ar command ,
 the
-.Cm identify
+.Li identify
 command is implied.
 .Pp
 The following commands may be used:
 .Pp
 .Bl -tag -width xxxxxxx -compact
-.It Cm identify
+.It Li identify
 Identify the specified device, displaying the device's vendor, product,
 revision strings, supported capabilities and enabled capabilities.
 .Pp
-.It Cm idle
+.It Li idle
 Place the specified device into Idle mode.
 This mode may consume less power than Active mode.
 .Pp
-.It Cm standby
+.It Li standby
 Place the specified device into Standby mode.
 This mode will consume less power than Idle mode.
 .Pp
-.It Cm sleep
+.It Li sleep
 Place the specified device into Sleep mode.
 This mode will consume less power than Standby mode,
 but requires a device reset to resume operation.
@@ -89,25 +89,25 @@ Typically the
 driver performs this reset automatically, but this should still be
 used with caution.
 .Pp
-.It Cm setidle Ar standby-timer
+.It Li setidle Ar standby-timer
 Places the specified device into Idle mode, and sets the Standby timer
 to
 .Ar standby-timer
 seconds.
 A value of 0 will disable the Standby timer.
 .Pp
-.It Cm setstandby Ar standby-timer
+.It Li setstandby Ar standby-timer
 Places the specified device into Standby mode, and sets the Standby timer
 to
 .Ar standby-timer
 seconds.
 A value of 0 will disable the Standby timer.
 .Pp
-.It Cm checkpower
+.It Li checkpower
 Will print out if the device is in Active, Idle, or Standby power
 management mode.
 .Pp
-.It Cm apmset Ar power-management-level
+.It Li apmset Ar power-management-level
 Enables and sets the advanced power management level to the requested
 level on the specified device (if supported).
 Device performance may
@@ -127,17 +127,17 @@ standby mode and are more suitable for optimization for performance.
 Support for advanced power management is indicated by the device with
 .Sq Advanced Power Management feature set
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm apmdisable
+.It Li apmdisable
 Disables support for advanced power management on the specified device.
 Note that devices supporting advanced power management may refuse to
 disable it, resulting in an
 .Sq ATA device returned Aborted Command
 warning.
 .Pp
-.It Cm acousticset Ar acoustic-management-level
+.It Li acousticset Ar acoustic-management-level
 Enables and sets the automatic acoustic management level to the requested
 level on the specified device (if supported).
 Device performance may
@@ -147,25 +147,25 @@ Valid values are 0 up to and including 126.
 Support for automatic acoustic management is indicated by the device with
 .Sq Automatic Acoustic Management feature set
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm acousticdisable
+.It Li acousticdisable
 Disables support for automatic acoustic management on the specified device.
 Note that devices supporting automatic acoustic management may refuse to
 disable it, resulting in an
 .Sq ATA device returned Aborted Command
 warning.
 .Pp
-.It Cm podenable
+.It Li podenable
 Allows the specified device to revert to power-on default (pod) settings
 after a reset.
 .Pp
-.It Cm poddisable
+.It Li poddisable
 Disallows the specified device to revert to power-on default (pod) settings
 after a reset.
 .Pp
-.It Cm puisenable
+.It Li puisenable
 Enables power-up in standby (puis) on the specified device, causing the
 device to wait while spinning up the disks after power-up.
 This may cause problems at boot if the device is too slow in spin-up.
@@ -177,31 +177,31 @@ hardware and software resets.
 Support for power-up in standby is indicated by the device with
 .Sq Power-up in standby feature set
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm puisdisable
+.It Li puisdisable
 Disables power-up in standby (puis) on the specified device, causing the
 device to spin up the disks after power-up.
 This should be the factory
 default setting of the device and it is recommended to leave this
 setting disabled.
 .Pp
-.It Cm puisspinup
+.It Li puisspinup
 Explicitly spins up the device if power-up in standby (puis) mode
 is enabled.
 .Pp
-.It Cm readaheadenable
+.It Li readaheadenable
 Enables read look-ahead on the specified device.
 This may increase performance.
 Support for and status of read look-ahead is indicated by
 the device with
 .Sq read look-ahead
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm readaheaddisable
+.It Li readaheaddisable
 Disables read look-ahead on the specified device.
 This may decrease performance.
 Note that the device may use
@@ -211,8 +211,8 @@ behaviour in implementing this, so it is
 recommended to issue this command on a disk containing any currently
 mounted filesystems.
 .Pp
-.It Cm secsetpass Ar user Ar high|maximum
-.It Cm secsetpass Ar master
+.It Li secsetpass Ar user Ar high|maximum
+.It Li secsetpass Ar master
 Sets password and security level for the specified device.
 There are two passwords, user and master, and two security levels, high and
 maximum.
@@ -222,7 +222,7 @@ this command.
 When the security system is enabled, access to user data on the device is
 denied after a power cycle until the user password is sent to the device with
 the
-.Cm secunlock
+.Li secunlock
 command.
 A master password may be set in addition to the user password.
 The purpose of the master password is to allow an administrator to establish
@@ -231,36 +231,36 @@ the device if the user password is lost.
 Setting the master password does not enable security system.
 Each master password change decrements the master password revision
 code value which is displayed in the
-.Cm identify
+.Li identify
 command output if supported.
 After value 0x0001 is reached the next value will be 0xfffe.
 The security level determines device behavior when the master password is used
 to unlock the device.
 When the security level is set to high the device requires the
-.Cm secunlock
+.Li secunlock
 command if the master password is used to unlock.
 When the security level is set to maximum the device requires a
-.Cm secerase
+.Li secerase
 command if the master password is used to unlock it.
 Execution of the
-.Cm secerase
+.Li secerase
 command erases all user data on the device.
 .Pp
-.It Cm secunlock Ar user|master
+.It Li secunlock Ar user|master
 Unlocks the specified device with user or master password.
 The device will always unlock if a valid user password is received.
 If the security level was set to high during the last
-.Cm secsetpass
+.Li secsetpass
 command, the device will unlock if the master password is received.
 If the security level was set to maximum during the last
-.Cm secsetpass
+.Li secsetpass
 command, the device won't unlock even if the master password is received.
 .Pp
-.It Cm secerase Ar user|master Op Ar enhanced
+.It Li secerase Ar user|master Op Ar enhanced
 Erases all user data and unlocks the specified device.
 Execution of this command with the master password is the only way to unlock a
 device locked at maximum security level with the
-.Cm secsetpass
+.Li secsetpass
 command if the user's password is lost or unknown.
 There are two erase modes: normal and enhanced.
 Default erase mode is normal.
@@ -275,14 +275,14 @@ This command will disable the device lock mode, however, the master password
 will still be stored internally within the device and may be reactivated later
 when a new user password is set.
 .Pp
-.It Cm secfreeze
+.It Li secfreeze
 Prevents changes to passwords until a following power cycle.
 The purpose of this command is to prevent password setting attacks on the
 security system.
 After command completion any other commands that update the device lock mode
 will be aborted.
 .Pp
-.It Cm secdisablepass Ar user|master
+.It Li secdisablepass Ar user|master
 Disables the lock mode for the specified device with user or master password.
 This command won't change the master password.
 The master password will be reactivated when a user password is set.
@@ -290,7 +290,7 @@ The master password will be reactivated when a user password is set.
 Support for the security commands is indicated by the device with
 .Sq Security Mode feature set
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
 .Em WARNING
@@ -299,7 +299,7 @@ Be very careful while playing with these commands.
 Loss of the user and master passwords for the device will result 
 in an inaccessible device.
 .Pp
-.It Cm smartenable
+.It Li smartenable
 Enables SMART (Self-Monitoring, Analysis, and Reporting Technology) on the
 specified device (if supported).
 This causes the device to record information
@@ -307,10 +307,10 @@ for prediction of device degradation and/or faults.
 Support for SMART is indicated by the device with
 .Sq SMART feature set
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm smartdisable
+.It Li smartdisable
 Disables support for SMART on the specified device.
 Note that this means that the device will no longer record any SMART
 information.
@@ -320,7 +320,7 @@ Note that SMART
 be enabled while executing the following commands or the device will
 return an error.
 .Pp
-.It Cm smartstatus
+.It Li smartstatus
 Reads the reliability status of the specified device.
 If the device reports
 that one of its thresholds is exceeded (a strong indication of imminent
@@ -328,10 +328,10 @@ failure), the warning
 .Sq SMART threshold exceeded!
 is printed to stderr and a status of 2 is returned.
 .Pp
-.It Cm smartautosave Ar enable|disable
+.It Li smartautosave Ar enable|disable
 Enables/disables attribute autosave feature on the specified device.
 .Pp
-.It Cm smartoffline Ar subcommand
+.It Li smartoffline Ar subcommand
 Causes the specified device to immediately initiate the optional set of
 activities that collect SMART data in off-line mode and then save this data
 to the device's non-volatile memory, or execute self-diagnostic test
@@ -366,11 +366,11 @@ This option is therefore
 .Em not recommended
 unless the implications are understood.
 .Pp
-.It Cm smartread
+.It Li smartread
 Reads various SMART information from the specified device and prints it to
 stdout.
 .Pp
-.It Cm smartreadlog Ar log
+.It Li smartreadlog Ar log
 Reads specified
 .Ar log
 and prints it to stdout.
@@ -392,7 +392,7 @@ The comprehensive error log.
 The self-test log.
 .El
 .Pp
-.It Cm readattr
+.It Li readattr
 Displays attribute thresholds and values for the specified device.
 Besides attribute values, device vendors may provide additional information
 shown in the last column, ``Raw''.
@@ -402,19 +402,19 @@ SMART must be enabled while executing this command or the device will return
 an error.
 .Pp
 SMART commands and
-.Cm readattr
+.Li readattr
 command are for experts only.
 .Pp
-.It Cm writecachedisable
+.It Li writecachedisable
 Disable the write cache on the specified device (if supported).
 This may decrease performance.
 Support for and status of write caching is indicated by the device with
 .Sq write cache
 in the output of the
-.Cm identify
+.Li identify
 command.
 .Pp
-.It Cm writecacheenable
+.It Li writecacheenable
 Enables the write cache on the specified device (if supported).
 This may increase performance, however data still in the device's cache at
 powerdown
@@ -423,25 +423,25 @@ The
 .Xr wd 4
 driver performs a cache flush automatically before shutdown.
 .Pp
-.It Cm dump
+.It Li dump
 Extracts the records about issued ATA commands from the log buffer.
 The log buffer is cleared after extraction.
 .El
 .Pp
 .Sh EXAMPLES
-.Cm # atactl /dev/wd0c identify
+.Li # atactl /dev/wd0c identify
 .Pp
 Displays the vendor, product, revision strings and capabilities (such as
 support for SMART) as reported by
 .Pa /dev/wd0 .
 .Pp
-.Cm # atactl /dev/wd1c smartenable
+.Li # atactl /dev/wd1c smartenable
 .Pp
 Enables the SMART support on
 .Pa /dev/wd1
 for detection of early warning signs of device failure.
 .Pp
-.Cm 0 * * * * /sbin/atactl /dev/wd0c smartstatus >/dev/null
+.Li 0 * * * * /sbin/atactl /dev/wd0c smartstatus >/dev/null
 .Pp
 In a
 .Xr crontab 5
@@ -459,7 +459,7 @@ will mail it.
 Not all devices are created equally.
 Some may not support the feature sets
 and/or commands needed to perform the requested action, even when the
-.Cm identify
+.Li identify
 command indicates support for the requested action.
 The device will typically respond with an
 .Sq ATA device returned Aborted Command
@@ -486,9 +486,9 @@ standby, read look-ahead and SMART was added in
 .Ox 2.9 .
 .Sh BUGS
 The output from the
-.Cm identify
+.Li identify
 command is rather ugly.
 .Pp
 Disabling read look-head with the
-.Cm readaheaddisable
+.Li readaheaddisable
 might cause problems with mounted filesystems on that device.
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 0d7e79e13e2..c643f35cf70 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.49 2003/02/13 00:10:39 tedu Exp $
+.\"	$OpenBSD: disklabel.8,v 1.50 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -514,12 +514,12 @@ with the
 flag and paste any entries you want from the default label into the real
 one.
 .Sh EXAMPLES
-.Cm # disklabel sd0
+.Li # disklabel sd0
 .Pp
 Display the in-core label for sd0 as obtained via
 .Pa /dev/rsd0c .
 .Pp
-.Cm # disklabel -w -r /dev/rsd0c sd2212 foo
+.Li # disklabel -w -r /dev/rsd0c sd2212 foo
 .Pp
 Create a label for sd0 based on information for
 .Dq sd2212
@@ -530,7 +530,7 @@ Any existing bootstrap code will be clobbered.
 .Fl r
 flag though.)
 .Pp
-.Cm # disklabel -e -r sd0
+.Li # disklabel -e -r sd0
 .Pp
 Read the on-disk label for sd0, edit it and reinstall in-core as
 well as on-disk.
@@ -540,13 +540,13 @@ flag
 though.)
 Existing bootstrap code is unaffected.
 .Pp
-.Cm # disklabel -R sd0 mylabel
+.Li # disklabel -R sd0 mylabel
 .Pp
 Restore the on-disk and in-core label for sd0 from information in
 .Pa mylabel .
 Existing bootstrap code is unaffected.
 .Pp
-.Cm # disklabel -B sd0
+.Li # disklabel -B sd0
 .Pp
 Install a new bootstrap on sd0.
 The boot code comes from
@@ -557,7 +557,7 @@ On-disk and in-core labels are unchanged, but on some systems other
 information may be destroyed.
 Use with care.
 .Pp
-.Cm # disklabel -w -B /dev/rsd0c -b newboot sd2212
+.Li # disklabel -w -B /dev/rsd0c -b newboot sd2212
 .Pp
 Install a new label and bootstrap.
 The label is derived from disktab information for
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index b09e6a3b120..80c29393b70 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.63 2003/03/12 09:02:01 mickey Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.64 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -259,7 +259,7 @@ would activate twisted pair.
 Refer to the interfaces' driver
 specific man page for a complete list of the available types,
 or use
-.Cm ifconfig -m interface
+.Li # ifconfig -m interface
 for a listing of choices.
 .It Cm mediaopt Ar opts
 Set the specified media options on the interface.
diff --git a/sbin/lmccontrol/lmccontrol.8 b/sbin/lmccontrol/lmccontrol.8
index 949aedc3279..b626b8d62c0 100644
--- a/sbin/lmccontrol/lmccontrol.8
+++ b/sbin/lmccontrol/lmccontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lmccontrol.8,v 1.14 2003/02/03 17:46:57 jmc Exp $
+.\"	$OpenBSD: lmccontrol.8,v 1.15 2003/03/12 20:12:36 deraadt Exp $
 .\"
 .\" Copyright (c) 1997-1999 LAN Media Corporation (LMC)
 .\" All rights reserved.  www.lanmedia.com
@@ -121,7 +121,7 @@ power).
 To set a SSI card for a speed of 2048000 bits/sec with HDLC keepalive off,
 one could use:
 .Pp
-.Cm # lmccontrol lmc0 -l 2048000 -K
+.Li # lmccontrol lmc0 -l 2048000 -K
 .Pp
 .Sh SEE ALSO
 .Xr lmc 4 ,
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 4313f49d741..1edd1b7f93c 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.38 2003/03/10 19:52:05 tedu Exp $
+.\"	$OpenBSD: mount.8,v 1.39 2003/03/12 20:12:36 deraadt Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -309,11 +309,11 @@ manual page.
 .Sh EXAMPLES
 .Bd -literal
 .Pp
-.Cm # mount -t cd9660 -r /dev/cd0a /mnt/cdrom
+.Li # mount -t cd9660 -r /dev/cd0a /mnt/cdrom
 .Pp
-.Cm # mount -t msdos /dev/fd0a /mnt/floppy
+.Li # mount -t msdos /dev/fd0a /mnt/floppy
 .Pp
-.Cm # mount host:/path/name /mnt/nfs
+.Li # mount host:/path/name /mnt/nfs
 .Pp
 .Ed
 .Sh FILES
diff --git a/sbin/wsconsctl/wsconsctl.8 b/sbin/wsconsctl/wsconsctl.8
index 27d23915ad5..e468aa06781 100644
--- a/sbin/wsconsctl/wsconsctl.8
+++ b/sbin/wsconsctl/wsconsctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsconsctl.8,v 1.12 2002/02/11 18:43:52 mpech Exp $
+.\" $OpenBSD: wsconsctl.8,v 1.13 2003/03/12 20:12:37 deraadt Exp $
 .\" $NetBSD: wsconsctl.8,v 1.5 1999/09/12 18:47:11 kleink Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -111,11 +111,11 @@ Use the
 utility to determine which keyboard encodings are available for your
 country.
 .Sh EXAMPLES
-.Cm # wsconsctl -w keyboard.encoding=uk
+.Li # wsconsctl -w keyboard.encoding=uk
 .Pp
 Sets a UK keyboard encoding.
 .Pp
-.Cm # wsconsctl -w keyboard.map+="keysym Caps_Lock = Control_L"
+.Li # wsconsctl -w keyboard.map+="keysym Caps_Lock = Control_L"
 .Pp
 Modifies the current keyboard encoding so that, when the
 .Ar Caps Lock
@@ -127,13 +127,13 @@ to the
 .Ar /usr/include/dev/wscons/wsksymdef.h
 file.
 .Pp
-.Cm # wsconsctl -w keyboard.map+="keycode 184=Mode_switch"
+.Li # wsconsctl -w keyboard.map+="keycode 184=Mode_switch"
 .Pp
 Assigns the
 .Ar Right Alt
 key to be the group modifier (layout is changed while the key is pressed).
 .Pp
-.Cm # wsconsctl -w keyboard.map+="keycode 157=Mode_Lock"
+.Li # wsconsctl -w keyboard.map+="keycode 157=Mode_Lock"
 .Pp
 Assigns the
 .Ar Right Control
@@ -149,7 +149,7 @@ and
 .Ar Shift
 behaviour.
 .Pp
-.Cm # wsconsctl -w keyboard.encoding=us.swapctrlcaps
+.Li # wsconsctl -w keyboard.encoding=us.swapctrlcaps
 .Pp
 Sets a US keyboard encoding, with the
 .Ar Caps Lock
@@ -164,11 +164,11 @@ by the
 .Ar Caps Lock
 key is enough - see the previous example for details.
 .Pp
-.Cm # wsconsctl -w keyboard.bell.pitch=1200
+.Li # wsconsctl -w keyboard.bell.pitch=1200
 .Pp
 Sets the bell pitch to be 1200.
 .Pp
-.Cm # wsconsctl -w keyboard.bell.pitch+=200
+.Li # wsconsctl -w keyboard.bell.pitch+=200
 .Pp
 Adds 200 to the current pitch of the bell.
 .Sh FILES
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 85c6a34651b..39d6aa48a63 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apply.1,v 1.17 2002/02/13 08:33:46 mpech Exp $
+.\"	$OpenBSD: apply.1,v 1.18 2003/03/12 20:12:37 deraadt Exp $
 .\"	$NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -98,12 +98,12 @@ Debug mode.
 Print commands to the standard output but do not actually execute them.
 .El
 .Sh EXAMPLES
-.Cm "$ apply echo a*"
+.Li "$ apply echo a*"
 .Pp
 Similar to
 .Xr ls 1 .
 .Pp
-.Cm "$ apply \-2 cmp a1 b1 a2 b2 a3 b3"
+.Li "$ apply \-2 cmp a1 b1 a2 b2 a3 b3"
 .Pp
 Compares the
 .Dq a
@@ -111,13 +111,13 @@ files to the
 .Dq b
 files.
 .Pp
-.Cm "$ apply \-0 who 1 2 3 4 5"
+.Li "$ apply \-0 who 1 2 3 4 5"
 .Pp
 Runs
 .Xr who 1
 5 times.
 .Pp
-.Cm "$ apply \'ln %1 /usr/joe\'" *
+.Li "$ apply \'ln %1 /usr/joe\'" *
 .Pp
 Links all files in the current directory to the directory
 .Pa /usr/joe .
diff --git a/usr.sbin/wsconscfg/wsconscfg.8 b/usr.sbin/wsconscfg/wsconscfg.8
index f3c1e7c2bc6..2e2f1d538e0 100644
--- a/usr.sbin/wsconscfg/wsconscfg.8
+++ b/usr.sbin/wsconscfg/wsconscfg.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wsconscfg.8,v 1.13 2003/02/19 09:01:47 jmc Exp $
+.\"	$OpenBSD: wsconscfg.8,v 1.14 2003/03/12 20:12:42 deraadt Exp $
 .\"	$NetBSD: wsconscfg.8,v 1.5 1999/05/15 14:45:06 drochner Exp $
 .\"
 .\" Copyright (c) 1999
@@ -118,7 +118,7 @@ for details.
 .\" .Pa /etc/wscons.conf
 .\" configuration file.
 .Sh EXAMPLES
-.Cm # wsconscfg -t 80x50 -e vt100 1
+.Li # wsconscfg -t 80x50 -e vt100 1
 .br
 .Pp
 Configure screen 1 (i.e., the second) for type
@@ -134,7 +134,7 @@ screen useful.
 See
 .Xr wsfontload 8 . )
 .Pp
-.Cm # wsconscfg -k
+.Li # wsconscfg -k
 .Pp
 Connect the first unconnected keyboard to the display.
 .\" .Sh FILES
diff --git a/usr.sbin/wsfontload/wsfontload.8 b/usr.sbin/wsfontload/wsfontload.8
index ebfcb32beaa..0e762774dbc 100644
--- a/usr.sbin/wsfontload/wsfontload.8
+++ b/usr.sbin/wsfontload/wsfontload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wsfontload.8,v 1.11 2003/02/19 09:01:47 jmc Exp $
+.\"	$OpenBSD: wsfontload.8,v 1.12 2003/03/12 20:12:43 deraadt Exp $
 .\"	$NetBSD: wsfontload.8,v 1.5 1999/04/06 04:54:22 cgd Exp $
 .\"
 .\" Copyright (c) 1999, 2001
@@ -127,7 +127,7 @@ No font files are provided with the wscons framework.
 The fonts installed by PCVT can be used instead, as can raw font files from
 other operating system distributions.
 .Sh EXAMPLES
-.Cm "# wsfontload -N myname -h 8 -e ibm /usr/share/misc/pcvtfonts/vt220l.808"
+.Li "# wsfontload -N myname -h 8 -e ibm /usr/share/misc/pcvtfonts/vt220l.808"
 .Pp
 Load the IBM-encoded 8x8-font from the PCVT distribution.
 This (or another 8x8-font) is necessary to use the 50-line screen type on