[#2084] mention warnings in ChangeLog and docs

diff --git a/ChangeLog b/ChangeLog
index dc419fe800e92548aaf6577ade548ad11567ce4c..f7ac3d9da02e428bcf6d13a55efc8671321339f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 1972.  [func]          andrei
-       Kea servers now accept trailing commas in their JSON
-       configuration.
+       Kea servers now accept trailing commas in file configurations.
+       While parsing, a warning is printed with the location of the
+       comma to give the user the ability to correct a potential
+       mistake.
        (Gitlab #2084)
 
 1971.  [func]          tmark, jad

diff --git a/doc/sphinx/arm/config.rst b/doc/sphinx/arm/config.rst
index 5092c08c673eef5d5cc4fa2a6b44220687bded51..25539c4590eb986d238fe05d39e5a429b3600274 100644 (file)
--- a/doc/sphinx/arm/config.rst
+++ b/doc/sphinx/arm/config.rst
@@ -53,7 +53,10 @@ Kea components use extended JSON with additional features allowed:
 -  File inclusion: JSON files can include other JSON files by using a
    statement of the form \<?include "file.json"?\>.
 
--  Allowed trailing commas anywhere except after the root curly brackets.
+-  Extra commas: to remove the inconvenience of errors caused by leftover commas
+   after making changes to configuration. While parsing, a warning is printed
+   with the location of the comma to give the user the ability to correct a
+   potential mistake.
 
 The configuration file consists of a single object (often colloquially
 called a map) started with a curly bracket. It comprises only one of