[v9_10] backport doc fixes from master

diff --git a/README b/README
index 1715582a0e245828c0b6bd7ee994dcc01301850d..9febac91028ab1ca789e543ccb922cc04b917538 100644 (file)
--- a/README
+++ b/README
@@ -122,7 +122,7 @@ BIND 9.10.0
           browsers.
         - The statistics channel can now provide data in JSON
           format as well as XML.
-        - New stats counters track TCP and UDP queries recieved
+        - New stats counters track TCP and UDP queries received
           per zone, and EDNS options received in total.
         - The internal and export versions of the BIND libraries
           (libisc, libdns, etc) have been unified so that external

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7c8971bf7d232e6b8e7254010118bdb2883c6d0b..eb51eadd29795f87a23fb39b853ff534c1f0e26e 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -834,7 +834,7 @@
          <term><option>+[no]subnet=addr/prefix</option></term>
          <listitem>
            <para>
-             Send an EDNS Client Subnet option with the speciifed
+             Send an EDNS Client Subnet option with the specified
              IP address or network prefix.
            </para>
          </listitem>

diff --git a/bin/pkcs11/pkcs11-destroy.docbook b/bin/pkcs11/pkcs11-destroy.docbook
index 2931d953eaf283024dc6e1bc47b3ceeb2318787f..1cf5e2c763253a5b3d6c2b10e247c01e96aeb413 100644 (file)
--- a/bin/pkcs11/pkcs11-destroy.docbook
+++ b/bin/pkcs11/pkcs11-destroy.docbook
@@ -138,10 +138,13 @@
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
-        <refentrytitle>pkcs11-list</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-keygen</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pkcs11-keygen</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-list</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pkcs11-tokens</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
     </para>
   </refsect1>

diff --git a/bin/pkcs11/pkcs11-keygen.docbook b/bin/pkcs11/pkcs11-keygen.docbook
index 0d858d983ae34497b1be156d07088e384531d976..dd1e32c75a38c63ca1b8a38455043a07cab9023b 100644 (file)
--- a/bin/pkcs11/pkcs11-keygen.docbook
+++ b/bin/pkcs11/pkcs11-keygen.docbook
@@ -17,13 +17,13 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<refentry id="man.pkcs11-ecgen">
+<refentry id="man.pkcs11-keygen">
   <refentryinfo>
     <date>January 15, 2014</date>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle><application>pkcs11-ecgen</application></refentrytitle>
+    <refentrytitle><application>pkcs11-keygen</application></refentrytitle>
     <manvolnum>8</manvolnum>
     <refmiscinfo>BIND9</refmiscinfo>
   </refmeta>
@@ -142,7 +142,7 @@
         <listitem>
           <para>
             Specify the PIN for the device.  If no PIN is provided on
-            the command line, <command>pkcs11-ecgen</command> will
+            the command line, <command>pkcs11-keygen</command> will
             prompt for it.
           </para>
         </listitem>
@@ -185,20 +185,17 @@
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
-        <refentrytitle>pkcs11-rsagen</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-destroy</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pkcs11-dsagen</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-list</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pkcs11-list</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-tokens</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pkcs11-destroy</refentrytitle><manvolnum>3</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-        <refentrytitle>dnssec-keyfromlabel</refentrytitle><manvolnum>3</manvolnum>
-      </citerefentry>,
+        <refentrytitle>dnssec-keyfromlabel</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
     </para>
   </refsect1>
 

diff --git a/bin/pkcs11/pkcs11-list.docbook b/bin/pkcs11/pkcs11-list.docbook
index 9b1279299e9362d4d36b4992a99c8a0a2e8373d9..c5b6f7847b2e8852dc5b0957eea0dcb26f39fc79 100644 (file)
--- a/bin/pkcs11/pkcs11-list.docbook
+++ b/bin/pkcs11/pkcs11-list.docbook
@@ -130,10 +130,13 @@
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
-        <refentrytitle>pkcs11-keygen</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-destroy</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-        <refentrytitle>pkcs11-destroy</refentrytitle><manvolnum>3</manvolnum>
+        <refentrytitle>pkcs11-keygen</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pkcs11-tokens</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
     </para>
   </refsect1>

diff --git a/bin/pkcs11/pkcs11-tokens.docbook b/bin/pkcs11/pkcs11-tokens.docbook
index d306f0d3e90ae62b573ddcb2c3b10e0f54ba8419..de3b658ca01ef4006c822a9115ab0f94f1cd87dc 100644 (file)
--- a/bin/pkcs11/pkcs11-tokens.docbook
+++ b/bin/pkcs11/pkcs11-tokens.docbook
@@ -72,6 +72,21 @@
     </variablelist>
   </refsect1>
 
