Corrected list of failover state values in dhcpd man page. [rt17999]

diff --git a/RELNOTES b/RELNOTES
index 305de6fd44b68482ecc07a666263c7fca4cacaf3..5e0bf051e5b57e41dc873d08b43b1e651548933f 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -48,6 +48,10 @@ work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
 
+                       Changes since 4.1.0a2
+
+- Corrected list of failover state values in dhcpd man page.
+
                        Changes since 4.1.0a1
 
 - Fixed a coredump when adding a class via OMAPI.

diff --git a/server/dhcpd.8 b/server/dhcpd.8
index e561feb85f12eb6e9892145b1bebb6cf316191d0..ecc4057df312cf4f34c3d476d7f8e7f71471db86 100644 (file)
--- a/server/dhcpd.8
+++ b/server/dhcpd.8
@@ -28,7 +28,7 @@
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
 .\"
-.\" $Id: dhcpd.8,v 1.28 2007/07/03 10:34:18 shane Exp $
+.\" $Id: dhcpd.8,v 1.29 2008/07/17 06:17:57 each Exp $
 .\"
 .TH dhcpd 8
 .SH NAME
@@ -681,21 +681,26 @@ relationship.   Possible values for state are:
 .RS 1i
 .PP
 .nf
-1  - partner down
-2  - normal
-3  - communications interrupted
-4  - resolution interrupted
-5  - potential conflict
-6  - recover
-7  - recover done
-8  - shutdown
-9  - paused
-10 - startup
-11 - recover wait
+1   - startup
+2   - normal
+3   - communications interrupted
+4   - partner down
+5   - potential conflict
+6   - recover
+7   - paused
+8   - shutdown
+9   - recover done
+10  - resolution interrupted
+11  - conflict done
+254 - recover wait
 .fi
 .RE
 .PP
 .RS 0.5i
+(Note that some of the above values have changed since DHCP 3.0.x.)
+.RE
+.PP
+.RS 0.5i
 In general it is not a good idea to make changes to this state.
 However, in the case that the failover partner is known to be down, it
 can be useful to set the DHCP server's failover state to partner