[3684] Updated User's Guide per review comments.

diff --git a/doc/guide/admin.xml b/doc/guide/admin.xml
index c086917dbfa45e29e4c3bfb4ba5f95939d2f8321..ca47ff0d69b9242de4f2601051fb597b32f8d962 100644 (file)
--- a/doc/guide/admin.xml
+++ b/doc/guide/admin.xml
@@ -203,7 +203,7 @@
               <entry>Host Reservations</entry>
               <entry>no</entry>
               <entry>yes</entry>
-              <entry>no</entry>
+              <entry>yes</entry>
               <entry>no</entry>
             </row>
 
@@ -211,7 +211,7 @@
               <entry>Options defined on per host basis</entry>
               <entry>no</entry>
               <entry>yes</entry>
-              <entry>no</entry>
+              <entry>yes</entry>
               <entry>no</entry>
             </row>
 

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 432654289bdd708011ebd754d69f3631fbea541f..672cea8b402f99d4121acc2853bdbebf5580c4c3 100644 (file)
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -2392,11 +2392,11 @@ should include options from the isc option space:
     client is greater than the number of reserved addresses or prefixes, the
     server will try to assign all reserved addresses or prefixes to the individual
     IAs and dynamically allocate addresses or prefixes to remaining IAs. If the
-    server cannot assign any of the reserved addresses or prefixes because of the
-    conflict, the server will pick next reserved address or prefix and try to
-    assign it to the client. If the server subsequently finds that there are no
-    more reservations that can be assigned to the client at the moment, the
-    server will try to assign leases dynamically.
+    server cannot assign a reserved address or prefix because it is in use,
+    the server will select next reserved address or prefix and try to assign it to
+    the client. If the server subsequently finds that there are no more reservations
+    that can be assigned to the client at the moment, the server will try to
+    assign leases dynamically.
     </para>
 
     <para>Making a reservation for a mobile host that may visit multiple subnets