+  <refsect1>
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+        <refentrytitle>pkcs11-destroy</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pkcs11-keygen</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
+      <citerefentry>
+        <refentrytitle>pkcs11-list</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+
   <refsect1>
     <title>AUTHOR</title>
     <para><corpauthor>Internet Systems Consortium</corpauthor>

diff --git a/bin/python/dnssec-coverage.docbook b/bin/python/dnssec-coverage.docbook
index 50997339baf6d1c0f213f515fe4e26eccbd56edf..7f335f324731ddfc5dca7da580e6c0dc66e041c5 100644 (file)
--- a/bin/python/dnssec-coverage.docbook
+++ b/bin/python/dnssec-coverage.docbook
@@ -150,7 +150,7 @@
           <para>
             This option is mandatory unless the <option>-f</option> has
             been used to specify a zone file.  (If <option>-f</option> has
-            been specified, this option may still be used; it will overrde
+            been specified, this option may still be used; it will override
             the value found in the file.)
           </para>
         </listitem>
@@ -179,7 +179,7 @@
             been used to specify a zone file, or a default key TTL was
             set with the <option>-L</option> to
             <command>dnssec-keygen</command>.  (If either of those is true,
-            this option may still be used; it will overrde the value found
+            this option may still be used; it will override the value found
             in the zone or key file.)
           </para>
         </listitem>

diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index e53159d2b6ab632909f6a2d32bff8befacae61f5..9b78bb611eaf8742502f1a488b095d3f3f15f30f 100644 (file)
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -20,7 +20,7 @@
 
 <refentry id="man.rndc">
   <refentryinfo>
-    <date>February 07, 2014</date>
+    <date>August 15, 2014</date>
   </refentryinfo>
 
   <refmeta>
@@ -549,7 +549,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><userinput>flushtree</userinput> <optional>-all</optional> <replaceable>name</replaceable> <optional><replaceable>view</replaceable></optional> </term>
+        <term><userinput>flushtree</userinput> <replaceable>name</replaceable> <optional><replaceable>view</replaceable></optional> </term>
         <listitem>
           <para>
             Flushes the given name, and all of its subdomains,

diff --git a/bin/tests/system/geoip/data/README b/bin/tests/system/geoip/data/README
index 672959af0e3a506850edbc5eb3694b80d0515117..11f51e9a8ef899303521cd53b9a95178784dcb33 100644 (file)
--- a/bin/tests/system/geoip/data/README
+++ b/bin/tests/system/geoip/data/README
@@ -3,7 +3,7 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The data data files in this directory are sample GeoIP databases,
 generated from the corresponding CSV files.  Thanks to MaxMind, Inc.
-for assitance with producing these files.
+for assistance with producing these files.
 
 Unless otherwise noted, the databases only support IPv4:
 
@@ -18,7 +18,7 @@ GeoIPDoain.dat: Domain Name
 GeoIPASNum.dat: AS Number
 GeoIPNetSpeed.dat: Net Speed
 
-GeoIP.dat can also be egenerated using the open source 'geoip-csv-to-dat'
+GeoIP.dat can also be generated using the open source 'geoip-csv-to-dat'
 utility:
 
 $ geoip-csv-to-dat -i "BIND9 geoip test data v1" -o GeoIP.dat << EOF

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 7c81373aa5df05f6015848d63dc616cd512d7f55..ab502307a2828bcb724c41231a3a7ca72e6ca67b 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2900,7 +2900,7 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.
                  In most cases, setting a value to 0 does not
                  literally mean zero; it means "undefined" or
                  "as big as possible", depending on the context.
-                 See the expalantions of particular parameters
+                 See the explanations of particular parameters
                  that use <varname>size_spec</varname>
                  for details on how they interpret its use. 
                </para>
