From b764eb66639816df910355f5d1ce771e31cf8cf3 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sun, 29 Jun 2003 02:25:46 +0000 Subject: [PATCH] a few more manpage fixes, and a resync of their html versions git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1507 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 ++ nano.1 | 4 +-- nano.1.html | 88 ++++++++++++++++++++++++++++++----------------- nanorc.5 | 16 ++++----- nanorc.5.html | 95 +++++++++++++++++++++++++++++++++++---------------- 5 files changed, 135 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21abf8a1..238954d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,9 @@ CVS code - and mark color syntax highlighting as done. (David Benbennick) - nano.1, nanorc.5: - Formatting improvements by Jean-Philippe Guérard. + - Minor fixes by DLR. +- nano.1.html, nanorc.5.html: + - Regenerated from nano.1 and nanorc.5. (DLR) GNU nano 1.2.1 - 2003.04.19 - General: diff --git a/nano.1 b/nano.1 index c2569234..2b452943 100644 --- a/nano.1 +++ b/nano.1 @@ -6,7 +6,7 @@ .\" Public License for copying conditions. There is NO warranty. .\" .\" $Id$ -.TH NANO 1 "February 9, 2003" +.TH NANO 1 "June 19, 2003" .\" Please adjust this date whenever revising the manpage. .\" @@ -47,7 +47,7 @@ Enable multiple file buffers, if available. .TP .B \-H (\-\-historylog) Log search and replace strings to -.I~/.nano_history +.I ~/.nano_history so they may be stored for later editing, if nanorc support is configured. .TP diff --git a/nano.1.html b/nano.1.html index 8d800050..4c83b98d 100644 --- a/nano.1.html +++ b/nano.1.html @@ -1,7 +1,7 @@ Manpage of NANO

NANO

-Section: User Commands (1)
Updated: February 9, 2003
Index +Section: User Commands (1)
Updated: June 19, 2003
Index Return to Main Contents

@@ -61,13 +61,21 @@ Enable multiple file buffers, if available.

-H (--historylog)

-Log search and replace strings to ~/.nano_history so they may be -stored for later editing, if nanorc support is configured. +Log search and replace strings to +~/.nano_history + +so they may be stored for later editing, if nanorc support is +configured.

-I (--ignorercfiles)

-Don't look at $SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is -available. +Don't look at +$SYSCONFDIR/nanorc + +or +~/.nanorc, + +if nanorc support is available.

-K (--keypad)

@@ -86,8 +94,8 @@ Disable automatic conversion of files from DOS/Mac format.

Set the quoting string for justifying. The default is -"^([ \t]*[|>:}#])+" if regular expression support is available, or -"> " otherwise. +"^([ \t]*[|>:}#])+" if regular expression support is available, or +"> " otherwise.

-R (--regexp)

@@ -109,8 +117,10 @@ Show the current version number and author.

-Y str (--syntax=str)

-Specify a specific syntax highlighting from the .nanorc to use, if -available. +Specify a specific syntax highlighting from the +.nanorc + +to use, if available.

-c (--const)

@@ -132,7 +142,10 @@ Enable cut from cursor to end of line with ^K.

If the file being edited is a symbolic link, replace the link with -a new file, do not follow it. Good for editing files in /tmp, perhaps? +a new file, do not follow it. Good for editing files in +/tmp, + +perhaps?

-m (--mouse)

@@ -188,8 +201,16 @@ Ignored, for compatibility with Pico.

INITIALIZATION FILE

nano will read initialization files in the following -order: $SYSCONFDIR/nanorc, then ~/.nanorc. Please see nanorc(5) and -the example file nanorc.sample which should be provided with +order: +$SYSCONFDIR/nanorc, + +then +~/.nanorc. + +Please see +nanorc(5) + +and the example file nanorc.sample which should be provided with nano.

