merge a few minor updates from nano.1 into rnano.1

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

diff --git a/ChangeLog b/ChangeLog
index ea80b469d3c77d044e354d549af4935c2748642f..628511377ac9fb92a8e124d0203c5fd183da05c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -228,7 +228,8 @@ CVS code -
        - Make one non-bold instance of "nano" bold, for consistency.
          (DLR)
 - doc/rnano.1:
-       - Add rnano.1 manpage from Thijs Kinkhorst. (Jordi)
+       - Add rnano.1 manpage from Thijs Kinkhorst. (Jordi)  DLR: Merge
+         a few minor updates from nano.1.
 - doc/nano.texi:
        - Fix inconsistent wording and punctuation. (DLR)
        - Add missing configure options. (Mike Frysinger, minor tweaks

diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 0ef11f64190b552ef27cfc699eaeeb065e2f7784..c00a64e1e977e5495cb0dda5d9cb00a1d7f70fff 100644 (file)
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -9,67 +9,74 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH RNANO 1 "November 16, 2005"
+.TH RNANO 1 "November 21, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
-rnano \- Restricted mode for Nano's ANOther editor, an enhanced free Pico Clone
+rnano \- Restricted mode for Nano's ANOther editor, an enhanced free
+Pico clone
+
 .SH SYNOPSIS
 .B rnano
-.RI [options]\ [+LINE] " file"
+.I [\+LINE,COLUMN]\ [options]\ [file]
 .br
+
 .SH DESCRIPTION
-This manual page documents briefly the
-.B rnano
-command.
+This manual page documents briefly the \fBrnano\fP command.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
 .\" respectively.
 \fBnano\fP is a small, free and friendly editor which aims to replace
 Pico, the default editor included in the non-free Pine package. Rather
-than just copying Pico's look and feel,
-.B nano
-also implements some missing (or disabled by default) features in Pico,
-such as "search and replace" and "goto line number".
-.br
-.B rnano
-is a restricted version of \fBnano\fP, which only edits specific files and doesn't
-allow the user access to the filesystem or a command shell.
+than just copying Pico's look and feel, \fBnano\fP also implements some
+missing (or disabled by default) features in Pico, such as "search and
+replace" and "go to line number".
+.PP
+\fBrnano\fP is a restricted version of \fBnano\fP, which only edits
+specific files and doesn't allow the user access to the filesystem or a
+command shell.
 .PP
 In restricted mode, \fBnano\fP will \fInot\fP:
 .IP \[bu] 2
 read or write to any file not specified on the command line;
 .IP \[bu]
-read any \fInanorc\fP files;
+read any nanorc files;
 .IP \[bu]
 allow suspending;
 .IP \[bu]
-allow a file to be appended to, prepended to, or saved under a
-different name;
+allow a file to be appended to, prepended to, or saved under a different
+name;
 .IP \[bu]
-use backup files and spell checking.
+use backup files or spell checking.
+
 .SH OPTIONS
 .TP
-.B \-V (\-\-version)
-Show the current version number and author.
+.B \-?
+Same as \fB-h (\-\-help)\fP.
 .TP
 .B \-h (\-\-help)
 Display a summary of command line options.
 .TP
-See the \fBnano\fP(1) manpage for the complete documentation of nano.
+.B \-V (\-\-version)
+Show the current version number and author.
+.PP
+See the \fBnano\fP(1) manpage for the complete documentation of
+\fBnano\fP.
+
 .SH BUGS
-Please send any comments or bug reports to
-.B nano@nano-editor.org.
-.br
-The nano mailing list is available from
-.B nano-devel@lists.sourceforge.net.
-To subscribe, email to nano-devel-request@lists.sourceforge.net with a
-subject of "subscribe".
+Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
+
+The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
+
+To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
+of "subscribe".
+
 .SH HOMEPAGE
 http://www.nano-editor.org/
+
 .SH AUTHOR
 Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
 This manual page was originally written by Thijs Kinkhorst
-<thijs@kinkhorst.com>, for the Debian system (but may be
-used by others).
+<thijs@kinkhorst.com>, for the Debian system (but may be used by
+others).