[v9_8] backport doc fixes from master

diff --git a/bin/pkcs11/pkcs11-destroy.docbook b/bin/pkcs11/pkcs11-destroy.docbook
index be9539bf76ddcb3895a8bbe51678e06f684211c9..3ccd6b9d68563fef74f3e57d3813a4288a705f95 100644 (file)
--- a/bin/pkcs11/pkcs11-destroy.docbook
+++ b/bin/pkcs11/pkcs11-destroy.docbook
@@ -126,10 +126,10 @@
     <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>
     </para>
   </refsect1>

diff --git a/bin/pkcs11/pkcs11-list.docbook b/bin/pkcs11/pkcs11-list.docbook
index 9b1279299e9362d4d36b4992a99c8a0a2e8373d9..39493640240f753c4094b9898b62efec5371b24c 100644 (file)
--- a/bin/pkcs11/pkcs11-list.docbook
+++ b/bin/pkcs11/pkcs11-list.docbook
@@ -130,10 +130,10 @@
     <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>
     </para>
   </refsect1>

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 71728dfe31a010627beba6876b903fa7415b4eaa..4a13e0d504b6c85fae30976eb1bc73b5684e77d5 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2863,12 +2863,14 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.
                <para>
                  Integers may take values
                  0 &lt;= value &lt;= 18446744073709551615, though
-                 certain parameters may use a more limited range
-                 within these extremes.  In most cases, setting a
-                 value to 0 does not literally mean zero; it means
-                 "undefined" or "as big as psosible", depending on
-                 the context. See the expalantions of particular
-                 parameters that use <varname>size_spec</varname>
+                 certain parameters
+                 (such as <command>max-journal-size</command>) may
+                 use a more limited range within these extremes.
+                 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 explanations of particular parameters
+                 that use <varname>size_spec</varname>
                  for details on how they interpret its use. 
                </para>
                <para>
@@ -6964,7 +6966,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>
@@ -6972,12 +6974,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,
@@ -12728,8 +12730,7 @@ example.com. NS ns2.example.net.
                    <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/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 535d8bcdd55133250aaf7abdd62cd1c9e8f6fcb2..2f211845e1cb82fd5c80e67a0ee29468d0d73d07 100644 (file)
--- a/doc/arm/pkcs11.xml
+++ b/doc/arm/pkcs11.xml
@@ -68,12 +68,13 @@
         is an example of such a device.</para>
       </listitem>
     </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
-        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 1.0.0
-       and 1.0.1.
+    <para>
+      The modified OpenSSL code is included in the BIND 9 release,
+      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
+      1.0.0 and 1.0.1.
     </para>
     <note>
       The latest OpenSSL versions at the time of the BIND release

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 4ea1da57909b3970fe12ee8e5c1a0f1096609067..477a94b64bc072922c88fc2a12b59ff158961b8c 100644 (file)
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -121,7 +121,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 7d7ee4ca7893527d00e64ab1f125c8afa5842494..449240d52068c81719d05d3205bdeb78cb21f1b4 100644 (file)
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -128,7 +128,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 946a486f33b73fb37b64b9062c289a2bb731d671..ae1a905430b9a13448559c65503e3883120288b9 100644 (file)
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -154,7 +154,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.