add documentation updates for -E/--backupdir's new ability to make

filenames unique, and preemptively update the version number

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2567 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 5f5f35d10d255b76495a2f045db0d3957cdd9a5e..a8ea47df4fd1ce6c79f834d1e6b9dee4f21655c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,8 +37,9 @@ CVS code -
          replace_line(), and mallocstrncpy(). (DLR)
        - When using a backup directory, make sure all the filenames
          written are unique by using get_next_filename() when
-         necessary.  Changes to get_next_filename(), write_file(), and
-         die(). (DLR, suggested by James Collings)
+         necessary.  Changes to get_next_filename(), write_file(),
+         die(), usage(), nano.1, nanorc.5, nanorc.sample, and
+         nano.texi. (DLR, suggested by James Collings)
 - cut.c:
   cut_line()
        - Set placewewant properly after cutting a line, to avoid a

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index a190f6bf844b2e7e86cc224672d84629293f7b8c..c1cb667913ca23f06a1e01b6dcaca1e69b0b12db 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.7" "May 16, 2005"
+.TH NANO 1 "version 1.3.8" "May 29, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -51,8 +51,8 @@ When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 .TP
 .B \-E \fIdir\fP (\-\-backupdir=\fIdir\fP)
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
 .TP
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers, if available.

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index fb98b2ccc275317197cbce9a8a435bd2c66891c7..0b1e9e125f3a6d929699fef681caead8c64085b2 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.7" "March 26, 2005"
+.TH NANORC 5 "version 1.3.8" "May 29, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -49,8 +49,8 @@ Create backup files in
 .IR filename~ .
 .TP
 \fBset backupdir "\fIdirectory\fP"\fP
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
 \fBset brackets "\fIstring\fP"\fP
 Set the characters treated as closing brackets.  They cannot contain
 tabs or spaces.  Only closing punctuation, optionally followed by

diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 4b1d8b76feeef8d8016948d6787fef8ede5f55f3..632f296ff885de55ac9d42eb14d25e5bd3355501 100644 (file)
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -14,7 +14,7 @@
 ## Backup files to filename~.
 # set backup
 
-## The directory to put the backup files in.
+## The directory to put unique backup files in.
 # set backupdir ""
 
 ## The characters treated as closing brackets.  They cannot contain tabs

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 674ace7b9a6726aa1f241890d385df190fda20ef..b119a94554805fdfa0618fc1ab69f05dd28f9b71 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.3.7
-@set UPDATED 16 May 2005
+@set VERSION 1.3.8
+@set UPDATED 29 May 2005
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.3.7
+@subtitle version 1.3.8
 
 @author Chris Allegretta
 @page
@@ -125,7 +125,7 @@ When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 
 @item -E, --backupdir=[dir]
-Set the directory where @code{nano} puts the backup files if file
+Set the directory where @code{nano} puts unique backup files if file
 backups are enabled.
 
 @item -F, --multibuffer

diff --git a/src/nano.c b/src/nano.c
index 1471380e70721ddcdfb295589b1c7996864af3d2..1fa27a33e7bbb3eb0d272fe2378cb6cfe0d3cde0 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1015,9 +1015,9 @@ void usage(void)
        N_("Start at line LINE, column COLUMN"));
 #ifndef NANO_SMALL
     print1opt("-A", "--smarthome", N_("Enable smart home key"));
-    print1opt("-B", "--backup", N_("Backup existing files on save"));
+    print1opt("-B", "--backup", N_("Save backups of existing files"));
     print1opt(_("-E [dir]"), _("--backupdir=[dir]"),
-       N_("Directory for writing backup files"));
+       N_("Directory for saving unique backup files"));
 #endif
 #ifdef ENABLE_MULTIBUFFER
     print1opt("-F", "--multibuffer", N_("Enable multiple file buffers"));