BIND 10 master, updated. 4a7d63179ae732ede6bdc77c393a1cfd9b0b58ca [master] improve the resolver documentation

[BIND 10 source code commits]

The branch, master has been updated
       via  4a7d63179ae732ede6bdc77c393a1cfd9b0b58ca (commit)
       via  ba9f03b99b6e1dd46d9b11eb1bac629789c8f94a (commit)
      from  373a792a4706be2619dd1d1820f949858620bc77 (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 4a7d63179ae732ede6bdc77c393a1cfd9b0b58ca
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Aug 17 09:43:43 2011 -0500

    [master] improve the resolver documentation

commit ba9f03b99b6e1dd46d9b11eb1bac629789c8f94a
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Aug 17 09:42:59 2011 -0500

    [master] grammar

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

Summary of changes:
 doc/guide/bind10-guide.xml  |   20 ++++++++++++++------
 src/bin/xfrin/b10-xfrin.xml |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 021c593..d34746b 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -1370,7 +1370,7 @@ what is XfroutClient xfr_client??
 
     <para>
       The main <command>bind10</command> process can be configured
-      to select to run either the authoritative or resolver.
+      to select to run either the authoritative or resolver or both.
       By default, it starts the authoritative service.
 <!-- TODO: later both -->
 
@@ -1390,22 +1390,28 @@ what is XfroutClient xfr_client??
     </para>
 
     <para>
-      The resolver also needs to be configured to listen on an address
-      and port:
+      By default, the resolver listens on port 53 for 127.0.0.1 and ::1.
+      The following example shows how it can be configured to
+      listen on an additional address (and port):
 
       <screen>
-> <userinput>config set Resolver/listen_on [{ "address": "127.0.0.1", "port": 53 }]</userinput>
+> <userinput>config add Resolver/listen_on</userinput>
+> <userinput>config set Resolver/listen_on[<replaceable>2</replaceable>]/address "192.168.1.1"</userinput>
+> <userinput>config set Resolver/listen_on[<replaceable>2</replaceable>]/port 53</userinput>
 > <userinput>config commit</userinput>
 </screen>
     </para>
 
-<!-- TODO: later the above will have some defaults -->
+     <simpara>(Replace the <quote><replaceable>2</replaceable></quote>
+       as needed; run <quote><userinput>config show
+       Resolver/listen_on</userinput></quote> if needed.)</simpara>
+<!-- TODO: this example should not include the port, ticket #1185 -->
 
     <section>
       <title>Access Control</title>
 
       <para>
-        The <command>b10-resolver</command> daemon only accepts
+        By default, the <command>b10-resolver</command> daemon only accepts
         DNS queries from the localhost (127.0.0.1 and ::1).
         The <option>Resolver/query_acl</option> configuration may
 	be used to reject, drop, or allow specific IPs or networks.
@@ -1437,6 +1443,8 @@ url="bind10-messages.html#RESOLVER_QUERY_DROPPED">RESOLVER_QUERY_DROPPED</ulink>
 <!-- TODO:
 /0 is for any address in that address family
 does that need any address too?
+
+TODO: tsig
 -->
 
       <para>
diff --git a/src/bin/xfrin/b10-xfrin.xml b/src/bin/xfrin/b10-xfrin.xml
index a8fe425..17840fe 100644
--- a/src/bin/xfrin/b10-xfrin.xml
+++ b/src/bin/xfrin/b10-xfrin.xml
@@ -169,7 +169,7 @@ in separate zonemgr process.
       and <varname>port</varname> to define the port number on the
       authoritative server (defaults to 53).
       If the address or port is not specified, it will use the
-      values previously defined in the <varname>zones</varname>
+      value previously defined in the <varname>zones</varname>
       configuration.
      </para>
 <!-- TODO: later hostname for master? -->