[master] ChangeLog updated after trac4102 merge.

diff --git a/ChangeLog b/ChangeLog
index 3382a3a6b8482d665682201483a840d7fca090fa..88f51fae7042542cccb1f1cae6dfc595a471b244 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1073.  [doc]           tomek
+       Developer's Guide updated with client classification text
+       and several clean-ups.
+       (Trac #4102, git ac33ebf7428ba5935d3302d000bed317716fabfe)
+
 1072.  [bug]           tmark
        The lease6 hardware address source value is now being properly populated.
        Prior to this the value stored with each IPv6 lease was always zero.

diff --git a/src/bin/dhcp4/dhcp4.dox b/src/bin/dhcp4/dhcp4.dox
index 3a8a3ff5450c69c835a94f8eedffa6d53eaf505d..a524bdc56322662d59c6e9d69b87ebce5a6b4b48 100644 (file)
--- a/src/bin/dhcp4/dhcp4.dox
+++ b/src/bin/dhcp4/dhcp4.dox
@@ -52,7 +52,7 @@ src/bin/dhcp4/json_config_parser.cc.
 @section dhcpv4ConfigInherit DHCPv4 configuration inheritance
 
 One notable useful feature of DHCP configuration is its parameter inheritance.
-For example, "renew-timer" value may be specified at a global scope and it then
+For example, the "renew-timer" value may be specified at a global scope and it then
 applies to all subnets. However, some subnets may have it overwritten with subnet
 specific values that takes precedence over global values that are considered
 defaults. The parameters inheritance is implemented by means of the "global