Pull up 1.16

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index c2631df6ae56c8c302974f34d906759d709ff475..f6bfc92e8f988245c609ec0331e57bb58352cc3e 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -507,11 +507,11 @@ statement.
 must be the name of a physical hardware interface type.   Currently,
 only the
 .B ethernet
-type is recognized, although support for
-.B token-ring
 and
+.B token-ring
+types are recognized, although support for a
 .B fddi
-hardware types would also be desirable.
+hardware type (and others) would also be desirable.
 The
 .I hardware-address
 should be a set of hexadecimal octets (numbers from 0 through ff)