[#3609] Addressed final comments

diff --git a/ChangeLog b/ChangeLog
index 671f881592d1bb3853116200621353d67ece046e..15e0e32dbbaab2c13a4ccc33fe4e8c39f7969390 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2305.  [func]          fdupont
+       Added the new "http-headers" parameters which specify
+       by name and value in CA or HTTP control socket
+       configuration extra headers to add to HTTP responses.
+       (Gitlab #3609)
+
 2304.  [func]          tmark
        Both kea-dhcp4 and kea-dhcp6 servers will now
        log a warning message when they detect classes that
        configure lease life time parameters (e.g. 'valid-lifetime',
-       'preferred-lifetime') while also setting 
+       'preferred-lifetime') while also setting
        'only-in-addditiional-list' to true.
        (Gitlab #2736)
 

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 594074358609707369f0ba4d452d9bac1fefbb0c..a9757c21afd3f058bcd3231da859bf30c4b177b8 100644 (file)
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -215,14 +215,15 @@ depends on the specific command.
 
 ::
 
-   ...,
-   "http-headers": [
-       {
-           "name": "Strict-Transport-Security",
-           "value": "max-age=31536000"
-       }
-    ],
+   {
+       "http-headers": [
+           {
+               "name": "Strict-Transport-Security",
+               "value": "max-age=31536000"
+           }
+        ],
     ...
+    }
 
 adds a HSTS header declaring that HTTPS (vs HTTP) must be used for one year.