From: David Lawrence Ramsey Date: Mon, 1 May 2006 13:43:02 +0000 (+0000) Subject: more various wording fixes for documentation X-Git-Tag: v1.3.12~219 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7a9422b77d13ce7ed15602461cc83f7dd047ad61;p=nano.git more various wording fixes for documentation git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3461 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index b9e362c4..2a406a3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,7 @@ CVS code - - Add various wording fixes. (DLR) - doc/rnano.1: - Add various wording fixes. (Benno Schulenberg and DLR) + - Add description of the +LINE[,COLUMN] option. (DLR) - doc/nano.texi: - Change license to GPL, in order to match the rest of the documentation, and because the current license is incompatible diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 01e4483a..25772df3 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -16,7 +16,7 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone .SH SYNOPSIS .B nano -.I [\+LINE,COLUMN]\ [options]\ [file] +.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]... .br .SH DESCRIPTION @@ -33,7 +33,7 @@ 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. .TP diff --git a/doc/man/rnano.1 b/doc/man/rnano.1 index 585dfeeb..1ad200ca 100644 --- a/doc/man/rnano.1 +++ b/doc/man/rnano.1 @@ -17,7 +17,7 @@ Pico clone .SH SYNOPSIS .B rnano -.I [\+LINE,COLUMN]\ [options]\ [file] +.I [OPTIONS]\ [[\+LINE[,COLUMN]]\ FILE]... .br .SH DESCRIPTION @@ -51,6 +51,10 @@ use backup files or spell checking. .SH OPTIONS .TP +.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. +.TP .B \-? Same as \fB-h (\-\-help)\fP. .TP diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index a92b9370..6cbc151f 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -75,13 +75,28 @@ toggles, internationalization support, and filename tab completion. @node Overview, Command Line Options, Introduction, Introduction @section Overview -@code{nano} +LINE,COLUMN [GNU long option] [option] [ @var{file ...} ] - The original goal for @code{nano} was a complete bug-for-bug compatible -emulation of Pico, but @code{nano}'s main goal is to be as compatible as -possible while offering a superset of Pico's functionality. See +emulation of Pico, but @code{nano}'s current goal is to be as compatible +as possible while offering a superset of Pico's functionality. See @xref{Pico Compatibility}, for more info. +The usual way to invoke @code{nano} is: + +@quotation +@code{nano [OPTION]@dots{} [FILE]} +@end quotation + +But it is also possible to edit several files in a row. Additionally, +the cursor can be put on a desired line number by adding this number +with a plus sign before any file name, and even in a desired column +by adding it with a comma. So the complete synopsis is: + +@quotation +@code{nano [OPTION]@dots{} [[+LINE] [FILE]]@dots{}} + +@code{nano [OPTION]@dots{} [[+LINE,COLUMN] [FILE]]@dots{}} +@end quotation + Email bug reports to @email{nano@@nano-editor.org}. @node Command Line Options, , Overview, Introduction @@ -90,7 +105,7 @@ Email bug reports to @email{nano@@nano-editor.org}. @code{nano} takes the following options from the command line: @table @code -@item +LINE,COLUMN +@item +LINE[,COLUMN] Start at line number LINE and column number COLUMN instead of the default of line 1, column 1. @@ -589,7 +604,7 @@ spaces. They must be single-column characters. Detect word boundaries more accurately by treating punctuation characters as part of a word. -@item syntax "str" ["fileregex" ... ] +@item syntax "str" ["fileregex" @dots{} ] Defines a syntax named "str" which can be activated via the -Y/--syntax command line option, or will be automatically activated if the current filename matches the extended regular expression "fileregex". All @@ -601,7 +616,7 @@ same as not having a syntax at all. The "default" syntax is special: it takes no "fileregex", and applies to files that don't match any other syntax's "fileregex". -@item color fgcolor,bgcolor "regex" ... +@item color fgcolor,bgcolor "regex" @dots{} For the currently defined syntax, display all expressions matching the extended regular expression "regex" with foreground color "fgcolor" and background color "bgcolor", at least one of which must be specified. @@ -611,7 +626,7 @@ to force a stronger color highlight for the foreground. If your terminal supports transparency, not specifying a "bgcolor" tells "nano" to attempt to use a transparent background. -@item icolor fgcolor,bgcolor "regex" ... +@item icolor fgcolor,bgcolor "regex" @dots{} Same as above, except that the expression matching is case insensitive. @item color fgcolor,bgcolor start="sr" end="er"