Merge branch 'trac1367' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1367

ChangeLog

@@ -1,3 +1,9 @@
+3XX.	[doc]		tomek
+	BIND10 Guide updated. It now describes DHCPv4 and DHCPv6
+	components, including their overview, usage, supported standard
+	and limitations. libdhcp++ is also described.
+	(Trac #1367, git TBD)
+
 360.	[func] 		fdupont
 	Alpha version of DHCP benchmarking tool added.  "perfdhcp" is able to
 	test both IPv4 and IPv6 servers: it can time the four-packet exchange

doc/guide/Makefile.am

@@ -11,6 +11,8 @@ bind10-guide.html: bind10-guide.xml
 	xsltproc --novalid --xinclude --nonet \
 		--path $(top_builddir)/doc \
 		-o $@ \
+		--stringparam section.autolabel 1 \
+		--stringparam section.label.includes.component.label 1 \
 		--stringparam html.stylesheet $(srcdir)/bind10-guide.css \
 		http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
 		$(srcdir)/bind10-guide.xml

doc/guide/bind10-guide.xml

@@ -34,10 +34,12 @@
     </copyright>
 
     <abstract>
-      <para>BIND 10 is a Domain Name System (DNS) suite managed by
-        Internet Systems Consortium (ISC). It includes DNS libraries
-        and modular components for controlling authoritative and
-        recursive DNS servers.
+      <para>BIND 10 is a framework that features Domain Name System
+      (DNS) suite and Dynamic Host Configuration Protocol (DHCP)
+      servers managed by Internet Systems Consortium (ISC). It
+      includes DNS libraries, modular components for controlling
+      authoritative and recursive DNS servers, and experimental DHCPv4
+      and DHCPv6 servers.
       </para>
       <para>
         This is the reference guide for BIND 10 version &__VERSION__;.
@@ -3010,6 +3012,18 @@ Logging/loggers[0]/output_options[0]/maxver	8	integer	(modified)
 
   </chapter>
 
+<!-- TODO: acknolwedgements must be unnumbered -->
+
+  <chapter>
+    <title>Acknowledgements</title>
+    <para>ISC would like to acknowledge generous support for
+    development of DHCPv4 and DHCPv6 components provided by <ulink
+    url="http://www.comcast.com">Comcast</ulink>.</para>
+  </chapter>
+
+<!-- TODO: Add bibliography section (mostly RFCs, probably) -->
+
+
 <!-- TODO: how to help: run unit tests, join lists, review trac tickets -->
 
   <!-- <index>    <title>Index</title> </index> -->