Parcourir la source

[5008] Small clarification and one @todo removed.

Tomek Mrugalski il y a 8 ans
Parent
commit
437697b81f
2 fichiers modifiés avec 11 ajouts et 10 suppressions
  1. 6 6
      doc/guide/classify.xml
  2. 5 4
      doc/guide/logging.xml

+ 6 - 6
doc/guide/classify.xml

@@ -509,14 +509,14 @@
 
 
       <listitem><para>
       <listitem><para>
       Vendor option means Vendor-Identifying Vendor-specific Information
       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
       <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
       <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>).
       <ulink url="https://tools.ietf.org/html/rfc3315#section-22.16">Section 22.16 of RFC 3315</ulink>).
       Vendor options may
       Vendor options may
       have sub-options that are referenced by their codes. Vendor class
       have sub-options that are referenced by their codes. Vendor class

+ 5 - 4
doc/guide/logging.xml

@@ -74,9 +74,10 @@
         configuration for zero or more loggers (including loggers used by the
         configuration for zero or more loggers (including loggers used by the
         proprietary hooks libraries). If there are no loggers specified, the
         proprietary hooks libraries). If there are no loggers specified, the
         code will use default values: these cause Kea to log messages of INFO
         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>
 
 
       <para>
       <para>
@@ -779,7 +780,7 @@
       </para>
       </para>
     </section>
     </section>
 
 
-    <section>
+    <section id="logging-during-startup">
       <title>Logging During Kea Startup</title>
       <title>Logging During Kea Startup</title>
       <para>
       <para>
         The logging configuration is specified in the configuration file.
         The logging configuration is specified in the configuration file.