From: Razvan Becheriu Date: Fri, 15 Sep 2023 15:43:21 +0000 (+0300) Subject: [#3004] addressed comments X-Git-Tag: Kea-2.5.2~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a62c499320be804248203b8efd51fa57e2add65;p=thirdparty%2Fkea.git [#3004] addressed comments --- diff --git a/ChangeLog b/ChangeLog index 90f326d80c..94bc954c13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ -2176. [doc] piotrek - Updated ARM docs with new configuration key alias - "output-options". All config examples, where previous +2176. [doc] piotrek, razvan + Updated ARM docs with new configuration key "output-options" and + alias "output_options". All config examples, where previous "output_options" key appeared, were updated. - (Gitlab #2904) + (Gitlab #2904, #3004) Kea 2.5.1 (development) released on August 30, 2023 diff --git a/doc/sphinx/arm/logging.rst b/doc/sphinx/arm/logging.rst index 9e2b6beea5..56e99d04bc 100644 --- a/doc/sphinx/arm/logging.rst +++ b/doc/sphinx/arm/logging.rst @@ -622,6 +622,9 @@ where log messages are sent and are explained in detail below. to use "dash" instead of "underscore" in the key name. For the time being both configuration keys are considered correct and mean the same to Kea parsers. + As of Kea 2.5.2, the ``output-options`` becomes the default configuration key + and ``output_options`` can be used as an alias. + The ``output`` (string) Option ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/sphinx/grammar/grammar-ca-parser.rst b/doc/sphinx/grammar/grammar-ca-parser.rst index 880d44b876..e7d35ce472 100644 --- a/doc/sphinx/grammar/grammar-ca-parser.rst +++ b/doc/sphinx/grammar/grammar-ca-parser.rst @@ -223,7 +223,7 @@ This grammar is generated from ``agent_parser.yy``. See :ref:`kea-ctrl-agent` fo severity ::= "severity" ":" STRING - output_options_list ::= "output_options" ":" "[" output_options_list_content "]" + output_options_list ::= "output-options" ":" "[" output_options_list_content "]" output_options_list_content ::= output_entry | output_options_list_content "," output_entry diff --git a/doc/sphinx/grammar/grammar-d2-parser.rst b/doc/sphinx/grammar/grammar-d2-parser.rst index 4f02ab069b..28467f4d7d 100644 --- a/doc/sphinx/grammar/grammar-d2-parser.rst +++ b/doc/sphinx/grammar/grammar-d2-parser.rst @@ -280,7 +280,7 @@ This grammar is generated from ``d2_parser.yy``. See :ref:`dhcp-ddns-server` for severity ::= "severity" ":" STRING - output_options_list ::= "output_options" ":" "[" output_options_list_content "]" + output_options_list ::= "output-options" ":" "[" output_options_list_content "]" output_options_list_content ::= output_entry | output_options_list_content "," output_entry diff --git a/doc/sphinx/grammar/grammar-dhcp4-parser.rst b/doc/sphinx/grammar/grammar-dhcp4-parser.rst index 738bb44162..a6a2870261 100644 --- a/doc/sphinx/grammar/grammar-dhcp4-parser.rst +++ b/doc/sphinx/grammar/grammar-dhcp4-parser.rst @@ -1003,7 +1003,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de severity ::= "severity" ":" STRING - output_options_list ::= "output_options" ":" "[" output_options_list_content "]" + output_options_list ::= "output-options" ":" "[" output_options_list_content "]" output_options_list_content ::= output_entry | output_options_list_content "," output_entry diff --git a/doc/sphinx/grammar/grammar-dhcp6-parser.rst b/doc/sphinx/grammar/grammar-dhcp6-parser.rst index cebeec69f6..2c7cae502f 100644 --- a/doc/sphinx/grammar/grammar-dhcp6-parser.rst +++ b/doc/sphinx/grammar/grammar-dhcp6-parser.rst @@ -1054,7 +1054,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de severity ::= "severity" ":" STRING - output_options_list ::= "output_options" ":" "[" output_options_list_content "]" + output_options_list ::= "output-options" ":" "[" output_options_list_content "]" output_options_list_content ::= output_entry | output_options_list_content "," output_entry diff --git a/doc/sphinx/grammar/grammar-netconf-parser.rst b/doc/sphinx/grammar/grammar-netconf-parser.rst index 0594706aa2..e10ac8f58f 100644 --- a/doc/sphinx/grammar/grammar-netconf-parser.rst +++ b/doc/sphinx/grammar/grammar-netconf-parser.rst @@ -191,7 +191,7 @@ This grammar is generated from ``netconf_parser.yy``. See :ref:`netconf` for mor severity ::= "severity" ":" STRING - output_options_list ::= "output_options" ":" "[" output_options_list_content "]" + output_options_list ::= "output-options" ":" "[" output_options_list_content "]" output_options_list_content ::= output_entry | output_options_list_content "," output_entry