aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorMiles Bader <[email protected]>2005-07-27 22:20:46 +0000
committerMiles Bader <[email protected]>2005-07-27 22:20:46 +0000
commit753f8b0f930d82fc6c5f23144db936129b54d1c6 (patch)
tree1b05256de263e9b146bc78a292b16ddbe6048872 /man
parent4f0c9ba732c47b273fdb409f258570eae51b94e9 (diff)
Revision: [email protected]/emacs--cvs-trunk--0--patch-501
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 97) - Update from CVS 2005-07-27 Reiner Steib <[email protected]> * man/gnus.texi (Startup Files): Fix name of gnus-site-init-file. Mention that gnus-init-file is not read when Emacs is invoked with --no-init-file or -q.
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog6
-rw-r--r--man/gnus.texi8
2 files changed, 11 insertions, 3 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 92341ea9a5..5e72353f89 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-27 Reiner Steib <[email protected]>
+
+ * gnus.texi (Startup Files): Fix name of gnus-site-init-file.
+ Mention that gnus-init-file is not read when Emacs is invoked with
+ --no-init-file or -q.
+
2005-07-22 Eli Zaretskii <[email protected]>
* files.texi (Quoted File Names): Add index entry.
diff --git a/man/gnus.texi b/man/gnus.texi
index b1d5be2265..3317b85e3e 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -1468,15 +1468,17 @@ startup files. If you want to turn backup creation off, say something like:
@vindex gnus-init-file
@vindex gnus-site-init-file
When Gnus starts, it will read the @code{gnus-site-init-file}
-(@file{.../site-lisp/gnus} by default) and @code{gnus-init-file}
+(@file{.../site-lisp/gnus-init} by default) and @code{gnus-init-file}
(@file{~/.gnus} by default) files. These are normal Emacs Lisp files
and can be used to avoid cluttering your @file{~/.emacs} and
@file{site-init} files with Gnus stuff. Gnus will also check for files
with the same names as these, but with @file{.elc} and @file{.el}
suffixes. In other words, if you have set @code{gnus-init-file} to
@file{~/.gnus}, it will look for @file{~/.gnus.elc}, @file{~/.gnus.el},
-and finally @file{~/.gnus} (in this order).
-
+and finally @file{~/.gnus} (in this order). If Emacs was invoked with
+the @option{-q} or @option{--no-init-file} options (@pxref{Initial
+Options, ,Initial Options, emacs, The Emacs Manual}), Gnus doesn't read
+@code{gnus-init-file}.
@node Auto Save