Increase the contrast between hard-wrapping and soft-wrapping

in the documentattion.

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

diff --git a/ChangeLog b/ChangeLog
index 4ae235ec3b34fb82ef03472908b04173b1be8b59..fd04c330ddec920688af4f73947033c79bce68bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2014-04-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c, src/help.c, src/text.c, src/browser.c: Remove
-        several unneeded double semicolons, and two relic comments.
+       several unneeded double semicolons, and two relic comments.
        * src/help.c (parse_help_input), src/browser.c (parse_browser_input):
        Make the Minus and Space keys work in the help viewer and file browser
        also when the PrevPage and NextPage functions are bound to meta-key
@@ -12,7 +12,9 @@
        make a user-defined shortcut appear in the two bottomlines without
        having to unbind the existing one first -- better feedback.
        * src/global.c(shortcut_init, flagtostr, strtosc): Put the two
-       wrapping toggles together and increase the contrast a bit.
+       wrapping toggles together and increase their contrast a bit.
+       * src/nano.c (usage), doc/man/nano{.1,rc.5}, doc/texinfo/nano.texi:
+       Increase the contrast between hard-wrapping and soft-wrapping.
 
 2014-04-22  Benno Schulenberg  <bensberg@justemail.net>
        * src/global.c (shortcut_init): Put the movement keys in the

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 139c073c32fdc5e3fb2e4cc773b58e6aec93e876..863a4ff65999fae21a7afba80d33e467434d57af 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -187,7 +187,7 @@ Do not report errors in the \fInanorc\fP file nor ask them to be
 acknowledged by pressing Enter at startup.
 .TP
 .B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
-Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
+Hard-wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
 will occur at the width of the screen less \fIcols\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.
@@ -207,7 +207,7 @@ shortcuts are Meta-U and Meta-E, respectively.
 View file (read only) mode.
 .TP
 .B \-w (\-\-nowrap)
-Disable wrapping of long lines.
+Disable the hard-wrapping of long lines.
 .TP
 .B \-x (\-\-nohelp)
 Disable help screen at bottom of editor.

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 72d87b1edd165aeb17b590ca67983b7660d82eba..44839262c47d3ebb510d4ffa7d286baa3772b3d4 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -94,7 +94,7 @@ Constantly display the cursor position in the status bar.
 Use cut to end of line by default.
 .TP
 .B set fill \fIn\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
+Hard-wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
 maximum line length will be the screen width less \fIn\fP columns.  The
 default value is \-8.
 .TP
@@ -136,7 +136,7 @@ Don't display the help lists at the bottom of the screen.
 Don't add newlines to the ends of files.
 .TP
 .B set/unset nowrap
-Don't wrap text at all.
+Don't hard-wrap text at all.
 .TP
 .B set operatingdir "\fIdirectory\fP"
 \fBnano\fP will only read and write files inside \fIdirectory\fP and its

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index a1a7c004f90958dc4bb5ea3a3a6cc1e1c0235685..a4db9cb7c125e2eca2598da2d70756f6b01f2866 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -265,10 +265,11 @@ Do not report errors in the nanorc file and ask them to be acknowledged
 by pressing Enter at startup.
 
 @item -r <#cols>, --fill=<#cols>
-Wrap lines at column #cols.  If this value is 0 or less, wrapping will
-occur at the width of the screen less #cols, allowing it to vary along
-with the width of the screen if the screen is resized.  The default
-value is -8.
+Hard-wrap lines at column #cols (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 -8.
 
 @item -s <prog>, --speller=<prog>
 Invoke the given program as the spell checker.  By default, @code{nano}
@@ -291,7 +292,7 @@ option should NOT be used in place of correct file permissions to
 implement a read-only file.
 
 @item -w, --nowrap
-Don't wrap long lines at any length.  This option overrides any value
+Don't hard-wrap long lines at any length.  This option overrides any value
 for -r.
 
 @anchor{Expert Mode}
@@ -308,8 +309,9 @@ Enable @code{nano}'s suspend ability using the system's suspend
 keystroke (usually ^Z).
 
 @item -$, --softwrap
-Enable 'soft wrapping'.  @code{nano} will attempt to display the entire
-contents of a line, even if it is longer than the screen width.  Since
+Enable 'soft wrapping'.  This will make @code{nano} attempt to display the
+entire contents of any line, even if it is longer than the screen width, by
+continuing it over multiple screen lines.  Since
 '$' normally refers to a variable in the Unix shell, you should specify
 this option last when using other options (e.g. 'nano -wS$') or pass it
 separately (e.g. 'nano -wS -$').
@@ -555,7 +557,7 @@ Constantly display the cursor position in the status bar.
 Use cut to end of line by default, instead of cutting the whole line.
 
 @item set fill "n"
-Wrap lines at column number "n".  If "n" is 0 or less, the maximum line
+Hard-wrap lines at column number "n".  If "n" is 0 or less, the maximum line
 length will be the screen width less "n" columns.  The default value is
 -8.
 
@@ -598,7 +600,7 @@ Don't display the help lists at the bottom of the screen.
 Don't add newlines to the ends of files.
 
 @item set/unset nowrap
-Don't wrap text at all.
+Don't hard-wrap text at all.
 
 @item set operatingdir "directory"
 @code{nano} will only read and write files inside "directory" and its
@@ -890,7 +892,7 @@ command-line option, which allows specifying an alternate spell checker.
 Disable the tab completion code when reading or writing files.
 
 @item --disable-wrapping
-Disable all long-line wrapping.  This also eliminates the -w
+Disable hard-wrapping of overlong lines.  This also eliminates the -w
 command-line option, which enables long-line wrapping.
 
 @item --enable-tiny
@@ -907,7 +909,8 @@ Disables Native Language support.  This will disable use of the
 available GNU @code{nano} translations.
 
 @item --disable-wrapping-as-root
-Disable long-line wrapping by default when @code{nano} is run as root.
+Disable hard-wrapping of overlong lines by default when @code{nano}
+is run as root.
 
 @item --enable-utf8
 Enable support for reading and writing Unicode files.  This will require

diff --git a/src/nano.c b/src/nano.c
index c779926719afd96884a11a7099807ef86b3b7c1d..03c9dcf5c8d635c5d9fab4fb598646b2ca00b5f7 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -926,7 +926,7 @@ void usage(void)
        N_("Silently ignore startup issues like rc file errors"));
 #ifndef DISABLE_WRAPJUSTIFY
     print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
-       N_("Set wrapping point at column #cols"));
+       N_("Set hard-wrapping point at column #cols"));
 #endif
 #ifndef DISABLE_SPELLER
     print_opt(_("-s <prog>"), _("--speller=<prog>"),
@@ -940,7 +940,7 @@ void usage(void)
 
     print_opt("-v", "--view", N_("View mode (read-only)"));
 #ifndef DISABLE_WRAPPING
-    print_opt("-w", "--nowrap", N_("Don't wrap long lines"));
+    print_opt("-w", "--nowrap", N_("Don't hard-wrap long lines"));
 #endif
     print_opt("-x", "--nohelp", N_("Don't show the two help lines"));
     print_opt("-z", "--suspend", N_("Enable suspension"));