[#362,!182] Removed obsolete libdhcp secton

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 24cf170e2f1fce47fe6edee143e499b3cdf37c79..46945c4176b48c046a14875e9a6bc51d7beb7310 100644 (file)
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -8,7 +8,7 @@ dist_html_DATA = $(HTMLDOCS) kea-guide.css kea-logo-100x70.png
 DOCBOOK = kea-guide.xml intro.xml quickstart.xml install.xml admin.xml config.xml
 DOCBOOK += keactrl.xml dhcp4-srv.xml dhcp6-srv.xml lease-expiration.xml logging.xml
 DOCBOOK += ddns.xml hooks.xml hooks-class-cmds.xml hooks-ha.xml hooks-host-cache.xml
-DOCBOOK += hooks-lease-cmds.xml hooks-radius.xml hooks-stat-cmds.xml libdhcp.xml
+DOCBOOK += hooks-lease-cmds.xml hooks-radius.xml hooks-stat-cmds.xml
 DOCBOOK += lfc.xml stats.xml ctrl-channel.xml classify.xml shell.xml agent.xml
 DOCBOOK += netconf.xml api.xml congestion-handling.xml hammer.xml
 

diff --git a/doc/guide/kea-guide.xml b/doc/guide/kea-guide.xml
index 75ee86b9452fbc3f4199ccf59c24c8b40f056eba..73e689fc657917a532cc03272d728e7cbcddcf82 100644 (file)
--- a/doc/guide/kea-guide.xml
+++ b/doc/guide/kea-guide.xml
@@ -86,8 +86,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ctrl-channel.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdhcp.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logging.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shell.xml"/>

diff --git a/doc/guide/libdhcp.xml b/doc/guide/libdhcp.xml
deleted file mode 100644 (file)
index 5809156..0000000
--- a/doc/guide/libdhcp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, you can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<!-- Converted by db4-upgrade version 1.1 -->
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="libdhcp">
-    <title>The libdhcp++ Library</title>
-    <para>
-      libdhcp++ is a library written in C++ that handles
-      many DHCP-related tasks, including:
-      <itemizedlist>
-        <listitem>
-          <simpara>DHCPv4 and DHCPv6 packet parsing, manipulation, and assembly</simpara>
-        </listitem>
-        <listitem>
-          <simpara>Option parsing, manipulation, and assembly</simpara>
-        </listitem>
-        <listitem>
-          <simpara>Network interface detection</simpara>
-        </listitem>
-        <listitem>
-          <simpara>Socket operations such as creation, data transmission and reception, and socket closing</simpara>
-        </listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-    While this library is currently used by Kea, it is designed to
-    be a portable, universal library, useful for any DHCP-related software.
-    </para>
-
-<!-- TODO: point to doxygen docs -->
-
-    <section xml:id="iface-detect">
-      <title>Interface Detection and Socket Handling</title>
-      <para>Both the DHCPv4 and DHCPv6 components share network
-      interface detection routines. Interface detection is
-      currently supported on Linux, all BSD family (FreeBSD, NetBSD,
-      OpenBSD), Mac OS X, and Solaris 11 systems.</para>
-
-      <para>DHCPv4 requires special raw-socket processing to send and receive
-      packets from hosts that do not have an IPv4 address assigned. Support
-      for this operation is implemented on Linux, FreeBSD, NetBSD, and OpenBSD.
-      It is likely that the DHCPv4 component will not work in certain cases on
-      other systems.</para>
-    </section>
-
-<!--
-    <section id="packet-handling">
-      <title>DHCPv4/DHCPv6 Packet Handling</title>
-      <para>TODO: Describe packet handling here, with pointers to wiki</para>
-    </section>
--->
-
-  </chapter>