[#761,!447] Updated doc and added ChangeLog

diff --git a/ChangeLog b/ChangeLog
index de7d28cffc51aba69fd0d64dd7248363144d3b65..16af24aeba920b2e9a66c9145d2e4ec56bfab5d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1645.  [func]          tmark
+       Binary option data may now be specified as a single-quoted
+       text string, within double quotes: "'some text'".  This is
+       handy for binary options that convey text such as urls or
+       file names.
+       (Gitlab #761,!447, git TBD)
+
 1644.  [doc]           marcin, fdupont
        Added a warning about class dependence on built-in classes.
        (Gitlab #727,!466, git 9977d2927cf9b9cf1cd13de30aa5551ca900165b)

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 77eb5bb0198eb52646bfe66c351f3509585516f3..0789f02648a94ccadf848357ebe23372ffd685f3 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -1401,6 +1401,27 @@ Care should be taken to use proper encoding when using hexadecimal
 format; Kea's ability to validate data correctness in hexadecimal is
 limited.
 
+
+As of Kea 1.6.0, it is also possible to specify data for binary options as
+a single-quoted text string within double quotes as shown (note that
+``csv-format`` must be set to false):
+
+::
+
+   "Dhcp4": {
+       "option-data": [
+           {
+               "name": "user-class",
+               "code": 77,
+               "space": "dhcp4",
+               "csv-format": false,
+               "data": "'convert this text to binary'"
+           },
+           ...
+       ],
+       ...
+   }
+
 Most of the parameters in the "option-data" structure are optional and
 can be omitted in some circumstances, as discussed in :ref:`dhcp4-option-data-defaults`.
 

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 4bbf944d61e07c05df2019bd09cfa6ee3a5bbca3..4ab6bac39ddf2a7617973a1394840bf3b2b91944 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -1162,6 +1162,26 @@ Care should be taken to use proper encoding when using hexadecimal
 format; Kea's ability to validate data correctness in hexadecimal is
 limited.
 
+As of Kea 1.6.0, it is also possible to specify data for binary options as
+a single-quoted text string within double quotes as shown (note that
+``csv-format`` must be set to false):
+
+::
+
+   "Dhcp6": {
+       "option-data": [
+           {
+               "name": "subscriber-id",
+               "code": 38,
+               "space": "dhcp6",
+               "csv-format": false,
+               "data": "'convert this text to binary'"
+           },
+           ...
+       ],
+       ...
+   }
+
 Most of the parameters in the "option-data" structure are optional and
 can be omitted in some circumstances, as discussed in :ref:`dhcp6-option-data-defaults`.
 Only one of name or code