BIND 10 trac1486, updated. 2f15c7833baf7c67d20df974093db92acb0ae09c [1486] Merge branch 'master' into trac1486

[BIND 10 source code commits]

The branch, trac1486 has been updated
       via  2f15c7833baf7c67d20df974093db92acb0ae09c (commit)
       via  ac0d3badda51a5bb268e92ee3d0f61a5ce519f12 (commit)
       via  3d36fed3067cec991af53e2588220c7259021ce5 (commit)
       via  a9ed9aeccda0cb876e09d6a1bb86e4405fc970d0 (commit)
       via  82bf3de5bba1230234b00b1c6283da0653bd90ce (commit)
      from  fab53a075c7817cf2e8bfe06e76851d81c3e0d5c (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 2f15c7833baf7c67d20df974093db92acb0ae09c
Merge: fab53a0 ac0d3ba
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Nov 22 11:49:16 2012 +0000

    [1486] Merge branch 'master' into trac1486

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

Summary of changes:
 Makefile.am                |    7 +++++++
 README                     |    6 ++++--
 doc/guide/bind10-guide.xml |   11 ++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 2f3ce85..fe995a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,13 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog README
 
 .PHONY: check-valgrind check-valgrind-suppress
 
+install-exec-hook:
+	- at echo -e "\033[1;33m" # switch to yellow color text
+	@echo "NOTE: BIND 10 does not automatically start DNS services when it is run"
+	@echo "      in its default configuration. Please see the Guide for information"
+	@echo "      on how to configure these services to be started automatically."
+	- at echo -e "\033[m" # switch back to normal
+
 check-valgrind:
 if HAVE_VALGRIND
 	@VALGRIND_COMMAND="$(VALGRIND) -q --gen-suppressions=all --track-origins=yes --num-callers=48 --leak-check=full --fullpath-after=" \
diff --git a/README b/README
index e9d052c..fdc11a1 100644
--- a/README
+++ b/README
@@ -58,5 +58,7 @@ For operating system specific tips see the wiki at:
 
 Please see the wiki and the doc/ directory for various documentation.
 
-The BIND 10 suite is started by running "bind10". Note that the
-default configuration does not run any DNS or DHCP servers.
+The BIND 10 suite is started by running "bind10". Note that the default
+configuration does not start any DNS or DHCP services.  Please see the
+Guide for information on how to configure these services to be started
+automatically.
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index d585b63..eec5bde 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -425,11 +425,12 @@ var/
         </listitem>
 
         <listitem>
-          <para>In another console, enable the authoritative DNS service
-            (by using the <command>bindctl</command> utility to configure
-            the <command>b10-auth</command> component to run):
-            <screen>$ <userinput>bindctl</userinput></screen>
-            (Login with the provided default username and password.)
+          <para>DNS and DHCP components are not started in the default
+	    configuration.  In another console, enable the authoritative
+	    DNS service (by using the <command>bindctl</command> utility
+	    to configure the <command>b10-auth</command> component to
+	    run): <screen>$ <userinput>bindctl</userinput></screen>
+	    (Login with the provided default username and password.)
             <screen>
 > <userinput>config add Boss/components b10-auth</userinput>
 > <userinput>config set Boss/components/b10-auth/special auth</userinput>