From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 16 Jun 2014 15:24:28 +0000 (+0000)
Subject: Changing some wordings, to be more precise or clear.
X-Git-Tag: v2.3.5~87
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7152a4b544a306a891ed17e4daeba00a3d29a129;p=nano.git

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 f494b048..1d3affbe 100644
--- 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 51d44758..1854fc91 100644
--- 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 9ed3ee97..773f8afe 100644
--- 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 b688142f..c793ec02 100644
--- 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>