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

2 files changed, 19 insertions, 12 deletions

diff --git a/RELNOTES b/RELNOTES
index 4596da6d..cf5ac5da 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -46,6 +46,8 @@ the README file.
 - Fix handling of -A and -a flags in dhcrelay; it was failing to expand
   packet size as needed to add relay agent options.
 
+- Corrected list of failover state values in dhcpd man page.
+
 			Changes since 3.1.1rc2
 
 - None.
diff --git a/server/dhcpd.8 b/server/dhcpd.8
index a07a2e67..1c794556 100644
--- 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.24.42.2 2007/05/23 23:30:33 each Exp $
+.\" $Id: dhcpd.8,v 1.24.42.3 2008/07/17 06:14:24 each Exp $
 .\"
 .TH dhcpd 8
 .SH NAME
@@ -652,21 +652,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