minor changes from Jeremy [RT #16869]

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 0198f4be7c37ddb2d43da627ed02f62042a23317..d4c5b8b7f87f82ba97cbc02391b792404e624e60 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.36 2007/05/09 06:18:44 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.37 2007/05/16 01:42:26 marka Exp $ -->
 <refentry id="man.dig">
 
   <refentryinfo>
@@ -216,7 +216,7 @@
       The default query class (IN for internet) is overridden by the
       <option>-c</option> option.  <parameter>class</parameter> is
       any valid
-      class, such as HS for Hesiod records or CH for CHAOSNET records.
+      class, such as HS for Hesiod records or CH for Chaosnet records.
     </para>
 
     <para>
@@ -536,7 +536,7 @@
           <term><option>+[no]cmd</option></term>
           <listitem>
             <para>
-              toggles the printing of the initial comment in the output
+              Toggles the printing of the initial comment in the output
               identifying
               the version of <command>dig</command> and the query
               options that have

diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 6d5b3369a50fd0b21098066f0313e265bd6e33e2..cb794127277fa92615131829d712afc1f89bcb3a 100644 (file)
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nslookup.docbook,v 1.14 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.15 2007/05/16 01:42:26 marka Exp $ -->
 <!--
  - Copyright (c) 1985, 1989
  -    The Regents of the University of California.  All rights reserved.
@@ -329,7 +329,7 @@ nslookup -query=hinfo  -timeout=10
                 <listitem>
                   <para>
                     Turn debugging mode on or off.  This displays more about
-                   about what nslookup is doing.
+                   what nslookup is doing.
                   </para>
                  <para>
                     (Default = nod2)

diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 6c287ab40381cc63b7bbc821e1b65a63ce6eac9f..8a15f183dcc3708eb4696dc49ad15791216f7a10 100644 (file)
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwresd.docbook,v 1.13 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: lwresd.docbook,v 1.14 2007/05/16 01:42:26 marka Exp $ -->
 <refentry>
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -52,11 +52,13 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>lwresd</command>
+      <arg><option>-c <replaceable class="parameter">config-file</replaceable></option></arg>
       <arg><option>-C <replaceable class="parameter">config-file</replaceable></option></arg>
       <arg><option>-d <replaceable class="parameter">debug-level</replaceable></option></arg>
       <arg><option>-f</option></arg>
       <arg><option>-g</option></arg>
       <arg><option>-i <replaceable class="parameter">pid-file</replaceable></option></arg>
+      <arg><option>-m <replaceable class="parameter">flag</replaceable></option></arg>
       <arg><option>-n <replaceable class="parameter">#cpus</replaceable></option></arg>
       <arg><option>-P <replaceable class="parameter">port</replaceable></option></arg>
       <arg><option>-p <replaceable class="parameter">port</replaceable></option></arg>
@@ -64,6 +66,8 @@
       <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg>
       <arg><option>-u <replaceable class="parameter">user</replaceable></option></arg>
       <arg><option>-v</option></arg>
+      <arg><option>-4</option></arg>
+      <arg><option>-6</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -109,6 +113,43 @@
     <title>OPTIONS</title>
 
     <variablelist>
+
+      <varlistentry>
+        <term>-4</term>
+        <listitem>
+          <para>
+            Use IPv4 only even if the host machine is capable of IPv6.
+            <option>-4</option> and <option>-6</option> are mutually
+            exclusive.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-6</term>
+        <listitem>
+          <para>
+            Use IPv6 only even if the host machine is capable of IPv4.
+            <option>-4</option> and <option>-6</option> are mutually
+            exclusive.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <!-- this is in source but not mentioned? does this matter? -->
+      <varlistentry>
+        <term>-c <replaceable class="parameter">config-file</replaceable></term>
+        <listitem>
+          <para>
+            Use <replaceable class="parameter">config-file</replaceable> as the
+            configuration file instead of the default,
+            <filename>/etc/lwresd.conf</filename>.
+           <!-- Should this be an absolute path name? -->
+           <term>-c</term> can not be used with <term>-C</term>.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-C <replaceable class="parameter">config-file</replaceable></term>
         <listitem>
@@ -116,6 +157,7 @@
             Use <replaceable class="parameter">config-file</replaceable> as the
             configuration file instead of the default,
             <filename>/etc/resolv.conf</filename>.
+           <term>-C</term> can not be used with <term>-c</term>.
           </para>
         </listitem>
       </varlistentry>
@@ -150,6 +192,33 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>-i <replaceable class="parameter">pid-file</replaceable></term>
+        <listitem>
+          <para>
+            Use <replaceable class="parameter">pid-file</replaceable> as the
+            PID file instead of the default,
+            <filename>/var/run/lwresd.pid</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-m <replaceable class="parameter">flag</replaceable></term>
+        <listitem>
+          <para>
+            Turn on memory usage debugging flags.  Possible flags are
+            <replaceable class="parameter">usage</replaceable>,
+            <replaceable class="parameter">trace</replaceable>,
+            <replaceable class="parameter">record</replaceable>,
+            <replaceable class="parameter">size</replaceable>, and
+            <replaceable class="parameter">mctx</replaceable>.  
+            These correspond to the ISC_MEM_DEBUGXXXX flags described in
+            <filename>&lt;isc/mem.h&gt;</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-n <replaceable class="parameter">#cpus</replaceable></term>
         <listitem>

diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 7e76ef420f2bf841bb910cc5e658d87f97ee3d75..950f87382534654708779263d12b03e419f1d117 100644 (file)
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.16 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: named.docbook,v 1.17 2007/05/16 01:42:26 marka Exp $ -->
 <refentry id="man.named">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -60,6 +60,7 @@
       <arg><option>-d <replaceable class="parameter">debug-level</replaceable></option></arg>
       <arg><option>-f</option></arg>
       <arg><option>-g</option></arg>
+      <arg><option>-m <replaceable class="parameter">flag</replaceable></option></arg>
       <arg><option>-n <replaceable class="parameter">#cpus</replaceable></option></arg>
       <arg><option>-p <replaceable class="parameter">port</replaceable></option></arg>
       <arg><option>-s</option></arg>
@@ -158,6 +159,22 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>-m <replaceable class="parameter">flag</replaceable></term>
+        <listitem>
+          <para>
+           Turn on memory usage debugging flags.  Possible flags are
+           <replaceable class="parameter">usage</replaceable>,
+           <replaceable class="parameter">trace</replaceable>,
+           <replaceable class="parameter">record</replaceable>,
+           <replaceable class="parameter">size</replaceable>, and
+           <replaceable class="parameter">mctx</replaceable>.
+           These correspond to the ISC_MEM_DEBUGXXXX flags described in
+           <filename>&lt;isc/mem.h&gt;</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-n <replaceable class="parameter">#cpus</replaceable></term>
         <listitem>

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index c9b882e111af3eb35c86be19be43737c4d5cd881..b0233339359f620f177938304fb457e79523dff2 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.321 2007/05/08 07:14:42 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.322 2007/05/16 01:42:26 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -8529,7 +8529,7 @@ zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replacea
               a synonym for hesiod.
             </para>
             <para>
-              Another MIT development is CHAOSnet, a LAN protocol created
+              Another MIT development is Chaosnet, a LAN protocol created
               in the mid-1970s. Zone data for it can be specified with the <literal>CHAOS</literal> class.
             </para>
           </sect3>
@@ -9841,7 +9841,7 @@ zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replacea
                     </entry>
                     <entry colname="2">
                       <para>
-                        CHAOSnet, a LAN protocol created at MIT in the
+                        Chaosnet, a LAN protocol created at MIT in the
                         mid-1970s.
                         Rarely used for its historical purpose, but reused for
                         BIND's