Browse Source

[master] ChangeLog updated after trac4102 merge.

Tomek Mrugalski 9 years ago
parent
commit
4f3f0eb44c
2 changed files with 6 additions and 1 deletions
  1. 5 0
      ChangeLog
  2. 1 1
      src/bin/dhcp4/dhcp4.dox

+ 5 - 0
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.

+ 1 - 1
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