@@ -198,30 +219,31 @@ the example file nanorc.sample which should be provided with nano will try to dump the buffer into an emergency file in some cases. Mainly, this will happen if nano receives a SIGHUP or SIGTERM or runs out of memory, when it will write the buffer into a file -named "nano.save" if the buffer didn't have a name already, or will add -a ".save" suffix to the current filename. If an emergency file with that -name already exists in the current directory, ".save" and a number (e.g. -".save.1") will be suffixed to the current filename in order to make it -unique. In multibuffer mode, nano will write all the open buffers -to the respective emergency files. +named +nano.save + +if the buffer didn't have a name already, or will add a ".save" suffix +to the current filename. If an emergency file with that name already +exists in the current directory, ".save" and a number (e.g. ".save.1") +will be suffixed to the current filename in order to make it unique. In +multibuffer mode, nano will write all the open buffers to the +respective emergency files.

BUGS

Please send any comments or bug reports to -
- -nano@nano-editor.org. - -
+nano@nano-editor.org. +

The nano mailing list is available from -
+nano-devel@gnu.org. -nano-devel@gnu.org. +

+To subscribe, email to +nano-devel-request@gnu.org -To subscribe, email to nano-devel-request@gnu.org with a -subject of "subscribe". +with a subject of "subscribe".

HOMEPAGE

@@ -242,9 +264,13 @@ subject of "subscribe".

AUTHOR

-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS and THANKS for -details). -This manual page was originally written by Jordi Mallach +Chris Allegretta <chrisa@asty.org>, et al (see +AUTHORS + +and +THANKS + +for details). This manual page was originally written by Jordi Mallach <jordi@sindominio.net>, for the Debian GNU system (but may be used by others).

@@ -267,6 +293,6 @@ used by others). This document was created by man2html, using the manual pages.
-Time: 04:08:28 GMT, February 13, 2003 +Time: 22:27:55 GMT, June 19, 2003 diff --git a/nanorc.5 b/nanorc.5 index 54a919eb..c9f4e8bd 100644 --- a/nanorc.5 +++ b/nanorc.5 @@ -5,7 +5,7 @@ .\" Public License for copying conditions. There is NO warranty. .\" .\" $Id$ -.TH NANORC 5 "February 14, 2003" +.TH NANORC 5 "June 19, 2003" .\" Please adjust this date whenever revising the manpage. .\" .SH NAME @@ -23,7 +23,7 @@ The \fInanorc\fP file contains the default settings for \fBnano\fP. During startup, \fBnano\fP will first read its system-wide settings from .IR $SYSCONFDIR/nanorc , and then user-specific settings from -.IR $HOME/.nanorc . +.IR ~/.nanorc . .SH OPTIONS The configuration file accepts a series of "set" and "unset" commands, @@ -57,6 +57,11 @@ Use cut to end of line with ^K by default. Wrap lines at column number \fIn\fP. If \fIn\fP is 0 or less, the line length will be the screen width less \fIn\fP. The default value is -8. .TP +\fBset/unset historylog\fP +Enable +.I ~/.nano_history +for saving and reading search/replace strings. +.TP \fBset/unset keypad\fP Use alternate keypad routines. .TP @@ -114,11 +119,6 @@ than 0. \fBset/unset tempfile\fP Save automatically on exit, don't prompt. .TP -\fBset/unset historylog\fP -Enable -.I~/.nano_history -for saving and reading search/replace strings. -.TP \fBset/unset view\fP Disallow file modification. .TP @@ -151,7 +151,7 @@ instance of \fIer\fP. .I $SYSCONFDIR/nanorc System-wide configuration file .TP -.I $HOME/.nanorc +.I ~/.nanorc Per-user configuration file .SH SEE ALSO .PD 0 diff --git a/nanorc.5.html b/nanorc.5.html index 35d0224f..849f89e8 100644 --- a/nanorc.5.html +++ b/nanorc.5.html @@ -1,7 +1,7 @@ Manpage of NANORC

NANORC

-Section: File Formats (5)
Updated: February 9, 2003
Index +Section: File Formats (5)
Updated: June 19, 2003
Index Return to Main Contents

