[1890] Clarify message shown when command to clear the config file is used

diff --git a/src/bin/bind10/bind10.8 b/src/bin/bind10/bind10.8
index 8d6e5edd120741e4af725399dfdd16e2b263cf9d..9e085e31cd962b8ec54a5806ad297d55fe6f7b6e 100644 (file)
--- 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 60449de8bd6bf627c3084c9c5dc0dbdb76324eae..40537830ecbd07cac739afc9b5e6707f208fe506 100644 (file)
--- 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 0524d9bf8c8b37ceab7a27ebc9b2cad4dc7695fe..83f7b7dc4b0f309257d33602383e45e7b1832189 100644 (file)
--- 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 f8d590b7cd582d03ea25f1980e70ca3935d71bc5..202ea09e8dbb7078a9069a2bc64463e4396074f9 100644 (file)
--- 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 23e627e0a101b715dc00f155c340a13386277f65..aa0547b25c96480b7ee3540b59784d27e5094ee9 100644 (file)
--- 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 e6085948d946bcee6f0236132eb66af870a64789..e6cb3524450a8ed5e67e63adb3bd4ba9acf18a97 100644 (file)
--- 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