[#916] Addressed comments

diff --git a/doc/devel/config-backend.dox b/doc/devel/config-backend.dox
index 719778b39dafbe0be46b61ded506163707649252..fb46c9525c76926f352f579071f01ea270c68f96 100644 (file)
--- a/doc/devel/config-backend.dox
+++ b/doc/devel/config-backend.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2020 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -81,7 +81,7 @@ The following are some details of the JSON backend framework.
    option). From the implementation perspective, this is slight change
    from the BIND10 days, as back then a subset of the configuration was received by
    the daemon processes. Nowadays the whole configuration is passed. To take a
-   specific example, the following is how b10-config.db looks today:
+   specific example, the following is how b10-config.db looked many years ago:
    @code
    {
      "Init": { ... }
@@ -115,6 +115,7 @@ The following are some details of the JSON backend framework.
    start, stop and reconfigure the daemons. Its only
    job is to pass the configuration file to each daemon and remember its PID file, so
    that sending signals is possible (for configuration reload or shutdown). It is also
-   able to print out a status.
-
+   able to print out a status.<br/><br/>
+-# The capability to share the same configuration file between servers and
+   agents, and the Logging toplevel entry, were removed in 1.7.9.
 */

diff --git a/doc/sphinx/arm/config.rst b/doc/sphinx/arm/config.rst
index 785bb9fffc3d781d5124048402a8b69d8ac2004e..5e6ba85abb91fab2db1869d69d35b8395cccd10f 100644 (file)
--- a/doc/sphinx/arm/config.rst
+++ b/doc/sphinx/arm/config.rst
@@ -91,11 +91,11 @@ directory.
    "loggers" object) moved inside the configuration objects (maps) for the
    respective Kea modules. For example: the "Dhcp4" map contains the
    "loggers" object specifying logging configuration for the DHCPv4
-   server. Backward compatibility is maintained until Kea 1.7.8
+   server. Backward compatibility is maintained until Kea 1.7.9
    release; it will be possible to specify the "Logging" object at the top
    configuration level and "loggers" objects at the module configuration
    level. Finally, support for the top-level "Logging" object was
-   removed in Kea 1.7.0.
+   removed in Kea 1.7.9.
 
    The specification of several supported elements (e.g. "Dhcp4",
    "Dhcp6") in a single configuration file can be confusing and works

diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy
index 4c7a67f014580cefde789ab972408be71cf75808..c53ee40c789337d71914e9f1b89f650c9d97df7e 100644 (file)
--- a/src/bin/d2/d2_parser.yy
+++ b/src/bin/d2/d2_parser.yy
@@ -701,7 +701,6 @@ control_socket_name: SOCKET_NAME {
 
 // --- loggers entry -----------------------------------------
 
-// is "Loggers": [ ... ].
 loggers: LOGGERS {
     ElementPtr l(new ListElement(ctx.loc2pos(@1)));
     ctx.stack_.back()->set("loggers", l);

diff --git a/src/bin/shell/tests/shell_process_tests.sh.in b/src/bin/shell/tests/shell_process_tests.sh.in
index dba762060f1554924688e48f7533bc7937a92253..cd842573ef334798dbb5f6e18fecb35a422ef6d9 100644 (file)
--- a/src/bin/shell/tests/shell_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_process_tests.sh.in
@@ -17,10 +17,7 @@ CONFIG="{
     \"Control-agent\":
     {
         \"http-host\": \"127.0.0.1\",
-        \"http-port\": 8081
-    },
-    \"Logging\":
-    {
+        \"http-port\": 8081,
         \"loggers\": [
         {
             \"name\": \"kea-ctrl-agent\",