[Nano-devel] the minor documentation bugs in CVS

[David Lawrence Ramsey]

The main minor documentation bugs in CVS that I mentioned elsewhere are
as follows: the +LINE,COLUMN option, and the --wordbounds option.  The
proposed patch (which won't be added until 1.3.12 is out) is my attempt
at fixing them.  The --wordbounds fix is a minor case of singular vs.
plural, but I'm unsure if the changes to the +LINE,COLUMN option's
description are clear enough.  When I committed the last change to the
latter, I forgot that the column can be specified without the line (e.g.
"nano +,3 somefile.txt" will open somefile.txt and put the cursor at
line 1, column 3).  Note that the description of "foreground,background"
with color syntaxes is handled the same way, as it also needs only one
of the two at a minimum.

Comments?  Thanks in advance.

diff -ur nano/doc/man/nano.1 nano-fixed/doc/man/nano.1
--- nano/doc/man/nano.1 2006-06-07 22:45:37.000000000 -0400
+++ nano-fixed/doc/man/nano.1   2006-06-20 12:46:55.000000000 -0400
@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id: nano.1,v 1.47 2006/06/08 02:45:37 dolorous Exp $
-.TH NANO 1 "version 1.3.12" "June 7, 2006"
+.TH NANO 1 "version 1.9.99pre1" "June 20, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -16,7 +16,7 @@
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]...
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
 .br
 
 .SH DESCRIPTION
@@ -33,9 +33,10 @@
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP[,\fICOLUMN\fP]
+.B \+\fILINE\fP,\fICOLUMN\fP
 Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
-on startup, instead of the default of line 1, column 1.
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
 .TP
 .B \-?
 Same as \fB-h (\-\-help)\fP.
diff -ur nano/doc/man/nanorc.5 nano-fixed/doc/man/nanorc.5
--- nano/doc/man/nanorc.5       2006-05-24 16:55:44.000000000 -0400
+++ nano-fixed/doc/man/nanorc.5 2006-06-20 12:46:55.000000000 -0400
@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id: nanorc.5,v 1.49 2006/05/24 20:55:44 dolorous Exp $
-.TH NANORC 5 "version 1.3.12" "May 24, 2006"
+.TH NANORC 5 "version 1.9.99pre1" "June 20, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -194,7 +194,7 @@
 .TP
 .B set/unset wordbounds
 Detect word boundaries more accurately by treating punctuation
-characters as part of a word.
+characters as parts of words.
 .TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
 Defines a syntax named \fIstr\fP which can be activated via the
diff -ur nano/doc/man/rnano.1 nano-fixed/doc/man/rnano.1
--- nano/doc/man/rnano.1        2006-05-01 09:43:02.000000000 -0400
+++ nano-fixed/doc/man/rnano.1  2006-06-20 12:46:55.000000000 -0400
@@ -8,7 +8,7 @@
 .\" warranty.
 .\"
 .\" $Id: rnano.1,v 1.11 2006/05/01 13:43:02 dolorous Exp $
-.TH RNANO 1 "version 1.3.12" "May 1, 2006"
+.TH RNANO 1 "version 1.9.99pre1" "June 20, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -17,7 +17,7 @@
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]...
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
 .br
 
 .SH DESCRIPTION
@@ -51,9 +51,10 @@
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP[,\fICOLUMN\fP]
+.B \+\fILINE\fP,\fICOLUMN\fP
 Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
-on startup, instead of the default of line 1, column 1.
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
 .TP
 .B \-?
 Same as \fB-h (\-\-help)\fP.
diff -ur nano/doc/nanorc.sample.in nano-fixed/doc/nanorc.sample.in
--- nano/doc/nanorc.sample.in   2006-06-08 09:03:15.000000000 -0400
+++ nano-fixed/doc/nanorc.sample.in     2006-06-20 12:46:55.000000000 -0400
@@ -167,7 +167,7 @@
 # set whitespace "  "
 
 ## Detect word boundaries more accurately by treating punctuation
-## characters as part of a word.
+## characters as parts of words.
 # set wordbounds
 
 
diff -ur nano/doc/texinfo/nano.texi nano-fixed/doc/texinfo/nano.texi
--- nano/doc/texinfo/nano.texi  2006-06-20 12:26:43.000000000 -0400
+++ nano-fixed/doc/texinfo/nano.texi    2006-06-20 12:47:40.000000000 -0400
@@ -8,7 +8,7 @@
 @c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
address@hidden VERSION 1.3.12
address@hidden VERSION 1.9.99pre1
 @set UPDATED 20 Jun 2006
 
 @dircategory Editors
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
address@hidden version 1.3.12
address@hidden version 1.9.99pre1
 
 @author Chris Allegretta
 @page
@@ -94,6 +94,8 @@
 @quotation
 @code{nano address@hidden [[+LINE] address@hidden
 
address@hidden address@hidden [[+,COLUMN] address@hidden
+
 @code{nano address@hidden [[+LINE,COLUMN] address@hidden
 @end quotation
 
@@ -105,9 +107,9 @@
 @code{nano} takes the following options from the command line:
 
 @table @code
address@hidden +LINE[,COLUMN]
-Start at line number LINE and column number COLUMN instead of the
-default of line 1, column 1.
address@hidden +LINE,COLUMN
+Start at line number LINE and column number COLUMN (at least one of
+which must be specified) instead of the default of line 1, column 1.
 
 @item -?
 Same as @code{-h, --help}.
@@ -189,7 +191,7 @@
 
 @item -W, --wordbounds
 Detect word boundaries more accurately by treating punctuation
-characters as part of a word.
+characters as parts of words.
 
 @item -Y <str>, --syntax=<str>
 Specify a specific syntax highlighting from the nanorc to use, if
diff -ur nano/src/nano.c nano-fixed/src/nano.c
--- nano/src/nano.c     2006-06-09 14:24:37.000000000 -0400
+++ nano-fixed/src/nano.c       2006-06-20 12:46:55.000000000 -0400
@@ -724,7 +724,7 @@
 /* Explain how to properly use nano and its command line options. */
 void usage(void)
 {
-    printf(_("Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n\n"));
+    printf(_("Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n\n"));
     printf(
 #ifdef HAVE_GETOPT_LONG
        _("Option\t\tGNU long option\t\tMeaning\n")
@@ -733,7 +733,7 @@
 #endif
        );
     print_opt("-h, -?", "--help", N_("Show this message"));
-    print_opt(_("+LINE[,COLUMN]"), "",
+    print_opt(_("+LINE,COLUMN"), "",
        N_("Start at line LINE, column COLUMN"));
 #ifndef NANO_TINY
     print_opt("-A", "--smarthome", N_("Enable smart home key"));