diff options
| author | Andrei Pavel <andrei@isc.org> | 2023-07-20 15:13:13 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2023-07-20 15:13:13 +0200 |
| commit | 1b65e12702f2f39a2bbae38b252b5ddfaf4c97ed (patch) | |
| tree | c1835820d40c5e1c44434342ea9f8f77747579e4 /doc/sphinx/grammar | |
| parent | [#2990] bump up library versions for 2.5.0 release (diff) | |
| download | kea-1b65e12702f2f39a2bbae38b252b5ddfaf4c97ed.tar.xz kea-1b65e12702f2f39a2bbae38b252b5ddfaf4c97ed.zip | |
[#2991] release changesKea-2.5.0
Diffstat (limited to 'doc/sphinx/grammar')
| -rw-r--r-- | doc/sphinx/grammar/grammar-dhcp4-parser.rst | 10 | ||||
| -rw-r--r-- | doc/sphinx/grammar/grammar-dhcp6-parser.rst | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/sphinx/grammar/grammar-dhcp4-parser.rst b/doc/sphinx/grammar/grammar-dhcp4-parser.rst index d4b7fb46f7..738bb44162 100644 --- a/doc/sphinx/grammar/grammar-dhcp4-parser.rst +++ b/doc/sphinx/grammar/grammar-dhcp4-parser.rst @@ -141,6 +141,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | store_extended_info | statistic_default_sample_count @@ -211,6 +212,13 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de ddns_use_conflict_resolution ::= "ddns-use-conflict-resolution" ":" BOOLEAN + ddns_conflict_resolution_mode ::= "ddns-conflict-resolution-mode" ":" ddns_conflict_resolution_mode_value + + ddns_conflict_resolution_mode_value ::= "check-with-dhcid" + | "no-check-with-dhcid" + | "check-exists-with-dhcid" + | "no-check-without-dhcid" + ddns_ttl_percent ::= "ddns-ttl-percent" ":" FLOAT hostname_char_set ::= "hostname-char-set" ":" STRING @@ -524,6 +532,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | hostname_char_set | hostname_char_replacement @@ -612,6 +621,7 @@ This grammar is generated from ``dhcp4_parser.yy``. See :ref:`dhcp4` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | hostname_char_set | hostname_char_replacement diff --git a/doc/sphinx/grammar/grammar-dhcp6-parser.rst b/doc/sphinx/grammar/grammar-dhcp6-parser.rst index 77b2e018b3..cebeec69f6 100644 --- a/doc/sphinx/grammar/grammar-dhcp6-parser.rst +++ b/doc/sphinx/grammar/grammar-dhcp6-parser.rst @@ -144,6 +144,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | store_extended_info | statistic_default_sample_count @@ -210,6 +211,13 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de ddns_use_conflict_resolution ::= "ddns-use-conflict-resolution" ":" BOOLEAN + ddns_conflict_resolution_mode ::= "ddns-conflict-resolution-mode" ":" ddns_conflict_resolution_mode_value + + ddns_conflict_resolution_mode_value ::= "check-with-dhcid" + | "no-check-with-dhcid" + | "check-exists-with-dhcid" + | "no-check-without-dhcid" + ddns_ttl_percent ::= "ddns-ttl-percent" ":" FLOAT hostname_char_set ::= "hostname-char-set" ":" STRING @@ -524,6 +532,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | store_extended_info | allocator @@ -610,6 +619,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de | ddns_qualifying_suffix | ddns_update_on_renew | ddns_use_conflict_resolution + | ddns_conflict_resolution_mode | ddns_ttl_percent | store_extended_info | allocator |