[Nano-devel] [PATCH 08/15] docs: stop saying that --fill switches on automatic hard-wrapping

[Benno Schulenberg]

The two were decoupled in the previous commit.  Just say that --fill
sets the target width for both justifying and automatic hard-wrapping.
---
 doc/nano.1    | 13 ++++++-------
 doc/nano.texi | 26 ++++++++++++--------------
 doc/nanorc.5  | 12 ++++++------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/doc/nano.1 b/doc/nano.1
index 280a47be..e3bd0528 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -229,11 +229,11 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they 
will be caught
 by the terminal.
 .TP
 .BR \-r\ \fInumber ", " \-\-fill= \fInumber
-Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
-will occur at the width of the screen less \fInumber\fP columns, allowing
-the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is \-8.  This option conflicts with
-\fB\-w\fR (\fB\-\-nowrap\fR) -- the last one given takes effect.
+Set the target width for justifying and automatic hard-wrapping at this
+\fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus \fInumber\fR columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is \-8.
 .TP
 .BR \-s\ \fIprogram ", " \-\-speller= \fIprogram
 Use this alternative spell checker command.
@@ -252,8 +252,7 @@ This mode allows the user to open also other files for 
viewing,
 unless \fB--restricted\fR is given too.
 .TP
 .BR \-w ", " \-\-nowrap
-Disable the hard-wrapping of long lines.  This option conflicts with
-\fB\-r\fR (\fB\-\-fill\fR) -- the last one given takes effect.
+Do not automatically hard-wrap the current line when it becomes overlong.
 .TP
 .BR \-x ", " \-\-nohelp
 Don't show the two help lines at the bottom of the screen.
diff --git a/doc/nano.texi b/doc/nano.texi
index 4141eec7..e638b794 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -348,12 +348,11 @@ sent to the editor can be stopped and started.
 
 @item -r @var{number}
 @itemx address@hidden
-Hard-wrap lines at column @var{number} (by inserting a newline character).
-If the given value is 0 or less, wrapping will occur at the width of
-the screen minus the given amount, allowing the wrapping width to
-vary along with the width of the screen if and when it is resized.
-The default value is @t{-8}.  This option conflicts with @option{-w}
-(@option{--nowrap}); the last one given takes effect.
+Set the target width for justifying and automatic hard-wrapping at this
address@hidden of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus @var{number} columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is @t{-8}.
 
 @address@hidden
 @item -s @var{program}
@@ -386,8 +385,7 @@ file permissions to implement a read-only file.)
 
 @item -w
 @itemx --nowrap
-Don't hard-wrap long lines at any length.  This option conflicts with
address@hidden (@option{--fill}); the last one given takes effect.
+Do not automatically hard-wrap the current line when it becomes overlong.
 
 @anchor{Expert Mode}
 @item -x
@@ -732,10 +730,11 @@ Use this color combination for the status bar when an 
error message is displayed
 @address@hidden functioncolor}} for valid color names.
 
 @item set fill @var{number}
-Hard-wrap lines at column number @var{number}.  If @var{number} is 0 or less,
-the maximum line length will be the screen width less @var{number} columns.
-The default value is @t{-8}.  This option conflicts with
address@hidden; the last one given takes effect.
+Set the target width for justifying and automatic hard-wrapping at this
address@hidden of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus @var{number} columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is @t{-8}.
 
 @address@hidden functioncolor}}
 @item set functioncolor @var{fgcolor},@var{bgcolor}
@@ -793,8 +792,7 @@ Don't pause between warnings at startup.  This means that 
only
 the last one will be visible (when there are multiple ones).
 
 @item set nowrap
-Don't hard-wrap text at all.  This option conflicts with
address@hidden; the last one given takes effect.
+Do not automatically hard-wrap the current line when it becomes overlong.
 
 @item set numbercolor @var{fgcolor},@var{bgcolor}
 Use this color combination for line numbers.
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 833c158b..b023b092 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -107,10 +107,11 @@ Use this color combination for the status bar when an 
error message is displayed
 See \fBset titlecolor\fR for valid color names.
 .TP
 .B set fill \fInumber\fR
-Hard-wrap lines at column number \fInumber\fR.  If \fInumber\fR is 0 or less,
-the maximum line length will be the screen width less \fInumber\fP columns.
-The default value is \fB\-8\fR.  This option conflicts with
-\fBnowrap\fR -- the last one given takes effect.
+Set the target width for justifying and automatic hard-wrapping at this
+\fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus \fInumber\fR columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is \-8.
 .TP
 .B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the function descriptions
@@ -165,8 +166,7 @@ Don't pause between warnings at startup.  This means that 
only
 the last one will be visible (when there are multiple ones).
 .TP
 .B set nowrap
-Don't hard-wrap text at all.  This option conflicts with
-\fBfill\fR -- the last one given takes effect.
+Do not automatically hard-wrap the current line when it becomes overlong.
 .TP
 .B set numbercolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for line numbers.
-- 
2.19.2