[4274] Several minor corrections.

diff --git a/src/bin/dhcp4/dhcp4.dox b/src/bin/dhcp4/dhcp4.dox
index b1ec29c76f25a27781178f4e7765ef06feec7c8e..1663d5da8c13f9175803eca6b345f86cc451e06d 100644 (file)
--- a/src/bin/dhcp4/dhcp4.dox
+++ b/src/bin/dhcp4/dhcp4.dox
@@ -193,7 +193,7 @@ flags set.
 
 @todo Note: the current implementation doesn't allow configuration of the
 server's behavior with respect to DNS Updates. This is planned for the future.
-The default behavioris constituted by the set of constants defined in the
+The default behavior is constituted by the set of constants defined in the
 (upper part of) dhcp4_srv.cc file. Once the configuration is implemented,
 these constants will be removed.
 

diff --git a/src/bin/dhcp4/dhcp4o6.dox b/src/bin/dhcp4/dhcp4o6.dox
index e1de64f22e95dcc69715b9f45ce59436459d63be..10a97c0eccfab5d3f0969483b04584bdd6aaa465 100644 (file)
--- a/src/bin/dhcp4/dhcp4o6.dox
+++ b/src/bin/dhcp4/dhcp4o6.dox
@@ -8,7 +8,8 @@
  @page dhcpv4o6Dhcp4 DHCPv4-over-DHCPv6 DHCPv4 Server Side
 
 Kea supports DHCPv4-over-DHCPv6 using cooperating DHCPv6 and DHCPv4
-servers. This section describes the DHCPv4 server side.
+servers. This section describes the DHCPv4 server side. For its
+DHCPv6 counter-part, see @ref dhcpv4o6Dhcp6.
 
 @section Dhcp4to6Ipc DHCPv6-to-DHCPv4 Inter Process Communication
 

diff --git a/src/bin/dhcp6/dhcp4o6.dox b/src/bin/dhcp6/dhcp4o6.dox
index 94af1b9a1c00e8b94e6e9f36a8a9d69f4517adf7..ed71d712663732e3a7cc37bb2638fa0c32acc40b 100644 (file)
--- a/src/bin/dhcp6/dhcp4o6.dox
+++ b/src/bin/dhcp6/dhcp4o6.dox
@@ -8,7 +8,8 @@
  @page dhcpv4o6Dhcp6 DHCPv4-over-DHCPv6 DHCPv6 Server Side
 
 Kea supports DHCPv4-over-DHCPv6 using cooperating DHCPv6 and DHCPv4
-servers. This section describes the DHCPv6 server side.
+servers. This section describes the DHCPv6 server side. For its
+DHCPv6 counter-part, see @ref dhcpv4o6Dhcp4.
 
 @section dhcp6to4Ipc DHCPv6-to-DHCPv4 Inter Process Communication
 

diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h
index 596947546159d95bfd3028e1aeef5f50871ca897..12fc18baaad86916598de0ab87ec34717d02e775 100644 (file)
--- a/src/lib/dhcp/dhcp6.h
+++ b/src/lib/dhcp/dhcp6.h
@@ -188,7 +188,7 @@
 /* RFC 7341 */
 #define DHCPV6_DHCPV4_QUERY        20
 #define DHCPV6_DHCPV4_RESPONSE     21
-/* draft-ietf-dhc-dhcpv6-active-leasequery-04 */
+/* RFC 7653 */
 //#define DHCPV6_ACTIVELEASEQUERY    22
 //#define DHCPV6_STARTTLS            23
 

diff --git a/src/lib/dhcpsrv/libdhcpsrv.dox b/src/lib/dhcpsrv/libdhcpsrv.dox
index 17dc663b45b1cb29549ce4a9bc5441fc64571f7d..fcc2f511cc75dc22233d2c6d51194dbd87a53ef1 100644 (file)
--- a/src/lib/dhcpsrv/libdhcpsrv.dox
+++ b/src/lib/dhcpsrv/libdhcpsrv.dox
@@ -382,6 +382,9 @@ enterprise ID carrying interface and remote address suboptions.
 \ref isc::dhcp::Dhcp4o6IpcBase::send adds them,
 \ref isc::dhcp::Dhcp4o6IpcBase::receive decodes and removes them.
 
+Also see \ref dhcpv4o6Dhcp4 and \ref dhcpv4o6Dhcp6 for details on how IPC
+is used by DHCPv4 and DHCPv6 components.
+
 @todo
 
 DHCPv4-over-DHCPv6 which are relayed by a DHCPv6 relay are not yet supported.