@@ -11,15 +11,6 @@ Section: File Formats (5)
Updated: February 9, 2003
Index nanorc - GNU nano's rcfile -

SYNOPSIS

- -/etc/nanorc - -$HOME/.nanorc - -
- -

DESCRIPTION

This manual page documents GNU nano's rcfile. @@ -31,7 +22,16 @@ than just copying Pico's look and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number".

- + +The nanorc file contains the default settings for nano. +During startup, nano will first read its system-wide settings from +$SYSCONFDIR/nanorc, + +and then user-specific settings from +~/.nanorc. + +

OPTIONS

The configuration file accepts a series of "set" and "unset" commands, @@ -43,19 +43,29 @@ GNU nano will read one command per line. Options in rcfiles take precedence over nano's defaults, and command line options override rcfile settings.

+Options are unset by default, except for options that take an argument. +

The supported commands and arguments are:

set/unset autoindent

Use auto-indentation.

set/unset backup

-Create backup files in filename~. +Create backup files in +filename~. +

set/unset const

-Constantly update the cursor position. +Constantly display the cursor position in the status bar.

set/unset cut

Use cut to end of line with ^K by default.

set fill n

-Set the column where lines will be wrapped at to n. +Wrap lines at column number n. If n is 0 or less, the line +length will be the screen width less n. The default value is -8. +

set/unset historylog

+Enable +~/.nano_history + +for saving and reading search/replace strings.

set/unset keypad

Use alternate keypad routines.

set/unset multibuffer

@@ -69,20 +79,28 @@ Don't display the help lists at the bottom of the screen.

set/unset nowrap

Don't wrap text at all.

set operatingdir "directory"

-Set operating directory (chroots the user to directory and below). +nano will only read and write files inside directory and its +subdirectories. Also, the current directory is changed to here, so files +are inserted from this dir. By default the operating directory feature is +turned off.

set/unset preserve

Preserve the XON and XOFF keys (^Q and ^S).

set quotestr "string"

-The email-quote string. This is a "regular expression" if your -system supports them, otherwise a literal string. -Default value is set quotestr "^([ ]*[|>:}#])+" if you have regexps, -otherwise set quotestr "> ". +The email-quote string, used to justify email-quoted paragraphs. This is +an "extended regular expression" if your system supports them, otherwise a +literal string. The default value is +

+ set quotestr "^([ \t]*[|>:}#])+"
+

+if you have regexps, otherwise set quotestr "> ". Note that '\t' +above stands for a literal Tab character.

set/unset regexp

Do regular expression searches by default.

set/unset smooth

Use smooth scrolling by default.

set speller spellprog

-Use spelling checker spellprog instead of the default (spell). +Use spelling checker spellprog instead of the built-in one, which +calls spell.

set/unset suspend

Allow nano to be suspended with ^Z.

set tabsize n

@@ -90,8 +108,6 @@ Use a tab size of n instead of the default (8); must be greater than 0.

set/unset tempfile

Save automatically on exit, don't prompt. -

set/unset historylog

-Enable ~/.nano_history for saving and reading search/replace strings.

set/unset view

Disallow file modification.

syntax str [fileregex ... ] @@ -123,7 +139,20 @@ instance of er.

- + +

FILES

+ +

$SYSCONFDIR/nanorc + +: +System-wide configuration file +
~/.nanorc + +: +Per-user configuration file +

AUTHOR

-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS and THANKS for -details). +Chris Allegretta <chrisa@asty.org>, et al (see +AUTHORS + +and +THANKS + +for details). This manual page was written by Jordi Mallach <jordi@gnu.org>.

@@ -145,9 +180,9 @@ This manual page was written by Jordi Mallach <

@@ -155,6 +190,6 @@ This manual page was written by Jordi Mallach <man2html, using the manual pages.
-Time: 04:08:33 GMT, February 13, 2003 +Time: 22:28:00 GMT, June 19, 2003 -- 2.39.5