From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Mon, 7 Jan 2019 20:40:36 +0000 (-0500)
Subject: Update config.xml
X-Git-Tag: 481-remote-subnet4-set-inconsistent-work-when-id-subnet-is-duplicated_base~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea229fd4048b520f9d1902b905140178cfd92aa8;p=thirdparty%2Fkea.git

Update config.xml
---

diff --git a/doc/guide/config.xml b/doc/guide/config.xml
index 9ef15292f4..2c7f2d2e0a 100644
--- a/doc/guide/config.xml
+++ b/doc/guide/config.xml
@@ -10,7 +10,7 @@
 <chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="kea-config">
   <title>Kea Configuration</title>
 
-  <para>Kea uses JSON structures to represent servers' configurations.
+  <para>Kea uses JSON structures to represent server configurations.
   The following sections describe how the configuration structures are
   organized.
   </para>
@@ -57,8 +57,7 @@
           ignored. This commenting can span multiple lines.</simpara>
         </listitem>
         <listitem>
-          <simpara>File inclusion: JSON files can include other JSON
-          files. This can be done by using &lt;?include
+          <simpara>File inclusion: JSON files can include other JSON files by using a statement of the form &lt;?include
           "file.json"?&gt;.</simpara>
         </listitem>
       </itemizedlist>
@@ -111,8 +110,8 @@
           (the "loggers" object) moved inside the configuration objects (maps) for
           the respective Kea modules. For example, the "Dhcp4" map will contain the
           "loggers" object specifying logging configuration for the DHCPv4
-          server. Backward compatibility will be maintained until at least the Kea
-          1.7.0 release; it will be possible to specify the "Logging" object
+          server. Backward compatibility will be maintained until at least Kea
+          1.7.0; it will be possible to specify the "Logging" object
           at the top configuration level and "loggers"
           objects at the module configuration level. Ultimately, support for the
           top-level "Logging" object will be removed.