diff --git a/doc/nano.texi b/doc/nano.texi index 0f5d9d32..84861330 100644 --- 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 index 6e0a3dbd..d0388d2e 100644 --- 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 index ef634380..1e00062a 100644 --- 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