dhcpd(8), ndb(6): group related ndb attributes together

2 files changed, 58 insertions, 53 deletions

diff --git a/sys/man/6/ndb b/sys/man/6/ndb
index a4d45750d..ea211a92b 100644
--- a/sys/man/6/ndb
+++ b/sys/man/6/ndb
@@ -155,7 +155,7 @@ the dial would connect to the SMTP port of
 A number of attributes are meaningful to programs and thus
 reserved.
 They are:
-.TF dnsdomain
+.TF rootserver
 .TP
 .B sys
 system name (a short name)
@@ -173,77 +173,50 @@ For DNS, an
 .L AAAA
 record.
 .TP
+.B ipnet
+Internet network name
+.TP
+.B ipmask
+Internet network mask
+.TP
+.B ipgw
+Internet gateway (ip address)
+.TP
 .B ether
 Ethernet address
-(must be lower-case hexadecimal).
-Beware that for machines with multiple
-.B ether
-attributes,
-.I dhcpd
-may expect requests to come from the address in the first
-.B ether
-attribute.
+(must be lower-case hex)
+.TP
+.B vendor
+Specific vendor attribute for dhcp and bootp
 .TP
 .B bootf
 file to download for initial bootstrap;
 .B /386/9bootpxe
 to boot a PC via PXE.
 .TP
-.B vendor
-Specific vendor attribute for dhcp and bootp
-.TP
-.B rootserver
-used by Unix machines for boot NFS server
-.TP
 .B tftp
 an TFTP server to use for PXE bootstrap
 .TP
-.B ipnet
-Internet network name
-.TP
-.B ipmask
-Internet network mask
-.TP
-.B ipgw
-Internet gateway (ip address)
+.B fs
+Plan 9 file server to be used
 .TP
 .B auth
-authentication server to be used
+Plan 9 authentication server to be used
 .TP
 .B authdom
-authentication domain.  Plan 9 supports multiple authentication
-domains.  To specify an authentication server for a particular domain,
+Plan 9 authentication domain.
+To specify an authentication server for a particular domain,
 add a tuple containing both
 .B auth
 and
 .B authdom
 attributes and values.
 .TP
-.B fs
-file server to be used
-.TP
-.B tcp
-a TCP service name
-.TP
-.B udp
-a UDP service name
-.TP
-.B port
-a TCP or UDP port number
-.TP
-.B restricted
-a TCP service that can be called only by ports numbered
-less than 1024
+.B rootpath
+the NFS root for unix machines
 .TP
-.B proto
-a protocol supported by a host.
-The pair
-.B proto=il
-was needed by
-.I cs
-(see
-.IR ndb (8))
-in tuples for hosts that supported the IL protocol
+.B rootserver
+the NFS server used with rootpath
 .TP
 .B dnsdomain
 a domain name that
@@ -283,6 +256,29 @@ and
 .TP
 .B soa
 start of area (for DNS)
+.TP
+.B tcp
+a TCP service name
+.TP
+.B udp
+a UDP service name
+.TP
+.B port
+a TCP or UDP port number
+.TP
+.B restricted
+a TCP service that can be called only by ports numbered
+less than 1024
+.TP
+.B proto
+a protocol supported by a host.
+The pair
+.B proto=il
+was needed by
+.I cs
+(see
+.IR ndb (8))
+in tuples for hosts that supported the IL protocol
 .PD
 .PP
 .I Cs
@@ -327,8 +323,8 @@ and its subnets.
 .LP
 .EX
 ipnet=mh-astro-net ip=135.104.0.0 ipmask=255.255.255.0
-	fs=bootes.research.bell-labs.com
 	ipgw=r70.research.bell-labs.com
+	fs=bootes.research.bell-labs.com
 	auth=p9auth.research.bell-labs.com
 ipnet=unix-room ip=135.104.117.0
 	ipgw=135.104.117.1
diff --git a/sys/man/8/dhcpd b/sys/man/8/dhcpd
index ab3807c6b..082a28114 100644
--- a/sys/man/8/dhcpd
+++ b/sys/man/8/dhcpd
@@ -112,7 +112,7 @@ Attributes come from either the NDB entry for the system, the entry for its
 subnet, or the entry for its network.  The system entry has precedence,
 then the subnet, then the network.
 The NDB attributes used are:
-.TF ipmask
+.TF rootserver
 .TP
 .B ip
 the IP address
@@ -160,8 +160,17 @@ the default boot file;
 see
 .IR ndb (6)
 .TP
+.B tftp
+the TFTP server to fetch
+.I bootf
+from
+.TP
+.B rootpath
+the NFS root for unix machines
+.TP
 .B rootserver
-used by Unix machines for boot NFS server
+the NFS server used with
+.I rootpath
 .TP
 .B vendor
 Specific vendor attribute for dhcp and bootp