BIND 10 master, updated. 98c723ce92f98e2982f61fbbb4c12b74c4aed87d Merge branch 'master' into trac1890

[BIND 10 source code commits]

The branch, master has been updated
       via  98c723ce92f98e2982f61fbbb4c12b74c4aed87d (commit)
       via  e8cabc67f199b59704c0064521ddd6fdaeb438d1 (commit)
      from  c5b7c61747858fb2fb34e62f4f04d4be663f7adb (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 98c723ce92f98e2982f61fbbb4c12b74c4aed87d
Merge: e8cabc6 c5b7c61
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 31 10:53:51 2012 +0530

    Merge branch 'master' into trac1890

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

Summary of changes:
 src/bin/bind10/bind10.8                       |    2 +-
 src/bin/bind10/bind10.xml                     |    2 +-
 src/bin/cfgmgr/b10-cfgmgr.8                   |    2 +-
 src/bin/cfgmgr/b10-cfgmgr.xml                 |    2 +-
 src/lib/python/isc/config/cfgmgr.py           |    2 +-
 src/lib/python/isc/config/cfgmgr_messages.mes |    9 +++++----
 6 files changed, 10 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10.8 b/src/bin/bind10/bind10.8
index 8d6e5ed..9e085e3 100644
--- a/src/bin/bind10/bind10.8
+++ b/src/bin/bind10/bind10.8
@@ -42,7 +42,7 @@ b10\-config\&.db\&.
 .RS 4
 This will create a backup of the existing configuration file, remove it and start
 b10\-cfgmgr(8)
-with the default configuration\&. The name of the backup file can be found in the logs (\fICFGMGR_RENAMED_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
+with the default configuration\&. The name of the backup file can be found in the logs (\fICFGMGR_BACKED_UP_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
 .RE
 .PP
 \fB\-\-cmdctl\-port\fR \fIport\fR
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index 60449de..4053783 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -116,7 +116,7 @@
 	    <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
             with the default configuration.
 	    The name of the backup file can be found in the logs
-	    (<varname>CFGMGR_RENAMED_CONFIG_FILE</varname>).
+	    (<varname>CFGMGR_BACKED_UP_CONFIG_FILE</varname>).
 	    (It will append a number to the backup filename if a
 	    previous backup file exists.)
 
diff --git a/src/bin/cfgmgr/b10-cfgmgr.8 b/src/bin/cfgmgr/b10-cfgmgr.8
index 0524d9b..83f7b7d 100644
--- a/src/bin/cfgmgr/b10-cfgmgr.8
+++ b/src/bin/cfgmgr/b10-cfgmgr.8
@@ -54,7 +54,7 @@ The arguments are as follows:
 .RS 4
 This will create a backup of the existing configuration file, remove it, and
 b10\-cfgmgr(8)
-will use the default configurations\&. The name of the backup file can be found in the logs (\fICFGMGR_RENAMED_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
+will use the default configurations\&. The name of the backup file can be found in the logs (\fICFGMGR_BACKED_UP_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
 .RE
 .PP
 \fB\-c\fR \fIconfig\-filename\fR, \fB\-\-config\-filename\fR \fIconfig\-filename\fR
diff --git a/src/bin/cfgmgr/b10-cfgmgr.xml b/src/bin/cfgmgr/b10-cfgmgr.xml
index f8d590b..202ea09 100644
--- a/src/bin/cfgmgr/b10-cfgmgr.xml
+++ b/src/bin/cfgmgr/b10-cfgmgr.xml
@@ -107,7 +107,7 @@
             <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
             will use the default configurations.
             The name of the backup file can be found in the logs
-            (<varname>CFGMGR_RENAMED_CONFIG_FILE</varname>).
+            (<varname>CFGMGR_BACKED_UP_CONFIG_FILE</varname>).
             (It will append a number to the backup filename if a
             previous backup file exists.)
           </para>
diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py
index 23e627e..aa0547b 100644
--- a/src/lib/python/isc/config/cfgmgr.py
+++ b/src/lib/python/isc/config/cfgmgr.py
@@ -167,7 +167,7 @@ class ConfigManagerData:
                 i += 1
             new_file_name = new_file_name + "." + str(i)
         if os.path.exists(old_file_name):
-            logger.info(CFGMGR_RENAMED_CONFIG_FILE, old_file_name, new_file_name)
+            logger.info(CFGMGR_BACKED_UP_CONFIG_FILE, old_file_name, new_file_name)
             os.rename(old_file_name, new_file_name)
 
     def __eq__(self, other):
diff --git a/src/lib/python/isc/config/cfgmgr_messages.mes b/src/lib/python/isc/config/cfgmgr_messages.mes
index e608594..e6cb352 100644
--- a/src/lib/python/isc/config/cfgmgr_messages.mes
+++ b/src/lib/python/isc/config/cfgmgr_messages.mes
@@ -55,10 +55,11 @@ error is given. The most likely cause is that the system does not have
 write access to the configuration database file. The updated
 configuration is not stored.
 
-% CFGMGR_RENAMED_CONFIG_FILE renamed configuration file %1 to %2, will create new %1
-BIND 10 has been started with the command to clear the configuration file.
-The existing file is backed up to the given file name, so that data is not
-immediately lost if this was done by accident.
+% CFGMGR_BACKED_UP_CONFIG_FILE Config file %1 was removed; a backup was made at %2
+BIND 10 has been started with the command to clear the configuration
+file.  The existing file has been backed up (moved) to the given file
+name. A new configuration file will be created in the original location
+when necessary.
 
 % CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
 There was a keyboard interrupt signal to stop the cfgmgr daemon. The