Eliminate macro calls inside literal displays.

12 files changed, 37 insertions, 64 deletions

diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 0ee1cd0..15c0686 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -107,18 +107,16 @@ characters (with the high bit set) are printed as
 .Ex -std
 .Sh EXAMPLES
 The command:
-.Bd -literal -offset indent
-.Ic cat file1
-.Ed
+.Pp
+.Dl "cat file1"
 .Pp
 will print the contents of
 .Ar file1
 to the standard output.
 .Pp
 The command:
-.Bd -literal -offset indent
-.Ic cat file1 file2 > file3
-.Ed
+.Pp
+.Dl "cat file1 file2 > file3"
 .Pp
 will sequentially print the contents of
 .Ar file1
@@ -134,9 +132,8 @@ See the manual page for your shell (i.e.,
 for more information on redirection.
 .Pp
 The command:
-.Bd -literal -offset indent
-.Ic cat file1 - file2 - file3
-.Ed
+.Pp
+.Dl "cat file1 - file2 - file3"
 .Pp
 will print the contents of
 .Ar file1 ,
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index 7811c78..b30b95b 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -68,8 +68,8 @@ following structure
 containing the broken-out
 fields of a line in the network protocol data base,
 .Pa /etc/protocols .
-.Bd -literal -offset indent
 .Pp
+.Bd -literal -offset indent
 struct	protoent {
 	char	*p_name;	/* official name of protocol */
 	char	**p_aliases;	/* alias list */
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index d3929ee..1fd4edd 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -213,8 +213,8 @@ struct cmsghdr {
 /* followed by
 	u_char	cmsg_data[]; */
 };
-.Pp
 .Ed
+.Pp
 As an example, one could use this to learn of changes in the data-stream
 in XNS/SPP, or in ISO, to obtain user-connection-request data by requesting
 a
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 0971949..01a984a 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -56,10 +56,10 @@ For the commands that use the
 argument,
 .Fa "union semun"
 is defined as follows:
-.Bd -literal
 .\"
 .\" From <sys/sem.h>:
 .\"
+.Bd -literal
 union semun {
         int     val;            /* value for SETVAL */
         struct  semid_ds *buf;  /* buffer for IPC_STAT & IPC_SET */
@@ -139,10 +139,10 @@ in any process are cleared.
 The
 .Vt "struct semid_ds"
 is defined as follows:
-.Bd -literal
 .\"
 .\" Taken straight from <sys/sem.h>.
 .\"
+.Bd -literal
 struct semid_ds {
         struct  ipc_perm sem_perm;      /* operation permission struct */
         struct  sem *sem_base;  /* pointer to first semaphore in set */
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 70c712b..86200ee 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -54,10 +54,10 @@ is indicated by
 Each operation is encoded in a
 .Vt "struct sembuf" ,
 which is defined as follows:
-.Bd -literal
 .\"
 .\" From <sys/sem.h>
 .\"
+.Bd -literal
 struct sembuf {
         u_short sem_num;        /* semaphore # */
         short   sem_op;         /* semaphore operation */
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index d8c7bf8..254948a 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -228,9 +228,9 @@ to machine 10.0.0.8.
 If several address aliases specify the same public address
 as follows
 .Bd -literal -offset indent
-.Ar redirect_address 192.168.0.2 public_addr
-.Ar redirect_address 192.168.0.3 public_addr
-.Ar redirect_address 192.168.0.4 public_addr
+redirect_address 192.168.0.2 public_addr
+redirect_address 192.168.0.3 public_addr
+redirect_address 192.168.0.4 public_addr
 .Ed
 .Pp
 the incoming traffic will be directed to the last
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index ca081cd..2312529 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -311,8 +311,8 @@ union vm_map_object {
         struct vm_object *vm_object;
         struct vm_map *sub_map;
 };
-.Pp
 .Ed
+.Pp
 Normally, the
 .Va sub_map
 member is only used by system maps to indicate that a memory range
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 1deb0b4..f0a4247 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -83,7 +83,6 @@ cmd \-aoarg file file
 cmd \-a \-o arg file file
 cmd \-oarg -a file file
 cmd \-a \-oarg \-\- file file
-.Pp
 .Ed
 .Sh SEE ALSO
 .Xr getopts 1 ,
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 0d335cf..8a2e22b 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -133,19 +133,16 @@ and then in
 .Pa /var/db/locate.database
 and then in
 .Pa /cdrom/locate.database .
-.Bd -literal
-$ locate -d db1 -d db2 -d db3 pattern
-.Ed
+.Pp
+.Dl "$ locate -d db1 -d db2 -d db3 pattern"
 .Pp
 is the same as
-.Bd -literal
-$ locate -d db1:db2:db3 pattern
-.Ed
+.Pp
+.Dl "$ locate -d db1:db2:db3 pattern"
 .Pp
 or
-.Bd -literal
-.Dq $ locate -d db1:db2 -d db3 pattern .
-.Ed
+.Pp
+.Dl "$ locate -d db1:db2 -d db3 pattern"
 .Pp
 If
 .Ar -
diff --git a/usr.sbin/mrouted/mrinfo.8 b/usr.sbin/mrouted/mrinfo.8
index bd9c61f..94f8f0a1 100644
--- a/usr.sbin/mrouted/mrinfo.8
+++ b/usr.sbin/mrouted/mrinfo.8
@@ -64,7 +64,7 @@ Default timeout is 4 seconds.
 .El
 .Sh SAMPLE OUTPUT
 .Bd -literal
-.Nm mrinfo Ar mbone.phony.dom.net
+$ mrinfo mbone.phony.dom.net
 127.148.176.10 (mbone.phony.dom.net) [version 3.3]:
  127.148.176.10 -> 0.0.0.0 (?) [1/1/querier]
  127.148.176.10 -> 127.0.8.4 (mbone2.phony.dom.net) [1/45/tunnel]
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index a8986fb..a694935 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -122,51 +122,32 @@ In all other cases,
 exits 0 on success, and 1 for all other errors.
 .Sh EXAMPLES
 To see which realtime priority the current process is at:
-.Bd -literal -offset indent -compact
-.Sy "rtprio"
-.Ed
+.Dl rtprio
 .Pp
-To see which realtime priority of process
-.Em 1423 :
-.Bd -literal -offset indent -compact
-.Sy "rtprio 1423"
-.Ed
+To see which realtime priority of process 1423:
+.Dl "rtprio 1423"
 .Pp
 To run
 .Xr cron 8
 at the lowest realtime priority:
-.Bd -literal -offset indent -compact
-.Sy "rtprio 31 cron"
-.Ed
+.Dl "rtprio 31 cron"
 .Pp
-To change the realtime priority of process
-.Em 1423
-to
-.Em 16 :
-.Bd -literal -offset indent -compact
-.Sy "rtprio 16 -1423"
-.Ed
+To change the realtime priority of process 1423 to 16:
+.Dl "rtprio 16 -1423"
 .Pp
 To run
 .Xr tcpdump 1
 without realtime priority:
-.Bd -literal -offset indent -compact
-.Sy "rtprio -t tcpdump"
-.Ed
+.Dl "rtprio -t tcpdump"
 .Pp
-To change the realtime priority of process
-.Em 1423
+To change the realtime priority of process 1423
 to
 .Dv RTP_PRIO_NORMAL
 (non-realtime/normal priority):
-.Bd -literal -offset indent -compact
-.Sy "rtprio -t -1423"
-.Ed
+.Dl "rtprio -t -1423"
 .Pp
 To make depend while not disturbing other machine usage:
-.Bd -literal -offset indent -compact
-.Sy "idprio 31 make depend"
-.Ed
+.Dl "idprio 31 make depend"
 .Sh SEE ALSO
 .Xr nice 1 ,
 .Xr ps 1 ,
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index aa58a56..da25397 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -62,9 +62,9 @@ as local time.
 The
 .Nm
 utility will act as if the input contained a link line of the form
-.Bd -literal -offset indent
-.No "Link	timezone		localtime
-.Ed
+.Pp
+.D1 No "Link	timezone		localtime"
+.Pp
 (Note that this action has no effect on
 .Fx ,
 since the local time zone is specified in
@@ -85,9 +85,8 @@ time zone environment variables.
 The
 .Nm
 utility will act as if the input contained a link line of the form
-.Bd -literal -offset indent
-.No "Link	timezone		posixrules
-.Ed
+.Pp
+.D1 No "Link	timezone		posixrules"
 .It Fl u Ar user
 After creating each output file, change its owner to
 .Ar user