From 1980f1b2ba0f558e45482c5fe63459d5c69afad7 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 17 Jun 2022 16:47:18 +0200 Subject: [PATCH] docs: stop mentioning the obsoleted keywords that were removed But keep the note about --suspendable, as it has been obsoleted rather recentl. Move it to the NOTES section. --- doc/nano.1 | 11 +++++------ doc/nano.texi | 20 +++++--------------- doc/nanorc.5 | 16 +++++++--------- doc/sample.nanorc.in | 1 - 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/doc/nano.1 b/doc/nano.1 index 98f02ee4..cf663de2 100644 --- a/doc/nano.1 +++ b/doc/nano.1 @@ -309,7 +309,6 @@ using the built-in corrector that calls \fBhunspell\fR(1) or \fBspell\fR(1). .TP .BR \-t ", " \-\-saveonexit Save a changed buffer without prompting (when exiting with \fB^X\fR). -(The old form of the long option, \fB\-\-tempfile\fR, is deprecated.) .TP .BR \-u ", " \-\-unix Save a file by default in Unix format. This overrides nano's @@ -332,11 +331,6 @@ Don't show the two help lines at the bottom of the screen. .BR \-y ", " \-\-afterends Make Ctrl+Right and Ctrl+Delete stop at word ends instead of beginnings. .TP -.BR \-z ", " \-\-suspendable -Obsolete option; ignored. Suspension is enabled by default, -reachable via \fB^T^Z\fR. (If you want a plain \fB^Z\fR to -suspend nano, add \fBbind ^Z suspend main\fR to your nanorc.) -.TP .BR \-% ", " \-\-stateflags Use the top-right corner of the screen for showing some state flags: \fBI\fR when auto-indenting, \fBM\fR when the mark is on, \fBL\fR when @@ -400,6 +394,11 @@ See \fI/usr/share/nano/\fR and \fI/usr/share/nano/extra/\fR for available syntax-coloring definitions. .SH NOTES +Option \fB\-z\fR (\fB\-\-suspendable\fR) has been removed. +Suspension is enabled by default, reachable via \fB^T^Z\fR. +(If you want a plain \fB^Z\fR to suspend nano, add +\fBbind ^Z suspend main\fR to your nanorc.) +.sp If no alternative spell checker command is specified on the command line nor in one of the \fInanorc\fP files, \fBnano\fP will check the \fBSPELL\fP environment variable for one. diff --git a/doc/nano.texi b/doc/nano.texi index c0ccfc3f..07c332ff 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -636,7 +636,6 @@ to be installed. Save a changed buffer without prompting (when exiting with @kbd{^X}). This can be handy when @command{nano} is used as the composer of an email program. -(The old form of the long option, @code{--tempfile}, is deprecated.) @item -u @item --unix @@ -673,12 +672,6 @@ disabled to display the help-system navigation keys. Make @kbd{Ctrl+Right} and @kbd{Ctrl+Delete} stop at word ends instead of beginnings. -@item -z -@itemx --suspendable -Obsolete option; ignored. Suspension is enabled by default, -reachable via @kbd{^T^Z}. (If you want a plain @kbd{^Z} to -suspend nano, add @code{bind ^Z suspend main} to your nanorc.) - @item -% @itemx --stateflags Use the top-right corner of the screen for showing some state flags: @@ -722,6 +715,11 @@ try using libmagic to determine the applicable syntax. @end table +Option @code{-z} (@code{--suspendable}) has been removed. +Suspension is enabled by default, reachable via @kbd{^T^Z}. +(If you want a plain @kbd{^Z} to suspend nano, add +@code{bind ^Z suspend main} to your nanorc.) + @node Feature Toggles @chapter Feature Toggles @@ -1073,7 +1071,6 @@ Regular expressions in @command{nano} are of the extended type (ERE). @item set saveonexit Save a changed buffer automatically on exit (@kbd{^X}); don't prompt. -(The old form of this option, @code{set tempfile}, is deprecated.) @item set scrollercolor @var{fgcolor},@var{bgcolor} Use this color combination for the indicator alias "scrollbar". @@ -1127,11 +1124,6 @@ Use this color combination for the status bar. Use this color combination for the vertical guiding stripe. @xref{@code{set keycolor}} for valid color names. -@item set suspendable -Obsolete option; ignored. Suspension is enabled by default, -reachable via @kbd{^T^Z}. (If you want a plain @kbd{^Z} to -suspend nano, add @code{bind ^Z suspend main} to your nanorc.) - @item set tabsize @var{number} Use a tab size of @var{number} columns. The value of @var{number} must be greater than 0. The default value is @t{8}. @@ -1471,7 +1463,6 @@ Or, when it is set, unsets the mark. @item location Reports the current position of the cursor in the buffer: the line, column, and character positions. -(The old name of this function, 'curpos', is deprecated.) @item wordcount Counts and reports on the status bar the number of lines, words, @@ -1803,7 +1794,6 @@ The 'go to directory' menu in the file browser. The menu for inserting the output from an external command, or for filtering the buffer (or the marked region) through an external command, or for executing one of several tools. -(The old form of this menu name, 'extcmd', is deprecated.) @item spell The menu of the integrated spell checker where the user can edit a misspelled word. diff --git a/doc/nanorc.5 b/doc/nanorc.5 index 986bd25f..6a1b391e 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -289,7 +289,6 @@ Regular expressions in \fBnano\fR are of the extended type (ERE). .TP .B set saveonexit Save a changed buffer automatically on exit (\fB^X\fR); don't prompt. -(The old form of this option, \fBset tempfile\fR, is deprecated.) .TP .B set scrollercolor \fIfgcolor\fB,\fIbgcolor\fR Use this color combination for the indicator alias "scrollbar". @@ -335,7 +334,7 @@ and \fBS\fR when soft-wrapping. When the buffer is modified, a star (\fB*\fR) is shown after the filename in the center of the title bar. .TP -.B set statuscolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR +.B set statuscolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR Use this color combination for the status bar. See \fBset titlecolor\fR for more details. .TP @@ -343,11 +342,6 @@ See \fBset titlecolor\fR for more details. Use this color combination for the vertical guiding stripe. See \fBset titlecolor\fR for more details. .TP -.B set suspendable -Obsolete option; ignored. Suspension is enabled by default, -reachable via \fB^T^Z\fR. (If you want a plain \fB^Z\fR to -suspend nano, add \fBbind ^Z suspend main\fR to your nanorc.) -.TP .B set tabsize \fInumber\fR Use a tab size of \fInumber\fR columns. The value of \fInumber\fP must be greater than 0. The default value is \fB8\fR. @@ -418,6 +412,12 @@ and disappears after 1.5 seconds or upon the next keystroke. With \fBM\-Z\fR the title bar plus status bar can be toggled. With \fBM\-X\fR the help lines. +.SH NOTES +Option \fBset suspendable\fR has been removed. +Suspension is enabled by default, reachable via \fB^T^Z\fR. +(If you want a plain \fB^Z\fR to suspend nano, +add \fBbind ^Z suspend main\fR to your nanorc.) + .SH SYNTAX HIGHLIGHTING Coloring the different syntactic elements of a file is done via regular expressions (see the \fBcolor\fR command below). @@ -687,7 +687,6 @@ Or, when it is set, unsets the mark. .B location Reports the current position of the cursor in the buffer: the line, column, and character positions. -(The old name of this function, 'curpos', is deprecated.) .TP .B wordcount Counts and reports on the status bar the number of lines, words, @@ -1017,7 +1016,6 @@ The 'go to directory' menu in the file browser. The menu for inserting the output from an external command, or for filtering the buffer (or the marked region) through an external command, or for executing one of several tools. -(The old form of this menu name, 'extcmd', is deprecated.) .TP .B spell The menu of the integrated spell checker where the user can edit a misspelled word. diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in index ec8ba4dc..8f4b3df4 100644 --- a/doc/sample.nanorc.in +++ b/doc/sample.nanorc.in @@ -146,7 +146,6 @@ ## Save a changed buffer automatically on exit; don't prompt. # set saveonexit -## (The old form of this option, 'set tempfile', is deprecated.) ## Put the cursor on the highlighted item in the file browser, and ## show the cursor in the help viewer; useful for people who use a