various documentation updates

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2282 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index cb06d76496fbf9b227b05b357d10d3f84935b174..f342c68634751ab0dedf65851184626ae70c2ec6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -256,12 +256,16 @@ CVS code -
        - Remove now-inaccurate note about verbatim input's not working
          at prompts, and update its description to mention that it
          handles hexadecimal values now. (DLR)
-- doc/nanorc.sample:
+- nanorc.sample:
        - Add return to the "c-file" regexes. (DLR)
        - Clarify the text describing good values for whitespace
          display.  Since ASCII is technically only seven bits wide,
          characters 128-255 aren't ASCII. (DLR, suggested by Michael
          Piefel)
+       - Add the "morespace" option. (DLR)
+- nano.1. nanorc.5, nano.texi:
+       - Add the "morespace" option, and sync with the descriptions in
+         nanorc.sample in a few places. (DLR)
 - src/Makefile.am:
        - Add chars.c to nano_SOURCES. (DLR)
        - If we're installing and the "rnano" symlink already exists,

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 65bd2015bea66da222208e0ca6dd44bfa3a1cce2..e12717a557f02929966180af3451276f8c332604 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -69,6 +69,9 @@ if nanorc support is available.
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
 .TP
+.B \-O (\-\-morespace)
+Use the blank line below the titlebar as extra editing space.
+.TP
 .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
 Set the quoting string for justifying.  The default is
 "^([\ \\t]*[|>:}#])+" if regular expression support is available, or

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c0098101a9255c183e039d1404762d2513aeb648..f660b91896c8af455acb4bf18c00b3d0424651c6 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -59,7 +59,7 @@ closing brackets, can end sentences.
 Constantly display the cursor position in the status bar.
 .TP
 \fBset/unset cut\fP
-Use cut to end of line with ^K by default.
+Use cut to end of line by default.
 .TP
 \fBset fill \fIn\fP\fP
 Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the line
@@ -70,6 +70,13 @@ Enable
 .I ~/.nano_history
 for saving and reading search/replace strings.
 .TP
+\fBset/unset morespace\fP
+Allow use of the blank line below the titlebar as extra editing space.
+.TP
+\fBset/unset mouse\fP
+Enable mouse support, so that mouse clicks can be used to set the mark
+and run shortcuts.
+.TP
 \fBset/unset multibuffer\fP
 Allow inserting files into their own buffers.
 .TP
@@ -132,7 +139,7 @@ Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
 \fBset/unset suspend\fP
-Allow nano to be suspended with ^Z.
+Allow nano to be suspended.
 .TP
 \fBset tabsize \fIn\fP\fP
 Use a tab size of \fIn\fP columns instead of the default (8); must be

diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index a66d898707e98577dcd5feb8f56137f5bc556b4b..7cd42d0f36d8fcd64851f4b623b26c9ee68b93c0 100644 (file)
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -38,8 +38,11 @@
 ## Enable ~/.nano_history for saving and reading search/replace strings.
 # set historylog
 
-## Enable mouse support so that mouse clicks can be used to set the mark
-## and run shortcuts.
+## Use the blank line below the titlebar as extra editing space.
+# set morespace
+
+## Enable mouse support, so that mouse clicks can be used to set the
+## mark and run shortcuts.
 # set mouse
 
 ## Allow multiple file buffers (inserting a file will put it into a
@@ -242,7 +245,7 @@
 ## highlight possible errors and parameters
 #color brightwhite "^ *(set|unset|syntax|color).*$"
 ## set, unset and syntax
-#color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
+#color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
 #color green "^ *(set|unset|syntax)\>"
 ## colors
 #color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index e92c51ddba546ef274c707a2751616b97cf1ed66..63047316de755ea23947159a62333c66cc4c7d6e 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -342,13 +342,13 @@ The following global toggles are available:
 @item Backup File Toggle (Meta-B)
 toggles the -B (@code{--backup}) command line flag.
 
-@item Multiple Files Toggle (Meta-F)
+@item Multiple File Buffers Toggle (Meta-F)
 toggles the -F (@code{--multibuffer}) command line flag.
 
 @item Backup File Toggle (Meta-H)
 toggles the -A (@code{--smarthome}) command line flag.
 
-@item AutoIndent Toggle (Meta-I)
+@item Auto Indent Toggle (Meta-I)
 toggles the -i (@code{--autoindent}) command line flag.
 
 @item Cut To End Toggle (Meta-K)
@@ -360,6 +360,9 @@ toggles the -w (@code{--nowrap}) command line flag.
 @item Mouse Toggle (Meta-M)
 toggles the -m (@code{--mouse}) command line flag.
 
+@item More Space Toggle (Meta-O)
+toggles the -O (@code{--morespace}) command line flag.
+
 @item Smooth Scrolling Toggle (Meta-S)
 toggles the -S (@code{--smooth}) command line flag.