diff -wur nano-cvs/doc/man/nano.1 nano-new/doc/man/nano.1 --- nano-cvs/doc/man/nano.1 2006-04-27 23:14:21.000000000 +0200 +++ nano-new/doc/man/nano.1 2006-04-29 12:48:21.000000000 +0200 @@ -92,11 +92,11 @@ available, or "\fI>\ \fP" otherwise. .TP .B \-R (\-\-restricted) -Restricted mode: Don't read or write to any file not specified on the -command line, read any nanorc files, allow suspending, or allow a file +Restricted mode: don't read or write to any file not specified on the +command line; read any nanorc files; allow suspending; allow a file to be appended to, prepended to, or saved under a different name if it -already has one. Also accessible by invoking \fBnano\fP with any name -beginning with 'r' (e.g. "rnano"). +already has one; or use backup files or spell checking. Also accessible +by invoking \fBnano\fP with any name beginning with 'r' (e.g. "rnano"). .TP .B \-S (\-\-smooth) Enable smooth scrolling. Text will scroll line-by-line, instead of the @@ -111,7 +111,7 @@ keystroke instead of 25. Note that \fB-c\fP cancels this out. .TP .B \-V (\-\-version) -Show the current version number and author. +Show the current version number and quit. .TP .B \-W (\-\-wordbounds) Detect word boundaries more accurately by treating punctuation diff -wur nano-cvs/doc/texinfo/nano.texi nano-new/doc/texinfo/nano.texi --- nano-cvs/doc/texinfo/nano.texi 2006-04-27 23:14:21.000000000 +0200 +++ nano-new/doc/texinfo/nano.texi 2006-04-29 13:30:25.000000000 +0200 @@ -147,14 +147,15 @@ Note that @code{\t} above stands for a literal Tab character. @item -R, --restricted -Restricted mode: Don't read or write to any file not specified on the +Restricted mode: don't read or write to any file not specified on the command line; read any nanorc files; allow suspending; allow a file to be appended to, prepended to, or saved under a different name if it already has one; or use backup files or spell checking. Also accessible by invoking @code{nano} with any name beginning with 'r' (e.g. "rnano"). @item -S, --smooth -Enable smooth scrolling. +Enable smooth scrolling. Text will scroll line-by-line, instead of the +usual chunk-by-chunk behavior. @item -T [num], --tabsize=[#cols] Set the displayed tab length to #cols columns. The value of #cols must @@ -165,7 +166,7 @@ keystroke instead of 25. Note that -c cancels this out. @item -V, --version -Print the version number and copyright and quit. +Print the version number and quit. @item -W, --wordbounds Detect word boundaries more accurately by treating punctuation @@ -212,7 +213,7 @@ @item -r [#cols], --fill=[#cols]. Wrap lines at column #cols. If this value is 0 or less, wrapping will -occur at #cols less the width of the screen, allowing it to vary along +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. @@ -229,7 +230,7 @@ @anchor{Expert Mode} @item -x, --nohelp -In Expert Mode, the Shortcut Lists will not appear at the bottom of the +Expert Mode: don't show the Shortcut Lists at the bottom of the screen. This affects the location of the statusbar as well, as in Expert Mode it is located at the very bottom of the editor. @@ -287,12 +288,11 @@ Pressing Esc twice and then typing a three-digit number from 000 to 255 will enter the character with the corresponding value. @item -Meta key sequences can be entered in a number of possible ways: Pressing -the Esc key, then releasing it and pressing the desired key, or holding -down the Alt key while pressing the desired key. This varies from -keyboard to keyboard, and certain commercial operating systems "swallow" -the Alt key so that it never reaches the application. If your operating -system does this, you should use the Esc key to generate Meta key +Meta key sequences are entered by holding down the Meta key (normally +the Alt key) and pressing the desired key, or by pressing the Esc key +once and pressing the desired key. Certain commercial operating systems +"swallow" the Alt key so that it never reaches the application; if your +operating system does this, you should use the Esc key to generate Meta key sequences. @end itemize @@ -313,7 +313,7 @@ @node The Statusbar, Shortcut Lists, The Titlebar, Editor Basics @section The Statusbar -The statusbar is located three lines from the bottom of the screen, or +The statusbar is the third line from the bottom of the screen, or the bottom line in Expert Mode. See @xref{Expert Mode}, for more info. It shows important and informational messages. Any error messages that occur from using the editor will appear on the statusbar. Any questions @@ -340,7 +340,7 @@ Toggles allow you to change certain aspects of the editor that would normally be done via command line options. They are invoked via -certain Meta key sequences. See @xref{Special Functions}, for more +Meta key sequences. See @xref{Special Functions}, for more info. The following global toggles are available: @table @code @@ -463,7 +463,7 @@ Constantly display the cursor position in the status bar. @item set/unset cut -Use cut to end of line by default. +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 @@ -487,8 +487,8 @@ Allow use of the blank line below the titlebar as extra editing space. @item set/unset mouse -Enable mouse support, so that mouse clicks can be used to set the mark -and run shortcuts. +Enable mouse support, so that mouse clicks can be used to place the cursor, +set the mark (with a double click), or execute shortcuts. @item set/unset multibuffer Allow inserting files into their own buffers. @@ -511,7 +511,7 @@ @item set operatingdir "directory" @code{nano} will only read and write files inside "directory" and its subdirectories. Also, the current directory is changed to here, so -files are inserted from this diractory. By default, the operating +files are inserted from this directory. By default, the operating directory feature is turned off. @item set/unset preserve @@ -688,11 +688,11 @@ position of the cursor. @item Interactive Replace and Spell Checker -It is worth noting that the @code{nano} replace function is interactive, -i.e, it does not stop after one search string is found and automatically -replace it. The @code{nano} implementation will stop at each search +It is worth noting that @code{nano}'s replace function is interactive, +i.e. it does not stop after one search string is found and automatically +replaces it. The @code{nano} implementation will pause at each search string found and query whether to replace this instance or not. The -internal spell checker operates similarly. Note that these is no way to +internal spell checker operates similarly. Note that there is no way to force these functions to behave in the Pico fashion. As of version 1.1.99pre1, misspelled words are sorted and trimmed for uniqueness in the internal spell checker such that the words 'apple' and 'Apple' will @@ -714,8 +714,9 @@ @item make install @end itemize address@hidden @code +The possible options to @command{./configure} are: address@hidden @code @item --disable-browser Disable the mini file browser when reading or writing files.