commit 74d8ebc041fc3db7f8780026f870348d78d5cf37
parent 899d0360ec8ec1d793996b31bfeef6d2e557ca13
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 26 Jun 2006 04:39:31 +0000
add various option description fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3683 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
7 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,10 @@
CVS code -
+- General:
+ - Fix option descriptions. At least one of the two parts of
+ +LINE,COLUMN must be specified at all times; COLUMN is not the
+ only optional value. Also fix a wording problem in
+ -W/--wordbounds. Changes to usage(), nano.1, nanorc.5,
+ rnano.1, nano.texi, and nanorc.sample.in. (DLR)
GNU nano 1.3.12 - 2006.06.26
- General:
diff --git a/doc/man/nano.1 b/doc/man/nano.1
@@ -7,7 +7,7 @@
.\" warranty.
.\"
.\" $Id$
-.TH NANO 1 "version 1.3.12" "June 7, 2006"
+.TH NANO 1 "version 1.9.99pre1" "June 26, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
@@ -16,7 +16,7 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
.SH SYNOPSIS
.B nano
-.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]...
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
.br
.SH DESCRIPTION
@@ -33,9 +33,10 @@ replace" and "go to line number".
.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 --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
@@ -7,7 +7,7 @@
.\" warranty.
.\"
.\" $Id$
-.TH NANORC 5 "version 1.3.12" "May 24, 2006"
+.TH NANORC 5 "version 1.9.99pre1" "June 26, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
@@ -194,7 +194,7 @@ spaces. They must be single-column characters.
.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 --git a/doc/man/rnano.1 b/doc/man/rnano.1
@@ -8,7 +8,7 @@
.\" warranty.
.\"
.\" $Id$
-.TH RNANO 1 "version 1.3.12" "May 1, 2006"
+.TH RNANO 1 "version 1.9.99pre1" "June 26, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
@@ -17,7 +17,7 @@ Pico clone
.SH SYNOPSIS
.B rnano
-.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]...
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
.br
.SH DESCRIPTION
@@ -51,9 +51,10 @@ use backup files or spell checking.
.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 --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
@@ -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 --git 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.12
-@set UPDATED 20 Jun 2006
+@set VERSION 1.9.99pre1
+@set UPDATED 26 Jun 2006
@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.3.12
+@subtitle version 1.9.99pre1
@author Chris Allegretta
@page
@@ -94,6 +94,8 @@ adding it with a comma. So the complete synopsis is:
@quotation
@code{nano [OPTION]@dots{} [[+LINE] FILE]@dots{}}
+@code{nano [OPTION]@dots{} [[+,COLUMN] FILE]@dots{}}
+
@code{nano [OPTION]@dots{} [[+LINE,COLUMN] FILE]@dots{}}
@end quotation
@@ -105,9 +107,9 @@ Email bug reports to @email{nano@@nano-editor.org}.
@code{nano} takes the following options from the command line:
@table @code
-@item +LINE[,COLUMN]
-Start at line number LINE and column number COLUMN instead of the
-default of line 1, column 1.
+@item +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 @@ Show the current version number and exit.
@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 --git a/src/nano.c b/src/nano.c
@@ -724,7 +724,7 @@ void print_opt_full(const char *shortflag
/* 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 @@ void usage(void)
#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"));