@@ -7311,7 +7311,7 @@ options {
                  than matching the case of the records entered in
                  the zone file.  This allows responses to exactly
                  match the query, which is required by some clients
-                 due to incorrect use of case-sensitive comparisions.
+                 due to incorrect use of case-sensitive comparisons.
                </para>
                <para>
                  Case-insensitive compression is <emphasis>always</emphasis>
@@ -7319,12 +7319,12 @@ options {
                  the client matches this ACL.
                </para>
                <para>
-                 There are circusmstances in which <command>named</command>
+                 There are circumstances in which <command>named</command>
                  will not preserve the case of owner names of records:
                  if a zone file defines records of different types with
                  the same name, but the capitalization of the name is
                  different (e.g., "www.example.com/A" and
-                 "WWW.EXAMPLE.COM/AAAA"), then all resposnes for that
+                 "WWW.EXAMPLE.COM/AAAA"), then all responses for that
                  name will use the <emphasis>first</emphasis> version
                  of the name that was used in the zone file.  This
                  limitation may be addressed in a future release.  However,
@@ -13896,8 +13896,7 @@ view external {
                    <para>
                      Each RR can have a TTL as the second
                      field in the RR, which will control how long other
-                     servers can cache
-                     the it.
+                     servers can cache it.
                    </para>
                  </entry>
                </row>

diff --git a/doc/arm/dlz.xml b/doc/arm/dlz.xml
index 22ec2e4bd7aa587b0776698d65c624679d842cdc..74a9f2a5004d9baffbfd16da5d4b6b844418d630 100644 (file)
--- a/doc/arm/dlz.xml
+++ b/doc/arm/dlz.xml
@@ -20,7 +20,7 @@
 <sect1 id="dlz-info">
   <title>DLZ (Dynamically Loadable Zones)</title>
   <para>
-    DLZ (Dynamically Loadable Zones) is an extention to BIND 9 that allows
+    DLZ (Dynamically Loadable Zones) is an extension to BIND 9 that allows
     zone data to be retrieved directly from an external database.  There is
     no required format or schema.  DLZ drivers exist for several different
     database backends including PostgreSQL, MySQL, and LDAP and can be

diff --git a/doc/arm/libdns.xml b/doc/arm/libdns.xml
index 6134ff6521f6d4bbb154223f101d320303727433..cf7b94350e9e7396210379193f1dc97eea95a5b9 100644 (file)
--- a/doc/arm/libdns.xml
+++ b/doc/arm/libdns.xml
@@ -270,7 +270,7 @@ $ <userinput>make</userinput>
   consists of a single domain name. Example:
   <literallayout>
   www.example.com
-  mx.examle.net
+  mx.example.net
   ns.xxx.example
 </literallayout>
   </listitem>

diff --git a/doc/arm/pkcs11.xml b/doc/arm/pkcs11.xml
index f1d011d15d3e7c0c23164df16023adb42096206a..9a4c2f4c6c3fb693692cf93b65718ce097dc21af 100644 (file)
--- a/doc/arm/pkcs11.xml
+++ b/doc/arm/pkcs11.xml
@@ -131,7 +131,7 @@ $ <userinput>./configure --enable-native-pkcs11 \
     </itemizedlist>
     <para>
       The modified OpenSSL code is included in the BIND 9 release,
-      in the form of a context diff against the latest verions of
+      in the form of a context diff against the latest versions of
       OpenSSL.  OpenSSL 0.9.8, 1.0.0, and 1.0.1 are supported; there are
       separate diffs for each version.  In the examples to follow,
       we use OpenSSL 0.9.8, but the same methods work with OpenSSL

diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index a6722075a506340f78147d8099361586d243155b..26723e5f0cabcf2e434bf4f8defc423a820e38d6 100644 (file)
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -63,7 +63,7 @@
       and address-to-hostname lookup services to applications by
       transmitting lookup requests to a resolver daemon
       <command>lwresd</command>
-      running on the local host. The resover daemon performs the
+      running on the local host. The resolver daemon performs the
       lookup using the DNS or possibly other name service protocols,
       and returns the results to the application through the library.
       The library and resolver daemon communicate using a simple

diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index 62c71446a612ede5aa168108310ac0885e33c970..8743696c123eca952cdd320455a061e84f4153c5 100644 (file)
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -120,7 +120,7 @@ void
       There are four main functions for the getaddrbyname opcode.
       One render function converts a getaddrbyname request structure —
       <type>lwres_gabnrequest_t</type> &mdash;
-      to the lighweight resolver's canonical format.
+      to the lightweight resolver's canonical format.
       It is complemented by a parse function that converts a packet in this
       canonical format to a getaddrbyname request structure.
       Another render function converts the getaddrbyname response structure

diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index 8cd763958ba6454b865c90e98c2fe4bfb76183a1..8f40990b478f8aa3b68d023b8dd9f20e6692abc4 100644 (file)
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -127,7 +127,7 @@ void
       There are four main functions for the no-op opcode.
       One render function converts a no-op request structure —
       <type>lwres_nooprequest_t</type> &mdash;
-      to the lighweight resolver's canonical format.
+      to the lightweight resolver's canonical format.
       It is complemented by a parse function that converts a packet in this
       canonical format to a no-op request structure.
       Another render function converts the no-op response structure &mdash;

diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index 5c6bc08d95356e4ac68596ceffbe9d8ed37bcb07..0a0c4704aa2da45ef539abb915b14e0c065b6515 100644 (file)
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -153,7 +153,7 @@ typedef struct {
     <para>
       The lightweight resolver uses
       <function>lwres_getaddrsbyname()</function> to perform
-      foward lookups.
+      forward lookups.
       Hostname <parameter>name</parameter> is looked up using the
       resolver
       context <parameter>ctx</parameter> for memory allocation.