2 files changed, 37 insertions, 38 deletions

diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index 5630167d6cec..b4f212e727dc 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -9,7 +9,7 @@
 .Nm bootpd , bootpgw
 .Nd Internet Boot Protocol server/gateway
 .Sh SYNOPSIS
-.Nm bootpd
+.Nm
 .Op Fl i
 .Op Fl s
 .Op Fl t Ar timeout
@@ -33,7 +33,7 @@ RFC951, RFC1532, and RFC1533.
 implements a simple BOOTP gateway which can be used to forward
 requests and responses between clients on one subnet and a
 BOOTP server (i.e.
-.Nm Ns )
+.Nm )
 on another subnet. While either
 .Nm
 or
@@ -120,7 +120,7 @@ or
 .Fl d
 4 will set the debugging level to 4.
 For compatibility with older versions of
-.Nm Ns ,
+.Nm ,
 omitting the numeric parameter (i.e. just
 .Fl d Ns )
 will simply increment the debug level by one.
@@ -138,23 +138,23 @@ This option is not recognized by
 .It Fl i
 Force inetd mode.  This option is obsolete, but remains for
 compatibility with older versions of
-.Nm Ns .
+.Nm .
 .It Fl s
 Force standalone mode.  This option is obsolete, but remains for
 compatibility with older versions of
-.Nm Ns .
+.Nm .
 .It Ar bootptab
 Specify the name of the configuration file from which
 .Nm
 loads its database of known clients and client options
-.Pf ( Nm bootpd
+.No ( Nm
 only).
 .It Ar dumpfile
 Specify the name of the file that
 .Nm
 will dump its internal database into when it receives a
 SIGUSR1 signal
-.Pf ( Nm  bootpd
+.No ( Nm
 only). This option is only recognized if
 .Nm
 was compiled with the -DDEBUG flag.
@@ -234,15 +234,15 @@ then the values default to bootps=67 and bootpc=68.
 .Bl -tag -width /tmp/bootpd.dump -compact
 .It Pa /etc/bootptab
 Database file read by
-.Nm Ns .
+.Nm .
 .It Pa /tmp/bootpd.dump
 Debugging dump file created by
-.Nm Ns .
+.Nm .
 .It Pa /etc/services
 Internet service numbers.
 .It Pa /tftpboot
 Current directory typically used by the TFTP server and
-.Nm Ns .
+.Nm .
 .El
 .Sh BUGS
 Individual host entries must not exceed 1024 characters.
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index eee489d74e28..dc168717a0bd 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -366,38 +366,37 @@ An example
 .Pa /etc/bootptab
 file follows:
 .Pp
-.nf
-	# Sample bootptab file (domain=andrew.cmu.edu)
+.Bd -literal -offset indent
+# Sample bootptab file (domain=andrew.cmu.edu)
 
-	.default:\\
-		:hd=/usr/boot:bf=null:\\
-		:ds=netserver, lancaster:\\
-		:ns=pcs2, pcs1:\\
-		:ts=pcs2, pcs1:\\
-		:sm=255.255.255.0:\\
-		:gw=gw.cs.cmu.edu:\\
-		:hn:to=-18000:
+\&.default:\\
+	:hd=/usr/boot:bf=null:\\
+	:ds=netserver, lancaster:\\
+	:ns=pcs2, pcs1:\\
+	:ts=pcs2, pcs1:\\
+	:sm=255.255.255.0:\\
+	:gw=gw.cs.cmu.edu:\\
+	:hn:to=-18000:
 
-	carnegie:ht=6:ha=7FF8100000AF:tc=.default:
-	baldwin:ht=1:ha=0800200159C3:tc=.default:
-	wylie:ht=1:ha=00DD00CADF00:tc=.default:
-	arnold:ht=1:ha=0800200102AD:tc=.default:
-	bairdford:ht=1:ha=08002B02A2F9:tc=.default:
-	bakerstown:ht=1:ha=08002B0287C8:tc=.default:
+carnegie:ht=6:ha=7FF8100000AF:tc=.default:
+baldwin:ht=1:ha=0800200159C3:tc=.default:
+wylie:ht=1:ha=00DD00CADF00:tc=.default:
+arnold:ht=1:ha=0800200102AD:tc=.default:
+bairdford:ht=1:ha=08002B02A2F9:tc=.default:
+bakerstown:ht=1:ha=08002B0287C8:tc=.default:
 
-	# Special domain name server and option tags for next host
-	butlerjct:ha=08002001560D:ds=128.2.13.42:\\
-		:T37=0x12345927AD3BCF:\\
-		:T99="Special ASCII string":\\
-		:tc=.default:
+# Special domain name server and option tags for next host
+butlerjct:ha=08002001560D:ds=128.2.13.42:\\
+	:T37=0x12345927AD3BCF:\\
+	:T99="Special ASCII string":\\
+	:tc=.default:
 
-	gastonville:ht=6:ha=7FFF81000A47:tc=.default:
-	hahntown:ht=6:ha=7FFF81000434:tc=.default:
-	hickman:ht=6:ha=7FFF810001BA:tc=.default:
-	lowber:ht=1:ha=00DD00CAF000:tc=.default:
-	mtoliver:ht=1:ha=00DD00FE1600:tc=.default:
-
-.fi
+gastonville:ht=6:ha=7FFF81000A47:tc=.default:
+hahntown:ht=6:ha=7FFF81000434:tc=.default:
+hickman:ht=6:ha=7FFF810001BA:tc=.default:
+lowber:ht=1:ha=00DD00CAF000:tc=.default:
+mtoliver:ht=1:ha=00DD00FE1600:tc=.default:
+.Ed
 .Sh FILES
 .Bl -tag -width /etc/bootptab -compact
 .It /etc/bootptab