diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index e2e4b7f381..49f400ecc4 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -678,7 +678,6 @@ implementation in BIND 10.
         <quote>Command Channel</quote>.
         Processes intercommunicate by sending messages on the command
         channel.
-        messages and are programmed to handle received messages.
         Example messages include shutdown, get configurations, and set
         configurations.
         This Command Channel is not used for DNS message passing.
@@ -709,16 +708,17 @@ Unix domain sockets
     <title>Configuration manager</title>
 
       <para>
-   The configuration manager, <command>b10-cfgmgr</command>,
-   handles all BIND 10 system configuration.  It provides
-   persistent storage for configuration, and notifies running
-   modules of configuration changes.</para>
+         The configuration manager, <command>b10-cfgmgr</command>,
+         handles all BIND 10 system configuration.  It provides
+         persistent storage for configuration, and notifies running
+         modules of configuration changes.
+      </para>
 
       <para>
-  The <command>b10-auth</command> and <command>b10-xfrin</command>
-  daemons and other components receive their configurations
-  from the configuration manager over the <command>msgq</command>
-  command channel.
+        The <command>b10-auth</command> and <command>b10-xfrin</command>
+        daemons and other components receive their configurations
+        from the configuration manager over the <command>msgq</command>
+        command channel.
       </para>
 
       <para>The administrator doesn't connect to it directly, but
@@ -728,19 +728,21 @@ Unix domain sockets
       </para>
 
 <!-- TODO -->
-      <note><para>
-  The Y1 prototype release only provides the
-  <command>bindctl</command> as a user interface to
-        <command>b10-cmdctl</command>.
-        Upcoming releases will provide another interactive command-line
-        interface and a web-based interface.
-      </para></note>
+      <note>
+        <para>
+          The Y1 prototype release only provides the
+          <command>bindctl</command> as a user interface to
+          <command>b10-cmdctl</command>.
+          Upcoming releases will provide another interactive command-line
+          interface and a web-based interface.
+        </para>
+      </note>
 
       <para>
         The <command>b10-cfgmgr</command> daemon can send all
         specifications and all current settings to the
-  <command>bindctl</command> client (via
-  <command>b10-cmdctl</command>).
+        <command>bindctl</command> client (via
+        <command>b10-cmdctl</command>).
       </para>
 
       <para>
@@ -765,10 +767,10 @@ config changes are actually commands to cfgmgr
         (The full path is what was defined at build configure time for
         <option>--localstatedir</option>.
         The default is <filename>/usr/local/var/</filename>.)
-  The format is loosely based on JSON and is directly parseable
-  python, but this may change in a future version.
-  This configuration data file is not manually edited by the
-  administrator.
+        The format is loosely based on JSON and is directly parseable
+        python, but this may change in a future version.
+        This configuration data file is not manually edited by the
+        administrator.
       </para>
 
 <!--