diff --git a/ChangeLog b/ChangeLog index 21abf8a127573db8c4d0f63310c7c5dcec43e06a..238954d4f04ba6d5d0d702462f56ca130fffaf4b 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 c25692341e055b7d08a20f9edf36cb0c38f0695a..2b452943a5491803923391c8b24bcd197689db5d 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 8d80005025493405a9c4c54586e1397113f13490..4c83b98dda47884b93cb2f1f511c90a634ec0b1f 100644 --- a/nano.1.html +++ b/nano.1.html @@ -1,7 +1,7 @@ <HTML><HEAD><TITLE>Manpage of NANO</TITLE> </HEAD><BODY> <H1>NANO</H1> -Section: User Commands (1)<BR>Updated: February 9, 2003<BR><A HREF="#index">Index</A> +Section: User Commands (1)<BR>Updated: June 19, 2003<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> @@ -61,13 +61,21 @@ Enable multiple file buffers, if available. <DT><B>-H (--historylog)</B> <DD> -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 +<I>~/.nano_history</I> + +so they may be stored for later editing, if nanorc support is +configured. <DT><B>-I (--ignorercfiles)</B> <DD> -Don't look at $SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is -available. +Don't look at +<I>$SYSCONFDIR/nanorc</I> + +or +<I>~/.nanorc</I>, + +if nanorc support is available. <DT><B>-K (--keypad)</B> <DD> @@ -86,8 +94,8 @@ Disable automatic conversion of files from DOS/Mac format. <DD> 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. <DT><B>-R (--regexp)</B> <DD> @@ -109,8 +117,10 @@ Show the current version number and author. <DT><B>-Y </B><I>str</I> (--syntax=<I>str</I>) <DD> -Specify a specific syntax highlighting from the .nanorc to use, if -available. +Specify a specific syntax highlighting from the +<I>.nanorc</I> + +to use, if available. <DT><B>-c (--const)</B> <DD> @@ -132,7 +142,10 @@ Enable cut from cursor to end of line with ^K. <DD> 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 +<I>/tmp</I>, + +perhaps? <DT><B>-m (--mouse)</B> <DD> @@ -188,8 +201,16 @@ Ignored, for compatibility with Pico. <H2>INITIALIZATION FILE</H2> <B>nano</B> will read initialization files in the following -order: $SYSCONFDIR/nanorc, then ~/.nanorc. Please see <A HREF="http://localhost/cgi-bin/man/man2html?5+nanorc">nanorc</A>(5) and -the example file <B>nanorc.sample</B> which should be provided with +order: +<I>$SYSCONFDIR/nanorc</I>, + +then +<I>~/.nanorc</I>. + +Please see +<B><A HREF="http://localhost/cgi-bin/man/man2html?5+nanorc">nanorc</A></B>(5) + +and the example file <B>nanorc.sample</B> which should be provided with <B>nano</B>. <P> <A NAME="lbAG"> </A> @@ -198,30 +219,31 @@ the example file <B>nanorc.sample</B> which should be provided with <B>nano</B> will try to dump the buffer into an emergency file in some cases. Mainly, this will happen if <B>nano</B> 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, <B>nano</B> will write all the open buffers -to the respective emergency files. +named +<I>nano.save</I> + +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, <B>nano</B> will write all the open buffers to the +respective emergency files. <P> <A NAME="lbAH"> </A> <H2>BUGS</H2> Please send any comments or bug reports to -<BR> - -<B><A HREF="mailto:nano@nano-editor.org">nano@nano-editor.org</A>.</B> - -<BR> +<B><A HREF="mailto:nano@nano-editor.org">nano@nano-editor.org</A></B>. +<P> The <B>nano</B> mailing list is available from -<BR> +<B><A HREF="mailto:nano-devel@gnu.org">nano-devel@gnu.org</A></B>. -<B><A HREF="mailto:nano-devel@gnu.org">nano-devel@gnu.org</A>.</B> +<P> +To subscribe, email to +<B><A HREF="mailto:nano-devel-request@gnu.org">nano-devel-request@gnu.org</A></B> -To subscribe, email to <A HREF="mailto:nano-devel-request@gnu.org">nano-devel-request@gnu.org</A> with a -subject of "subscribe". +with a subject of "subscribe". <P> <A NAME="lbAI"> </A> <H2>HOMEPAGE</H2> @@ -242,9 +264,13 @@ subject of "subscribe". <A NAME="lbAK"> </A> <H2>AUTHOR</H2> -Chris Allegretta <<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>>, et al (see AUTHORS and THANKS for -details). -This manual page was originally written by Jordi Mallach +Chris Allegretta <<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>>, et al (see +<I>AUTHORS</I> + +and +<I>THANKS</I> + +for details). This manual page was originally written by Jordi Mallach <<A HREF="mailto:jordi@sindominio.net">jordi@sindominio.net</A>>, for the Debian GNU system (but may be used by others). <P> @@ -267,6 +293,6 @@ used by others). This document was created by <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 04:08:28 GMT, February 13, 2003 +Time: 22:27:55 GMT, June 19, 2003 </BODY> </HTML> diff --git a/nanorc.5 b/nanorc.5 index 54a919eb8223da71606b2873caae9fd62a82ca9a..c9f4e8bdb5d926eaf15baff51c1b84cf601a51d8 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 35d0224f37a31eeaaa2a4b21aa6310a5642c53a4..849f89e8be6033e36ac1cf2e6312c4680208d221 100644 --- a/nanorc.5.html +++ b/nanorc.5.html @@ -1,7 +1,7 @@ <HTML><HEAD><TITLE>Manpage of NANORC</TITLE> </HEAD><BODY> <H1>NANORC</H1> -Section: File Formats (5)<BR>Updated: February 9, 2003<BR><A HREF="#index">Index</A> +Section: File Formats (5)<BR>Updated: June 19, 2003<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> @@ -11,15 +11,6 @@ Section: File Formats (5)<BR>Updated: February 9, 2003<BR><A HREF="#index">Index nanorc - GNU nano's rcfile <A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - -<B>/etc/nanorc</B> - -<B>$HOME/.nanorc</B> - -<BR> - -<A NAME="lbAD"> </A> <H2>DESCRIPTION</H2> This manual page documents GNU <B>nano</B>'s rcfile. @@ -31,7 +22,16 @@ than just copying Pico's look and feel, <B>nano</B> also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number". <P> -<A NAME="lbAE"> </A> + +The <I>nanorc</I> file contains the default settings for <B>nano</B>. +During startup, <B>nano</B> will first read its system-wide settings from +<I>$SYSCONFDIR/nanorc</I>, + +and then user-specific settings from +<I>~/.nanorc</I>. + +<P> +<A NAME="lbAD"> </A> <H2>OPTIONS</H2> 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. <P> +Options are unset by default, except for options that take an argument. +<P> The supported commands and arguments are: <P> <DL COMPACT> <DT><B>set/unset autoindent</B><DD> Use auto-indentation. <DT><B>set/unset backup</B><DD> -Create backup files in filename~. +Create backup files in +<I>filename~</I>. + <DT><B>set/unset const</B><DD> -Constantly update the cursor position. +Constantly display the cursor position in the status bar. <DT><B>set/unset cut</B><DD> Use cut to end of line with ^K by default. <DT><B>set fill </B><I>n</I><DD> -Set the column where lines will be wrapped at to <I>n</I>. +Wrap lines at column number <I>n</I>. If <I>n</I> is 0 or less, the line +length will be the screen width less <I>n</I>. The default value is -8. +<DT><B>set/unset historylog</B><DD> +Enable +<I>~/.nano_history</I> + +for saving and reading search/replace strings. <DT><B>set/unset keypad</B><DD> Use alternate keypad routines. <DT><B>set/unset multibuffer</B><DD> @@ -69,20 +79,28 @@ Don't display the help lists at the bottom of the screen. <DT><B>set/unset nowrap</B><DD> Don't wrap text at all. <DT><B>set operatingdir "</B><I>directory</I>"<DD> -Set operating directory (chroots the user to <I>directory</I> and below). +<B>nano</B> will only read and write files inside <I>directory</I> 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. <DT><B>set/unset preserve</B><DD> Preserve the XON and XOFF keys (^Q and ^S). <DT><B>set quotestr "</B><I>string</I>"<DD> -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 +<P> +<TT> </TT>set quotestr "^([ \t]*[|>:}#])+"<BR> +<P> +if you have regexps, otherwise set quotestr "> ". Note that '\t' +above stands for a literal Tab character. <DT><B>set/unset regexp</B><DD> Do regular expression searches by default. <DT><B>set/unset smooth</B><DD> Use smooth scrolling by default. <DT><B>set speller </B><I>spellprog</I><DD> -Use spelling checker <I>spellprog</I> instead of the default (spell). +Use spelling checker <I>spellprog</I> instead of the built-in one, which +calls <I>spell</I>. <DT><B>set/unset suspend</B><DD> Allow nano to be suspended with ^Z. <DT><B>set tabsize </B><I>n</I><DD> @@ -90,8 +108,6 @@ Use a tab size of <I>n</I> instead of the default (8); must be greater than 0. <DT><B>set/unset tempfile</B><DD> Save automatically on exit, don't prompt. -<DT><B>set/unset historylog</B><DD> -Enable ~/.nano_history for saving and reading search/replace strings. <DT><B>set/unset view</B><DD> Disallow file modification. <DT><B>syntax </B><I>str</I> [<I>fileregex</I> ... ] @@ -123,7 +139,20 @@ instance of <I>er</I>. <I> <P> </DL> -</I><A NAME="lbAF"> </A> +</I><A NAME="lbAE"> </A> +<H2>FILES</H2> + +<DL COMPACT> +<DT><I>$SYSCONFDIR/nanorc</I> + +<DD> +System-wide configuration file +<DT><I>~/.nanorc</I> + +<DD> +Per-user configuration file +</DL> +<A NAME="lbAF"> </A> <H2>SEE ALSO</H2> @@ -132,12 +161,18 @@ instance of <I>er</I>. </DL> <P> -<I>/usr/share/doc/nano/examples/nanorc.sample</I> (or equivalent on your system) +<I>/usr/share/doc/nano/examples/nanorc.sample</I> (or equivalent on your +system) <A NAME="lbAG"> </A> <H2>AUTHOR</H2> -Chris Allegretta <<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>>, et al (see AUTHORS and THANKS for -details). +Chris Allegretta <<A HREF="mailto:chrisa@asty.org">chrisa@asty.org</A>>, et al (see +<I>AUTHORS</I> + +and +<I>THANKS</I> + +for details). This manual page was written by Jordi Mallach <<A HREF="mailto:jordi@gnu.org">jordi@gnu.org</A>>. <P> @@ -145,9 +180,9 @@ This manual page was written by Jordi Mallach <<A HREF="mailto:jordi@gnu.org" <A NAME="index"> </A><H2>Index</H2> <DL> <DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">OPTIONS</A><DD> +<DT><A HREF="#lbAC">DESCRIPTION</A><DD> +<DT><A HREF="#lbAD">OPTIONS</A><DD> +<DT><A HREF="#lbAE">FILES</A><DD> <DT><A HREF="#lbAF">SEE ALSO</A><DD> <DT><A HREF="#lbAG">AUTHOR</A><DD> </DL> @@ -155,6 +190,6 @@ This manual page was written by Jordi Mallach <<A HREF="mailto:jordi@gnu.org" This document was created by <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 04:08:33 GMT, February 13, 2003 +Time: 22:28:00 GMT, June 19, 2003 </BODY> </HTML>