Changing some wordings, to be more precise or clear.

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

diff --git a/ChangeLog b/ChangeLog
index f494b04896d306c7e9d932af901bf2d5c3538aaf..1d3affbe63126e31fe7d98fdcaed76e89fad3e5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
        * Makefile.am: Trim the contents of EXTRA_DIST to what is required.
        * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Update
        the docs for the changed location of nano's search history.
+       * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Change
+       some wordings, triggered by Savannah bug #52539.
 
 2014-06-14  Mark Majeres  <mark@engine12.com>
        * src/nano.h, src/text.c (undo_cut, update_undo): When undoing a

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 51d4475871cb55cb3869d5c13ae6ff7fc05aee15..1854fc91949c2762ec5d6e0852b3f0a638981a68 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -68,18 +68,18 @@ Use bold text instead of reverse video text.
 Convert typed tabs to spaces.
 .TP
 .B \-F (\-\-multibuffer)
-Enable multiple file buffers, if available.
+Enable multiple file buffers (if support for them has been compiled in).
 .TP
 .B \-G (\-\-locking)
 Enable vim-style file locking when editing files.
 .TP
 .B \-H (\-\-historylog)
 Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
-retrieved in later sessions, if \fInanorc\fP support is available.
+retrieved in later sessions (if \fInanorc\fP support has been compiled in).
 .TP
 .B \-I (\-\-ignorercfiles)
-Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if
-\fInanorc\fP support is available.
+Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP
+(if \fInanorc\fP support has been compiled in).
 .TP
 .B \-K (\-\-rebindkeypad)
 Interpret the numeric keypad keys so that they all work properly.  You

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 9ed3ee9731b211934efe987f7a7149fb4e36b8b7..773f8afeba4e4b00bd43b2004cba46bb3c5421d8 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -586,7 +586,7 @@ Toggles whether typed tabs will be converted to spaces.
 Toggles whether a backup will be made of the file to be edited.
 .TP
 .B multibuffer
-Toggles the use of multiple file buffers (if available).
+Toggles the use of multiple file buffers (if support for them has been compiled in).
 .TP
 .B mouse
 Toggles mouse support.

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index b688142f179aef8ab0c19dc2e96686b3dff0daa7..c793ec02cbcf5540f6d17c7daa9d1ee54dc028b1 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -148,18 +148,18 @@ Use bold text instead of reverse video text.
 Convert typed tabs to spaces.
 
 @item -F, --multibuffer
-Enable multiple file buffers, if available.
+Enable multiple file buffers (if support for them has been compiled in).
 
 @item -G, --locking
 Enable vim-style file locking when editing files.
 
 @item -H, --historylog
 Log search and replace strings to ~/.nano/search_history, so they can be
-retrieved in later sessions, if nanorc support is available.
+retrieved in later sessions (if nanorc support has been compiled in).
 
 @item -I, --ignorercfiles
-Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
-available.
+Don't look at SYSCONFDIR/nanorc or ~/.nanorc
+(if nanorc support has been compiled in).
 
 @item -K, --rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
@@ -264,10 +264,10 @@ a chroot.
 
 @item -p, --preserve
 Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
-editor can be can be stopped and started.
+editor can be stopped and started.
 
 @item -q, --quiet
-Do not report errors in the nanorc file and ask them to be acknowledged
+Do not report errors in the nanorc file nor ask them to be acknowledged
 by pressing Enter at startup.
 
 @item -r <number>, --fill=<number>