BIND 10 master, updated. da171d46c0a6f14f40c3730fd3d6ba34d4bf9dff Merge branch 'jreed-docs'

[BIND 10 source code commits]

The branch, master has been updated
       via  da171d46c0a6f14f40c3730fd3d6ba34d4bf9dff (commit)
       via  d351fe6ec30972595d70135cee24e6dd6d990d33 (commit)
       via  a697043708acddf2f9757615d173b514c98de9a4 (commit)
      from  38bc36c4027fdcfbe74891f11f030014a34b46dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da171d46c0a6f14f40c3730fd3d6ba34d4bf9dff
Merge: 38bc36c4027fdcfbe74891f11f030014a34b46dc d351fe6ec30972595d70135cee24e6dd6d990d33
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Feb 2 14:59:18 2011 -0600

    Merge branch 'jreed-docs'

-----------------------------------------------------------------------

Summary of changes:
 doc/guide/bind10-guide.xml  |    2 ++
 src/bin/auth/b10-auth.xml   |    2 +-
 src/bin/bind10/bind10.xml   |    2 +-
 src/bin/xfrin/b10-xfrin.xml |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 70f6a30..3670c46 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -982,6 +982,8 @@ accounts_file
       <para>
         The control commands are:
 print_settings
+<!-- TODO: remove that -->
+
 shutdown
       </para>
 <!-- TODO -->
diff --git a/src/bin/auth/b10-auth.xml b/src/bin/auth/b10-auth.xml
index 12e24bd..b22d24d 100644
--- a/src/bin/auth/b10-auth.xml
+++ b/src/bin/auth/b10-auth.xml
@@ -134,7 +134,7 @@
         <listitem><para>
           The port number it listens on.
           The default is 5300.</para>
-	  <note><simpara>The Y1 prototype runs on all interfaces
+	  <note><simpara>This prototype runs on all interfaces
 	  and on this nonstandard port.</simpara></note>
         </listitem>
       </varlistentry>
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index e672a42..dfc8acf 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -131,7 +131,7 @@
             daemon to listen on.
             The default is 5300.</para>
 <!-- TODO: -->
-	    <note><simpara>The Y1 prototype release uses a non-default
+	    <note><simpara>This prototype release uses a non-default
 	    port for domain service.</simpara></note>
          </listitem>
       </varlistentry>
diff --git a/src/bin/xfrin/b10-xfrin.xml b/src/bin/xfrin/b10-xfrin.xml
index 536ac83..fdfe1ef 100644
--- a/src/bin/xfrin/b10-xfrin.xml
+++ b/src/bin/xfrin/b10-xfrin.xml
@@ -63,7 +63,7 @@
     </para>
 
     <note><simpara>
-      The Y1 prototype release only supports AXFR. IXFR is not implemented.
+      This prototype release only supports AXFR. IXFR is not implemented.
     </simpara></note>
 
     <para>