various documentation fixes

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

diff --git a/ChangeLog b/ChangeLog
index bd3b2bdc123a8877b7d70685b71ff92f9706f1df..79cdb07cebe1748fd7ce25fff059c90faf61174b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,15 @@ CVS code -
          well as curses, consolidate the warning and error messages
          dealing with UTF-8 support as much as possible, and add a few
          minor consistency fixes.
+- nanorc.sample:
+       - Fix the description for the whitespace option to mention that
+         only single-column characters are allowed. (DLR)
+- nano.1, nano.texi:
+       - Mention the -? alias for -h/--help, and synchronize the
+         description and placement of the +LINE option. (DLR)
+- nanorc.5:
+       - Fix the description for the whitespace option to mention that
+         only single-column characters are allowed. (DLR)
 
 GNU nano 1.3.6 - 2005.03.20
 - General:

diff --git a/doc/man/nano.1 b/doc/man/nano.1
index b6a694e7321fe0916c55b64cfd7cdc23e2f04dc3..c7c2f3c807c69e5be9924bdeef3cc2c0fbf60ac2 100644 (file)
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.6" "March 11, 2005"
+.TH NANO 1 "version 1.3.7" "March 26, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -33,7 +33,11 @@ replace" and "go to line number".
 .SH OPTIONS
 .TP
 .B \+\fILINE\fP
-Places cursor at \fILINE\fP on startup.
+Places cursor at line number \fILINE\fP on startup, instead of the
+default of line 1.
+.TP
+.B \-?
+Same as \fB-h (\-\-help)\fP.
 .TP
 .B \-A (\-\-smarthome)
 Make the Home key smarter.  When Home is pressed anywhere but at the

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index d1ef27e6bf1408098d88639a80d1de08ed555365..fb98b2ccc275317197cbce9a8a435bd2c66891c7 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.6" "March 11, 2005"
+.TH NANORC 5 "version 1.3.7" "March 26, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -154,7 +154,7 @@ Disallow file modification.
 .TP
 \fBset whitespace "\fIstring\fP"\fP
 Set the two characters used to display the first characters of tabs and
-spaces.  They cannot be control characters.
+spaces.  They must be single-column characters.
 .TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
 Defines a syntax named \fIstr\fP which can be activated via the \fB-Y\fP

diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index d03c463de9915f881774ecf03ddab933873bae0a..6ba03e286909a5bfbc5ac69429a42423072d2a69 100644 (file)
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -121,9 +121,9 @@
 ## Disallow file modification; why would you want this in an rcfile? ;)
 # set view
 
-## The two characters used to display the first characters of tabs and
-## spaces.  187 decimal (00BB hexadecimal) and 183 decimal (00B7
-## hexadecimal) seem to be good values for these.
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 decimal (00BB hexadecimal) and 183 decimal
+## (00B7 hexadecimal) seem to be good values for these.
 # set whitespace "  "
 
 ## Color setup

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 23947c51da4af91cd7bf84a1f5edcc2a81072ed3..cc311496f2f2b8b2aa7ab3d8deee63afe21bf2b8 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
 @c Run `makeinfo' rather than `texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.3.6
-@set UPDATED 11 Mar 2005
+@set VERSION 1.3.7
+@set UPDATED 26 Mar 2005
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.3.6
+@subtitle version 1.3.7
 
 @author Chris Allegretta
 @page
@@ -106,6 +106,11 @@ Email bug reports to @email{nano@@nano-editor.org}.
 @code{nano} takes the following options from the command line:
 
 @table @code
+@item +LINE
+Start at line number LINE instead of the default of line 1.
+
+@item -?
+Same as @code{-h, --help}.
 
 @item -A, --smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -240,9 +245,6 @@ keystroke (usually ^Z).
 
 @item -a, -b, -e, -f, -g, -j
 Ignored, for compatibility with Pico.
-
-@item +LINE
-Start at line number LINE instead of the default of line 1.
 @end table
 
 @node Editor Basics, Online Help, Introduction, Top