nano

commit 327025018466a302024e90b97b6dfb59d061935d
parent cb7c8255f4476a9c59246c2e484c7c056ed78482
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Wed, 30 Jan 2019 21:01:53 +0100

docs: mention that --morespace and --smooth are obsolete and ignored

Diffstat:
M
doc/nano.1
 | 
12
++++++++----
M
doc/nano.texi
 | 
12
++++++++----

2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/doc/nano.1 b/doc/nano.1
@@ -109,6 +109,7 @@ mouse support.
 .TP
 .BR \-L ", " \-\-nonewlines
 Don't automatically add a newline when a file does not end with one.
+(This is the default.)
 .TP
 .BR \-M ", " \-\-trimblanks
 Snip trailing whitespace from the wrapped line when automatic
@@ -118,7 +119,9 @@ hard-wrapping occurs or when text is justified.
 Disable automatic conversion of files from DOS/Mac format.
 .TP
 .BR \-O ", " \-\-morespace
-Use the blank line below the title bar as extra editing space.
+Obsolete and ignored option, since the line below the title bar is included
+into the editing space by default.  If you prefer to keep this line blank,
+use \fB\-e\fR or \fB\-\-emptyline\fR.
 .TP
 .BR \-P ", " \-\-positionlog
 For the 200 most recent files, log the last position of the cursor,
@@ -141,8 +144,9 @@ Restricted mode can also be activated by invoking \fBnano\fP
 with any name beginning with 'r' (e.g. "rnano").
 .TP
 .BR \-S ", " \-\-smooth
-Use smooth scrolling: text will scroll line-by-line, instead of the
-usual chunk-by-chunk behavior.
+Obsolete and ignored option, since smooth scrolling has become the default.
+If you prefer the chunk-by-chunk scrolling behavior,
+use \fB\-j\fR or \fB\-\-jumpyscrolling\fR.
 .TP
 .BR \-T\ \fInumber ", " \-\-tabsize= \fInumber
 Set the size (width) of a tab to \fInumber\fP columns.  The value of
@@ -269,7 +273,7 @@ unless \fB--restricted\fR is given too.
 .TP
 .BR \-w ", " \-\-nowrap
 Do not automatically hard-wrap the current line when it becomes overlong.
-This is the default.
+(This is the default.)
 .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
@@ -200,6 +200,7 @@ mouse support.
 @item -L
 @itemx --nonewlines
 Don't automatically add a newline when a file does not end with one.
+(This is the default.)
 
 @item -M
 @itemx --trimblanks
@@ -212,7 +213,9 @@ Disable automatic conversion of files from DOS/Mac format.
 
 @item -O
 @itemx --morespace
-Use the blank line below the title bar as extra editing space.
+Obsolete and ignored option, since the line below the title bar is included
+into the editing space by default.  If you prefer to keep this line blank,
+use @option{-e} or @option{--emptyline}.
 
 @item -P
 @itemx --positionlog
@@ -239,8 +242,9 @@ any name beginning with @code{r} (e.g.@: @command{rnano}).
 
 @item -S
 @itemx --smooth
-Enable smooth scrolling.  Text will scroll line-by-line, instead of the
-usual chunk-by-chunk behavior.
+Obsolete and ignored option, since smooth scrolling has become the default.
+If you prefer the chunk-by-chunk scrolling behavior,
+use @option{-j} or @option{--jumpyscrolling}.
 
 @item -T @var{number}
 @itemx --tabsize=@var{number}
@@ -406,7 +410,7 @@ file permissions to implement a read-only file.)
 @item -w
 @itemx --nowrap
 Do not automatically hard-wrap the current line when it becomes overlong.
-This is the default.
+(This is the default.)
 
 @anchor{Expert Mode}
 @item -x