From 3bcca171ae45aba74f5e37a8c56ea94a68f73014 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 27 Apr 2006 17:29:19 +0000 Subject: [PATCH] in nanorc.5 and nanorc.sample, mention that the nanorc file should not be in DOS or Mac format git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3441 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ doc/man/nanorc.5 | 10 +++++----- doc/nanorc.sample | 5 +++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42f46f7c..c8ba6ec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,9 @@ CVS code - - Explicitly mention that all regexes should be extended regular expressions. (DLR, suggested by John M. Gabriele) - Miscellaneous minor fixes. (DLR) +- doc/nanorc.5: + - Mention that the nanorc file should not be in DOS or Mac + format. (DLR) - doc/nano.texi: - Change license to GPL, in order to match the rest of the documentation, and because the current license is incompatible @@ -193,6 +196,8 @@ CVS code - - Explicitly mention that all regexes should be extended regular expressions. (DLR, suggested by John M. Gabriele) - Simplify the "nanorc" regex for commands. (DLR) + - Mention that the nanorc file should not be in DOS or Mac + format. (DLR) - UPGRADE: - Miscellaneous minor fixes. (DLR) diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index bc485b2e..92c411ab 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -7,7 +7,7 @@ .\" warranty. .\" .\" $Id$ -.TH NANORC 5 "version 1.3.11" "April 13, 2006" +.TH NANORC 5 "version 1.3.11" "April 27, 2006" .\" Please adjust this date whenever revising the manpage. .\" .SH NAME @@ -21,10 +21,10 @@ 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 -The \fInanorc\fP file contains the default settings for \fBnano\fP. -During startup, \fBnano\fP will first read its system-wide settings from -\fISYSCONFDIR/nanorc\fP, and then user-specific settings from -\fI~/.nanorc\fP. +The \fInanorc\fP file contains the default settings for \fBnano\fP. It +should not be in DOS or Mac format. During startup, \fBnano\fP will +first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and +then user-specific settings from \fI~/.nanorc\fP. .SH OPTIONS The configuration file accepts a series of \fBset\fP and \fBunset\fP diff --git a/doc/nanorc.sample b/doc/nanorc.sample index aed9e3c1..87c7ca06 100644 --- a/doc/nanorc.sample +++ b/doc/nanorc.sample @@ -1,8 +1,9 @@ ## Sample initialization file for GNU nano. ## ## Please note that you must have configured nano with --enable-nanorc -## for this file to be read! Also note that characters specially -## interpreted by the shell should not be escaped here. +## for this file to be read! Also note that this file should not be in +## DOS or Mac format, and that characters specially interpreted by the +## shell should not be escaped here. ## ## To make sure a value is not enabled, use "unset