[#644,!370] Manual apply of f260b51148b4f7584165e13fcf2320fdd5992a74 to rst

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 9a014d19dbb28d0a86ea041a714508be43e41819..4c469f9f29dc65a2f6f68ee775cb9b7838472a5d 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -1060,6 +1060,34 @@ This identifier will not change for this subnet unless the "id"
 parameter is removed or set to 0. The value of 0 forces auto-generation
 of the subnet identifier.
 
+.. _ipv4-subnet-prefix:
+
+IPv4 Subnet Prefix
+------------------
+
+The subnet prefix is the second way to identify a subnet. It does not
+need to have the address part to match the prefix length, for instance
+this configuration is accepted:
+
+::
+
+"Dhcp4": {
+   "subnet4": [
+       {
+          "subnet": "192.0.2.1/24",
+           ...
+       }
+   ]
+}
+
+Even there is another subnet with the "192.0.2.0/24" prefix: only the
+textual form of subnets are compared to avoid duplicates.
+
+.. note::
+
+    Abuse of this feature can lead to incorrect subnet selection
+    (see :ref:`dhcp4-subnet-selection`).
+
 .. _dhcp4-address-config:
 
 Configuration of IPv4 Address Pools

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index ce2adc7e5bf6424854d9ca09b0506bc2c7e3ceaf..2565718864b344d09b57093a0c3322171737a1d3 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -822,6 +822,34 @@ This identifier will not change for this subnet unless the "id"
 parameter is removed or set to 0. The value of 0 forces auto-generation
 of the subnet identifier.
 
+.. _ipv6-subnet-prefix:
+
+IPv6 Subnet Prefix
+------------------
+
+The subnet prefix is the second way to identify a subnet. It does not
+need to have the address part to match the prefix length, for instance
+this configuration is accepted:
+
+::
+
+"Dhcp6": {
+   "subnet6": [
+       {
+            "subnet": "2001:db8:1::1/64",
+            ...
+        }
+    ]
+}
+
+Even there is another subnet with the "2001:db8:1::/64" prefix:
+only the textual form of subnets are compared to avoid duplicates.
+
+.. note::
+
+Abuse of this feature can lead to incorrect subnet selection
+(see :ref:`dhcp6-config-subnets`).
+
 .. _dhcp6-unicast:
 
 Unicast Traffic Support