diff --git a/doc/nano.1 b/doc/nano.1 index fbd46f8cf194ef4c62e86d74de70bfb5c15e10bb..41f0a3311cff25fcf736b658c137ceb5eb5d182d 100644 --- a/doc/nano.1 +++ b/doc/nano.1 @@ -113,7 +113,7 @@ Don't add newlines to the ends of files. Disable automatic conversion of files from DOS/Mac format. .TP .BR \-O ", " \-\-morespace -Use the blank line below the titlebar as extra editing space. +Use the blank line below the title bar as extra editing space. .TP .BR \-P ", " \-\-positionlog For the 200 most recent files, log the last position of the cursor, @@ -144,7 +144,7 @@ Set the size (width) of a tab to \fInumber\fP columns. The value of \fInumber\fP must be greater than 0. The default value is 8. .TP .BR \-U ", " \-\-quickblank -Do quick statusbar blanking: statusbar messages will disappear after 1 +Do quick status-bar blanking: status-bar messages will disappear after 1 keystroke instead of 25. Note that \fB\-c\fP overrides this. .TP .BR \-V ", " \-\-version @@ -164,7 +164,7 @@ Specify the name of the syntax highlighting to use from among the ones defined in the \fInanorc\fP files. .TP .BR \-c ", " \-\-constantshow -Constantly show the cursor position on the statusbar. +Constantly show the cursor position on the status bar. Note that this overrides \fB\-U\fP. .TP .BR \-d ", " \-\-rebinddelete diff --git a/doc/nano.texi b/doc/nano.texi index 421517424afe1bb23fb2f5b3fe0834d5bca05098..a286fd199a82921d3d3a81a84946b5939db9a33b 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -183,7 +183,7 @@ Disable automatic conversion of files from DOS/Mac format. @item -O @itemx --morespace -Use the blank line below the titlebar as extra editing space. +Use the blank line below the title bar as extra editing space. @item -P @itemx --positionlog @@ -220,7 +220,7 @@ Set the displayed tab length to @var{number} columns. The value of @item -U @itemx --quickblank -Do quick statusbar blanking. Statusbar messages will disappear after 1 +Do quick status-bar blanking: status-bar messages will disappear after 1 keystroke instead of 25. Note that option @option{-c} (@option{--constantshow}) overrides this. @@ -246,7 +246,8 @@ Specify the syntax to be used for highlighting. @item -c @itemx --constantshow -Constantly display the cursor position and line number on the statusbar. +Constantly display the cursor position (line number, column number, +and character number) on the status bar. Note that this overrides option @option{-U} (@option{--quickblank}). @item -d @@ -352,7 +353,7 @@ Don't hard-wrap long lines at any length. This option conflicts with @item -x @itemx --nohelp Expert Mode: don't show the Shortcut List at the bottom of the screen. -This affects the location of the statusbar as well, as in Expert Mode it +This affects the location of the status bar as well, as in Expert Mode it is located at the very bottom of the editor. Note: When accessing the help system, Expert Mode is temporarily @@ -476,21 +477,21 @@ If necessary, it can be toggled off manually with another ^6 or M-A. @section Screen Layout The default screen of nano consists of five areas. From top to bottom -these are: the titlebar, a blank line, the edit window, the statusbar, +these are: the title bar, a blank line, the edit window, the status bar, and two help lines. -The titlebar consists of +The title bar consists of three sections: left, center and right. The section on the left displays the version of @code{nano} being used. The center section displays the current filename, or "New Buffer" if the file has not yet been named. The section on the right displays "Modified" if the file has been modified since it was last saved or opened. -The statusbar is the third line from the bottom of the screen. It +The status bar is the third line from the bottom of the screen. It shows important and informational messages. Any error messages that -occur from using the editor will appear on the statusbar. Any questions -that are asked of the user will be asked on the statusbar, and any user -input (search strings, filenames, etc.) will be input on the statusbar. +occur from using the editor will appear on the status bar. Any questions +that are asked of the user will be asked on the status bar, and any user +input (search strings, filenames, etc.) will be input on the status bar. The two help lines at the bottom of the screen show some of the most essential functions of the editor. These two lines are called the @@ -671,7 +672,7 @@ The uniquely numbered files are stored in the specified directory. Do backwards searches by default. @item set boldtext -Use bold instead of reverse video for the titlebar, statusbar, key combos, +Use bold instead of reverse video for the title bar, status bar, key combos, line numbers, and selected text. This can be overridden for the first four by setting the options @code{titlecolor}, @code{statuscolor}, @code{keycolor}, and @code{numbercolor}. @@ -687,7 +688,7 @@ closing brackets, can end sentences. The default value is Do case-sensitive searches by default. @item set constantshow -Constantly display the cursor position in the status bar. +Constantly display the cursor position on the status bar. (The old form of this option, @code{set const}, is deprecated.) @item set cut @@ -728,7 +729,7 @@ come before the closing set, and the two sets must be in the same order. The default value is @t{"(<[@{)>]@}"}. @item set morespace -Use the blank line below the titlebar as extra editing space. +Use the blank line below the title bar as extra editing space. @item set mouse Enable mouse support, so that mouse clicks can be used to place the @@ -779,7 +780,7 @@ specified closing punctuation, optionally followed by closing brackets The default value is @t{"!.?"}. @item set quickblank -Do quick statusbar blanking. Statusbar messages will disappear after 1 +Do quick status-bar blanking: status-bar messages will disappear after 1 keystroke instead of 25. @item set quiet @@ -830,7 +831,7 @@ Use spelling checker "spellprog" instead of the built-in one, which calls "spell". @item set statuscolor @var{fgcolor},@var{bgcolor} -Specify the color combination to use for the statusbar. +Specify the color combination to use for the status bar. See @code{set titlecolor} for more details. @item set suspend @@ -847,7 +848,7 @@ Convert typed tabs to spaces. Save automatically on exit, don't prompt. @item set titlecolor @var{fgcolor},@var{bgcolor} -Specify the color combination to use for the titlebar. +Specify the color combination to use for the title bar. Valid color names for foreground and background are: white, black, blue, green, red, cyan, yellow, and magenta. The name of the foreground color may be prefixed with 'bright'. @@ -1271,7 +1272,7 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s Toggles the constant display of the current line, column, and character positions. @item morespace -Toggles the presence of the blank line which 'separates' the titlebar from the file text. +Toggles the presence of the blank line that 'separates' the title bar from the file text. @item smoothscroll Toggles smooth scrolling (when moving around with the arrow keys). @@ -1387,7 +1388,7 @@ searching via ^W (or 'w') and changing directories via ^_ (or 'g'). The behavior of the Enter (or 's') key varies by what is currently selected. If the currently selected object is a directory, the file browser will enter and display the contents of the directory. If the object is a -file, this filename and path are copied to the statusbar, and the file +file, this filename and path are copied to the status bar, and the file browser exits. diff --git a/doc/nanorc.5 b/doc/nanorc.5 index 4832cfb61681a222a50ef9ef8d61e0cf0f35188d..1b1cc64c58ddee30d592ef9ca8ecaaadf08738d3 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -74,7 +74,7 @@ The uniquely numbered files are stored in the specified \fIdirectory\fR. Do backwards searches by default. .TP .B set boldtext -Use bold instead of reverse video for the titlebar, statusbar, key combos, +Use bold instead of reverse video for the title bar, status bar, key combos, line numbers, and selected text. This can be overridden for the first four by setting the options \fBtitlecolor\fP, \fBstatuscolor\fP, \fBkeycolor\fP, and \fBnumbercolor\fP. @@ -130,7 +130,7 @@ come before the closing set, and the two sets must be in the same order. The default value is "\fB(<[{)>]}\fP". .TP .B set morespace -Use the blank line below the titlebar as extra editing space. +Use the blank line below the title bar as extra editing space. .TP .B set mouse Enable mouse support, if available for your system. When enabled, mouse @@ -183,7 +183,7 @@ specfified closing punctuation, optionally followed by closing brackets (see \fBbrackets\fP), can end sentences. The default value is "\fB!.?\fP". .TP .B set quickblank -Do quick statusbar blanking. Statusbar messages will disappear after 1 +Do quick status-bar blanking: status-bar messages will disappear after 1 keystroke instead of 25. .TP .B set quiet @@ -234,7 +234,7 @@ Use spelling checker \fIspellprog\fP instead of the built-in one, which calls \fIspell\fP. .TP .B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR -Specify the color combination to use for the statusbar. +Specify the color combination to use for the status bar. See \fBset titlecolor\fR for more details. .TP .B set suspend @@ -251,7 +251,7 @@ Convert typed tabs to spaces. Save automatically on exit, don't prompt. .TP .B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR -Specify the color combination to use for the titlebar. +Specify the color combination to use for the title bar. Valid names for the foreground and background colors are: .BR white ", " black ", " blue ", " green ", " red ", " cyan ", " yellow ", and " magenta . The name of the foreground color may be prefixed with \fBbright\fR. @@ -666,7 +666,7 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s Toggles the constant display of the current line, column, and character positions. .TP .B morespace -Toggles the presence of the blank line which 'separates' the titlebar from the file text. +Toggles the presence of the blank line that 'separates' the title bar from the file text. .TP .B smoothscroll Toggles smooth scrolling (when moving around with the arrow keys).