Proposed updatesrt46859

1 files changed, 28 insertions, 28 deletions

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index bd3218a7..54f88d3b 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -2636,32 +2636,16 @@ statement
 Where \fIname\fR is the name of the DHCP server's lease file. By default,
 this is DBDIR/dhcpd.leases.  This statement \fBmust\fR appear in the outer
 scope of the configuration file - if it appears in some other scope, it will
-have no effect.  The value must be the absolute path and file name of the
-file to use.  The order of precedence the server uses for the lease file name
+have no effect.  The value must be the absolute path of the file to use.
+The order of precedence the server uses for the lease file name
 is:
 .PP
-    1. \fBlease-file-name\fR
-    2. \fB-lf\fR flag
+    1. \fBlease-file-name\fR configuration file statement.
+    2. \fB-lf\fR command line flag.
     3. \fBPATH_DHCPD_DB\fR environment variable.
 .RE
 .PP
 The
-.I limit-addrs-per-ia
-statement
-.RS 0.25i
-.PP
-.B limit-addrs-per-ia \fInumber\fB;\fR
-.PP
-By default, the DHCPv6 server will limit clients to one IAADDR per IA
-option, meaning one address.  If you wish to permit clients to hang onto
-multiple addresses at a time, configure a larger \fInumber\fR here.
-.PP
-Note that there is no present method to configure the server to forcibly
-configure the client with one IP address per each subnet on a shared network.
-This is left to future work.
-.RE
-.PP
-The
 .I dhcpv6-lease-file-name
 statement
 .RS 0.25i
@@ -2669,14 +2653,14 @@ statement
 .B dhcpv6-lease-file-name \fIname\fB;\fR
 .PP
 Where \fIname\fR is the name of the DHCP server's lease file when the server
-is running DHCPv6 more. By default, this is DBDIR/dhcpd6.leases. This statement
+is running DHCPv6. By default, this is DBDIR/dhcpd6.leases. This statement
 \fBmust\fR appear in the outer scope of the configuration file - if it appears
 in some other scope, it will have no effect.  The value must be the absolute
-path and file name of the file to use.  The order of precedence the server uses
+path of the file to use.  The order of precedence the server uses
 for the lease file name is:
 .PP
-    1. \fBdhcpv6-lease-file-name\fR
-    2. \fB-lf\fR flag
+    1. \fBdhcpv6-lease-file-name\fR configuration file statement.
+    2. \fB-lf\fR command line flag.
     3. \fBPATH_DHCPD6_DB\fR environment variable.
 .RE
 .PP
@@ -2701,6 +2685,22 @@ automatically reads the values in either format.
 .RE
 .PP
 The
+.I limit-addrs-per-ia
+statement
+.RS 0.25i
+.PP
+.B limit-addrs-per-ia \fInumber\fB;\fR
+.PP
+By default, the DHCPv6 server will limit clients to one IAADDR per IA
+option, meaning one address.  If you wish to permit clients to hang onto
+multiple addresses at a time, configure a larger \fInumber\fR here.
+.PP
+Note that there is no present method to configure the server to forcibly
+configure the client with one IP address per each subnet on a shared network.
+This is left to future work.
+.RE
+.PP
+The
 .I local-port
 statement
 .RS 0.25i
@@ -2947,8 +2947,8 @@ starts.  By default, this is RUNDIR/dhcpd.pid.  Like the \fIlease-file-name\fR
 statement, this statement must appear in the outer scope of the configuration
 file. The order of precedence used by the server is:
 .PP
-    1. \fBpid-file-name\fR
-    2. \fB-lf\fR flag
+    1. \fBpid-file-name\fR configuration file statement.
+    2. \fB-lf\fR command line flag.
     3. \fBPATH_DHCPD_PID\fR environment variable.
 .PP
 The
@@ -2964,8 +2964,8 @@ in DHCPv6 mode.  By default, this is DBDIR/dhcpd6.pid.  This statement,
 like \fIpid-file-name\fr, \fBmust\fR appear in the outer scope of the
 configuration file.  The order of precedence used by the server is:
 .PP
-    1. \fBdhcpv6-pid-file-name\fR
-    2. \fB-lf\fR flag
+    1. \fBdhcpv6-pid-file-name\fR configuration file statement.
+    2. \fB-lf\fR command line flag.
     3. \fBPATH_DHCPD6_PID\fR environment variable.
 .PP
 .RE