BIND 10 trac3020, updated. 39a853b0f561e12604fcb31a2b3746d5d577071a [3020] Fix comments at the start of static.zone file

[BIND 10 source code commits]

The branch, trac3020 has been updated
       via  39a853b0f561e12604fcb31a2b3746d5d577071a (commit)
       via  456a43775ebd7982ba98f57286702c420f983cf5 (commit)
       via  5c56a768045e78576cc71346a5cf4de9f2a35a13 (commit)
       via  e21cb1dba24a85e7afea480562d2b7277050e0dc (commit)
      from  7915732b2210e5540a74041eb759b13af0f6c405 (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 39a853b0f561e12604fcb31a2b3746d5d577071a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 24 16:00:13 2013 +0530

    [3020] Fix comments at the start of static.zone file

commit 456a43775ebd7982ba98f57286702c420f983cf5
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 24 15:51:41 2013 +0530

    [3020] Update text that we assume the resolver is running on localhost

commit 5c56a768045e78576cc71346a5cf4de9f2a35a13
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Jul 24 15:49:47 2013 +0530

    [3020] Add text about re-enabling the static.zone file

commit e21cb1dba24a85e7afea480562d2b7277050e0dc
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Jul 24 15:45:34 2013 +0530

    [3020] Add a description for the static zone

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

Summary of changes:
 doc/guide/bind10-guide.xml      |   20 ++++++++++++++++----
 src/lib/datasrc/static.zone.pre |   12 ++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 4273862..bb6f22b 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -2641,10 +2641,20 @@ can use various data source backends.
 
       <section id='datasrc-static'>
         <title>Adding a static data source</title>
+
+	<para>
+	  BIND 10 includes a zone file named
+	  <filename>static.zone</filename> in the CH (Chaos) class for
+	  providing information about the server via the AUTHORS.BIND
+	  and VERSION.BIND TXT records. By default, this BIND zone is
+	  configured and its records are served.
+	</para>
+
         <para>
-          Assuming there is no existing static data source, here is how
-          you can add one, to serve the zones in
-          <filename>static.zone</filename> distributed with BIND 10.
+          If you have removed this zone from the configuration (e.g., by
+          using the commands in the previous section to disable the
+          "built-in data source"), here is how you can add it back to
+          serve the zones in the <filename>static.zone</filename> file.
         </para>
 
 	<para>First, add the CH class if it doesn't exist:
@@ -2662,7 +2672,9 @@ can use various data source backends.
 > <userinput>config set data_sources/classes/CH[0]/params {"BIND": "/usr/local/bind10/share/bind10/static.zone"}</userinput>
 > <userinput>config commit</userinput></screen>
 
-        Then, lookup the static data from <filename>static.zone</filename> to test it:
+        Then, lookup the static data from
+        <filename>static.zone</filename> to test it (assuming your
+        resolver is running on <command>localhost</command>):
 
           <screen>> <userinput>dig @localhost -c CH -t TXT version.bind</userinput>
 > <userinput>dig @localhost -c CH -t TXT authors.bind</userinput></screen>
diff --git a/src/lib/datasrc/static.zone.pre b/src/lib/datasrc/static.zone.pre
index 13c0c9d..8046410 100644
--- a/src/lib/datasrc/static.zone.pre
+++ b/src/lib/datasrc/static.zone.pre
@@ -1,10 +1,10 @@
-;; This is the content of the BIND./CH zone. It contains the version and
-;; authors (called VERSION.BIND. and AUTHORS.BIND.). You can add more or
-;; modify the zone. Then you can reload the zone by issuing the command
+;; This file contains records for the BIND./CH zone. It contains version
+;; (VERSION.BIND.) and authors (AUTHORS.BIND.) information. You can add
+;; more records or modify this zone file like any other zone file. If
+;; you modify this file, you can reload the zone by issuing the
+;; following command in the bindctl program:
 ;;
-;;   loadzone CH BIND
-;;
-;; in the bindctl.
+;;     Auth loadzone CH BIND
 
 ;; This is here mostly for technical reasons.
 BIND.           0   CH  SOA bind. authors.bind. 0 28800 7200 604800 86400