fix previous

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1551 e5f2f494-b856-4b98-b285-d166d9295462

doc/userguide/userguide.xml

@@ -535,8 +535,9 @@ var/
           and documentation, run:
           <screen>$ <userinput>make install</userinput></screen>
         </para>
-        <note><para>The install step may require superuser
+        <note>
-        privileges.</para></note>
+          <para>The install step may require superuserprivileges.</para>
+        </note>
 
       </section>
 
@@ -615,14 +616,13 @@ var/
   </chapter>
 
   <chapter id="bind10">
-    <title>Starting BIND10 with bind10</title>
+    <title>Starting BIND10 with <command>bind10</command></title>
     <para>
       BIND 10 provides the <command>bind10</command> command which 
-      starts up the required daemons to provide the message
+      starts up the required processes.
-      communication bus, configurations, <!-- TODO: security, -->
+      <command>bind10</command>
-      and the DNS server(s).
+      will also restart processes that exit unexpectedly.
-      Also known as BoB or the Boss of BIND, <command>bind10</command>
+      This is the only command needed to start the BIND 10 system.
-      will also restart processes that exit.
     </para>
 
     <para>
@@ -663,27 +663,32 @@ var/
 
       <para>
         The BIND 10 components use the <command>msgq</command>
-        message routing daemon to intercommunicate.
+        message routing daemon to communicate with other BIND 10 components.
-        This is called the <quote>Command Channel</quote>.
+        The <command>msgq</command> implements what is called the
-        The members of the channel subscribe to listen to certain
+        <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.
-      </para>
-
-      <note><simpara>
         This Command Channel is not used for DNS message passing.
-      </simpara></note>
+        It is used only to control and monitor the BIND 10 system.
+      </para>
 
       <para>
         Administrators do not communicate directly with the
-        <command>msgq</command> daemon. The only configuration is
+        <command>msgq</command> daemon.
-        to choose the port number it listens on.
         By default, BIND 10 uses port 9912 for the
         <command>msgq</command> service.
         It listens on 127.0.0.1.
       </para>
       
+      <para>
+        To select an alternate port for the <command>msgq</command> to
+        use, run <command>bind10</command> specifying the option:
+        <screen> $ <userinput>bind10 --msgq-port 9912</userinput></screen>
+      </para>
+
 <!-- TODO: upcoming plans:
 Unix domain sockets
 -->

src/lib/python/isc/cc/session.py

@@ -34,7 +34,8 @@ class Session:
         self._closed = False
         self._queue = []
 
-        if port == 0 and 'B10_FROM_SOURCE' in os.environ:
+        if port == 0:
+	  if 'B10_FROM_SOURCE' in os.environ:
 	    port = int(os.environ["ISC_MSGQ_PORT"])
 	  else:
 	    port = 9912