From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 21 Sep 2016 15:06:38 +0000 (+0200)
Subject: [5008] Small clarification and one @todo removed.
X-Git-Tag: trac5049_base~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=437697b81f2d5a3491148ff7595b9706eaae76a7;p=thirdparty%2Fkea.git

[5008] Small clarification and one @todo removed.
---

diff --git a/doc/guide/classify.xml b/doc/guide/classify.xml
index bba282e775..7ac3a09c92 100644
--- a/doc/guide/classify.xml
+++ b/doc/guide/classify.xml
@@ -509,14 +509,14 @@
 
       <listitem><para>
       Vendor option means Vendor-Identifying Vendor-specific Information
-      option (code 125, see
-      <ulink url="http://tools.ietf.org/html/rfc3925#section-4">Section 4 of RFC 3925</ulink>) in DHCPv4 and
-      Vendor-specific Information Option (code 17, defined in
+      option in DHCPv4 (code 125, see
+      <ulink url="http://tools.ietf.org/html/rfc3925#section-4">Section 4 of RFC 3925</ulink>) and
+      Vendor-specific Information Option in DHCPv6 (code 17, defined in
       <ulink url="https://tools.ietf.org/html/rfc3315#section-22.17">Section 22.17 of
-      RFC 3315</ulink>) in DHCPv6. Vendor class option means Vendor-Identifying Vendor
-      Class Option (code 124, see
+      RFC 3315</ulink>). Vendor class option means Vendor-Identifying Vendor
+      Class Option in DHCPv4 (code 124, see
       <ulink url="http://tools.ietf.org/html/rfc3925#section-3">Section 3 of RFC 3925</ulink>) in DHCPv4 and
-      Class Option (code 16, see
+      Class Option in DHCPv6 (code 16, see
       <ulink url="https://tools.ietf.org/html/rfc3315#section-22.16">Section 22.16 of RFC 3315</ulink>).
       Vendor options may
       have sub-options that are referenced by their codes. Vendor class
diff --git a/doc/guide/logging.xml b/doc/guide/logging.xml
index 82344bc309..ee3ea01de7 100644
--- a/doc/guide/logging.xml
+++ b/doc/guide/logging.xml
@@ -74,9 +74,10 @@
         configuration for zero or more loggers (including loggers used by the
         proprietary hooks libraries). If there are no loggers specified, the
         code will use default values: these cause Kea to log messages of INFO
-        severity or greater to standard output.
-        <!-- @todo: add reference to section about controlling default
-        behavior with env. variables, after #3591 is merged. -->
+        severity or greater to standard output. There's also a small
+	time window after Kea is started, but has not yet read its
+	configuration. Logging in this short period can be controlled
+	using environment variables. For details, see <xref linkend="logging-during-startup"></xref>.
       </para>
 
       <para>
@@ -779,7 +780,7 @@
       </para>
     </section>
 
-    <section>
+    <section id="logging-during-startup">
       <title>Logging During Kea Startup</title>
       <para>
         The logging configuration is specified in the configuration file.