commit 639f37669ac2afc29f2ccd2cf44d5a8ebbb5a1fd
parent 6d720bf7b208bb900405b4856d9c7d98dcf77307
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Thu, 12 Mar 2020 19:03:02 +0100
docs: remove the note saying that nanorc files must be in Unix format
Since commit 98f038ad from a month ago, nanorc files do not need to be
in Unix format (LF) but may also be in DOS (CR+LF) and Mac (CR) format.
Diffstat:
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -690,9 +690,8 @@ The following global toggles are available:
@node Nanorc Files
@chapter Nanorc Files
-The nanorc files contain the default settings for @command{nano}. They
-should be in Unix format, not in DOS or Mac format. During startup,
-if @option{--rcfile} is not given, @command{nano} will read two files:
+The nanorc files contain the default settings for @command{nano}. During
+startup, if @option{--rcfile} is not given, @command{nano} will read two files:
first the system-wide settings, from @file{/etc/nanorc} (the exact path
might be different on your system), and then the user-specific settings,
either from @file{~/.nanorc} or from @file{$XDG_CONFIG_HOME/nano/nanorc}
diff --git a/doc/nanorc.5 b/doc/nanorc.5
@@ -22,10 +22,9 @@
nanorc \- GNU nano's configuration file
.SH DESCRIPTION
-The \fInanorc\fP files contain the default settings for \fBnano\fP, a
-small and friendly editor. They should be in Unix format, not in
-DOS or Mac format. During startup, if \fB\-\-rcfile\fR is not given,
-\fBnano\fR will read two files: first the
+The \fInanorc\fP files contain the default settings for \fBnano\fP,
+a small and friendly editor. During startup, if \fB\-\-rcfile\fR
+is not given, \fBnano\fR will read two files: first the
system-wide settings, from \fI/etc/nanorc\fP (the exact path might be
different on your system), and then the user-specific settings, either
from \fI~/.nanorc\fR or from \fI$XDG_CONFIG_HOME/nano/nanorc\fR
diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in
@@ -1,15 +1,12 @@
## Sample initialization file for GNU nano.
##
-## This file should not be in DOS or Mac format, and characters
-## specially interpreted by the shell should not be escaped here.
-##
-## To make sure an option is disabled, use "unset <option>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## Inside string parameters, quotes should not be escaped. The last
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
## double quote on the line will be seen as the closing quote.
+##
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default. To make sure that an option
+## is disabled, you can use "unset <option>".
## Make the 'nextword' function (Ctrl+Right) stop at word ends
## instead of at beginnings.
