[#2517] Updating doc

diff --git a/ChangeLog b/ChangeLog
index 375a3f4de9155f24318837da1b2b350a99fb0e63..86bb567e3a2bdc937684724ecd8f2f438ef4264c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2047.  [func]          fdupont
+       Added support of multiple instances of the DHCPv6
+       "vendor-class" (code 16) and "vendor-opts" (code 17)
+       options: specifying multiple options with different
+       enterprise numbers is now supported by Kea.
+
 2046.  [doc]           andrei
        Disabled smart quotes in Sphinx configuration to leave quotes
        unchanged. Prior to this change, quotes were converted into

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 1009a6ee2dfa3087ab31288109474266020edbee..de2eda39f25549a458d2c8ee917c8533eb6f577f 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2118,10 +2118,10 @@ vendor option is sent even when the client did not specify it in the query.
 
 .. note::
 
-   Only a single instance of the ``vendor-class`` (code 16) and
-   a single instance of the ``vendor-opts`` (code 17) options can be
+   Multiple instances of the ``vendor-class`` (code 16) and
+   instances  of the ``vendor-opts`` (code 17) options can be
    specified. Specifying multiple options with different enterprise
-   numbers is currently not supported by Kea.
+   numbers is now supported by Kea.
 
 .. _dhcp6-option-spaces: