From a152df845562a22b2fdbcb9175755091ab8c1895 Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 23 Aug 2016 10:08:35 +0200
Subject: [PATCH] [4282] Addressed review comments - minor edits in user's
 guide.

---
 doc/guide/admin.xml     | 6 ------
 doc/guide/dhcp4-srv.xml | 6 +++---
 doc/guide/dhcp6-srv.xml | 6 +++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/doc/guide/admin.xml b/doc/guide/admin.xml
index a737d22ef7..f7e70cafb8 100644
--- a/doc/guide/admin.xml
+++ b/doc/guide/admin.xml
@@ -409,12 +409,6 @@ $ <userinput>kea-admin lease-upgrade mysql -u <replaceable>database-user</replac
     <section>
       <title>PostgreSQL</title>
 
-      <para>
-        PostgreSQL is able to store leases. The capability to store host
-        reservations (that include addresses, prefixes and options) is planned
-        for upcoming Kea 1.1.0.
-      </para>
-
       <para>
         A PostgreSQL database must be set up if you want Kea to store
         lease and other information in PostgreSQL. This step can be
diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 4b14ae804e..e3bbab5b91 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -439,7 +439,7 @@ be followed by a comma and another object definition.</para>
 "Dhcp4": { "lease-database": { <userinput>"type": "mysql"</userinput>, ... }, ... }
 </screen>
   Next, the name of the database to hold the leases must be set: this is the
-  name used when the lease database was created
+  name used when the database was created
   (see <xref linkend="mysql-database-create"/>,
   <xref linkend="pgsql-database-create"/> or
   <xref linkend="cql-database-create"/>).
@@ -500,7 +500,7 @@ If a timeout is given though, it should be an integer greater than zero.
     later, if necessary.</para>
 
 <section id="hosts-database-configuration4">
-  <title>IPv4 Hosts Database Configuration</title>
+  <title>DHCPv4 Hosts Database Configuration</title>
 
   <para>Hosts database configuration is controlled through the Dhcp4/hosts-database
   parameters. If enabled, the type of the database must be set to "mysql" or
@@ -2844,7 +2844,7 @@ It is merely echoed by the server
 
 
     <section id="reservations4-tuning">
-      <title>Fine Tuning IPv4 Host Reservation</title>
+      <title>Fine Tuning DHCPv4 Host Reservation</title>
 
       <para>Host reservation capability introduces additional restrictions for the
       allocation engine during lease selection and renewal. In particular, three
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index b46557ecec..d7c85e4e15 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -440,7 +440,7 @@ be followed by a comma and another object definition.</para>
 "Dhcp6": { "lease-database": { <userinput>"type": "mysql"</userinput>, ... }, ... }
 </screen>
   Next, the name of the database is to hold the leases must be set: this is the
-  name used when the lease database was created
+  name used when the database was created
   (see <xref linkend="mysql-database-create"/>,
   <xref linkend="pgsql-database-create"/>
   or <xref linkend="cql-database-create"/>).
@@ -500,7 +500,7 @@ If a timeout is given though, it should be an integer greater than zero.
     later, if necessary.</para>
 
 <section id="hosts-database-configuration6">
-  <title>IPv6 Hosts Database Configuration</title>
+  <title>DHCPv6 Hosts Database Configuration</title>
 
   <para>Hosts database configuration is controlled through the Dhcp6/hosts-database
   parameters. If enabled, the type of the database must be set to "mysql" or
@@ -2579,7 +2579,7 @@ should include options from the isc option space:
     </section>
 
     <section id="reservations6-tuning">
-      <title>Fine Tuning IPv6 Host Reservation</title>
+      <title>Fine Tuning DHCPv6 Host Reservation</title>
 
       <para>Host reservation capability introduces additional restrictions for the
       allocation engine during lease selection and renewal. In particular, three
-- 
2.47.2