diff -wur nano-cvs/doc/man/nano.1 nano-new/doc/man/nano.1 --- nano-cvs/doc/man/nano.1 2006-05-01 15:57:40.000000000 +0200 +++ nano-new/doc/man/nano.1 2006-05-14 15:12:19.000000000 +0200 @@ -65,8 +65,8 @@ Enable multiple file buffers, if available. .TP .B \-H (\-\-historylog) -Log search and replace strings to \fI~/.nano_history\fP so they can be -stored for later editing, if nanorc support is configured. +Log search and replace strings to \fI~/.nano_history\fP, so they can be +retrieved in later sessions, if nanorc support is available. .TP .B \-I (\-\-ignorercfiles) Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc @@ -89,7 +89,7 @@ .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP) Set the quoting string for justifying. The default is "\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is -available, or "\fI>\ \fP" otherwise. +available, or "\fI>\ \fP" otherwise. Note that \fI\\t\fP stands for a Tab. .TP .B \-R (\-\-restricted) Restricted mode: don't read or write to any file not specified on the @@ -108,7 +108,7 @@ .TP .B \-U (\-\-quickblank) Do quick statusbar blanking. Statusbar messages will disappear after 1 -keystroke instead of 25. Note that \fB-c\fP cancels this out. +keystroke instead of 25. Note that \fB-c\fP overrules this. .TP .B \-V (\-\-version) Show the current version number and exit. @@ -122,7 +122,7 @@ available. .TP .B \-c (\-\-const) -Constantly show the cursor position. Note that this cancels out +Constantly show the cursor position. Note that this overrules \fB-U\fP. .TP .B \-d (\-\-rebinddelete) @@ -195,12 +195,12 @@ line or in one of the nanorc files, \fBnano\fP will check the \fBSPELL\fP environment variable for one. -\fBnano\fP will try to dump the buffer into an emergency file in some -cases. Mainly, this will happen if \fBnano\fP receives a SIGHUP or -SIGTERM or runs out of memory, when it will write the buffer into a file +In some cases \fBnano\fP will try to dump the buffer into an emergency +file. This will happen mainly if \fBnano\fP receives a SIGHUP or +SIGTERM or runs out of memory; then it will write the buffer into a file named \fInano.save\fP if the buffer didn't have a name already, or will add a ".save" suffix to the current filename. If an emergency file with -that name already exists in the current directory, ".save" and a number +that name already exists in the current directory, ".save." plus a number (e.g. ".save.1") will be suffixed to the current filename in order to make it unique. In multibuffer mode, \fBnano\fP will write all the open buffers to their respective emergency files. diff -wur nano-cvs/doc/nanorc.sample nano-new/doc/nanorc.sample --- nano-cvs/doc/nanorc.sample 2006-04-27 23:14:21.000000000 +0200 +++ nano-new/doc/nanorc.sample 2006-05-14 14:39:13.000000000 +0200 @@ -40,7 +40,7 @@ # set casesensitive ## Constantly display the cursor position in the statusbar. Note that -## this cancels out "quickblank". +## this overrules "quickblank". # set const ## Use cut to end of line by default. diff -wur nano-cvs/doc/texinfo/nano.texi nano-new/doc/texinfo/nano.texi --- nano-cvs/doc/texinfo/nano.texi 2006-05-01 15:57:40.000000000 +0200 +++ nano-new/doc/texinfo/nano.texi 2006-05-14 15:05:12.000000000 +0200 @@ -92,9 +92,9 @@ by adding it with a comma. So the complete synopsis is: @quotation address@hidden address@hidden [[+LINE] address@hidden address@hidden address@hidden [[+LINE] address@hidden address@hidden address@hidden [[+LINE,COLUMN] address@hidden address@hidden address@hidden [[+LINE,COLUMN] address@hidden @end quotation Email bug reports to @email{nano@@nano-editor.org}. @@ -123,7 +123,7 @@ When saving a file, back up the previous version of it to the current filename suffixed with a ~. address@hidden -C, --backupdir=[dir] address@hidden -C , --backupdir= Set the directory where @code{nano} puts unique backup files if file backups are enabled. @@ -136,6 +136,10 @@ @item -F, --multibuffer Enable multiple file buffers, if available. address@hidden -H, --historylog +Log search and replace strings to ~/.nano_history, so they can be +retrieved in later sessions, if nanorc support is available. + @item -I, --ignorercfiles Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is available. @@ -151,7 +155,7 @@ @item -N, --noconvert Don't convert files from DOS/Mac format. address@hidden -Q [str], --quotestr [str] address@hidden -Q , --quotestr= Set the quoting string for justifying. The default value is @quotation @@ -172,13 +176,13 @@ Enable smooth scrolling. Text will scroll line-by-line, instead of the usual chunk-by-chunk behavior. address@hidden -T [num], --tabsize=[#cols] address@hidden -T <#cols>, --tabsize=<#cols> Set the displayed tab length to #cols columns. The value of #cols must be greater than 0. The default value is 8. @item -U, --quickblank Do quick statusbar blanking. Statusbar messages will disappear after 1 -keystroke instead of 25. Note that -c cancels this out. +keystroke instead of 25. Note that -c overules this. @item -V, --version Show the current version number and exit. @@ -187,13 +191,13 @@ Detect word boundaries more accurately by treating punctuation characters as part of a word. address@hidden -Y, --syntax=[str] address@hidden -Y , --syntax= Specify a specific syntax highlighting from the nanorc to use, if available. See @xref{Nanorc Files}, for more info. @item -c, --const Constantly display the cursor position and line number on the statusbar. -Note that this cancels out -U. +Note that this overrules -U. @item -d, --rebinddelete Interpret the Delete key differently so that both Backspace and Delete @@ -218,7 +222,7 @@ Enables the use of the mouse to select text (currently only useful for running under the X Window System). address@hidden -o [dir], --operatingdir=[dir] address@hidden -o , --operatingdir= Set operating directory. Makes @code{nano} set up something similar to a chroot. @@ -226,15 +230,15 @@ Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the editor can be can be stopped and started. address@hidden -r [#cols], --fill=[#cols]. address@hidden -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. address@hidden -s [prog], --speller=[prog] -Invoke [prog] as the spell checker. By default, @code{nano} uses the -command specified in the SPELL environment variable, or, if SPELL is not address@hidden -s , --speller= +Invoke the give program as the spell checker. By default, @code{nano} uses +the command specified in the SPELL environment variable, or, if SPELL is not set, its own interactive spell checker that requires the @code{spell} program to be installed on your system. @@ -243,15 +247,6 @@ exiting, assume yes. This is most useful when using @code{nano} as the composer of a mailer program. address@hidden Mode} address@hidden -x, --nohelp -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. - -Note: When accessing the help system, Expert Mode is temporarily -disabled to display the help system navigation keys. - @item -v, --view Don't allow the contents of the file to be altered. Note that this option should NOT be used in place of correct file permissions to @@ -261,6 +256,15 @@ Don't wrap long lines at any length. This option overrides any value for -r. address@hidden Mode} address@hidden -x, --nohelp +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. + +Note: When accessing the help system, Expert Mode is temporarily +disabled to display the help system navigation keys. + @item -z, --suspend Enable @code{nano}'s suspend ability using the system's suspend keystroke (usually ^Z).