# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1122502846 0
# Node ID 883ca83abac41e9926df9ec7ad9a4e4b085b0f29
# Parent  af1c58687bddc4fb41705fd44e20bbb4c8046073
Revision: miles@gnu.org--gnu-2005/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  <Reiner.Steib@gmx.de>

   * 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.

diff -r af1c58687bdd -r 883ca83abac4 man/ChangeLog
--- a/man/ChangeLog	Wed Jul 27 18:02:08 2005 +0000
+++ b/man/ChangeLog	Wed Jul 27 22:20:46 2005 +0000
@@ -1,3 +1,9 @@
+2005-07-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* 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  <eliz@gnu.org>
 
 	* files.texi (Quoted File Names): Add index entry.
diff -r af1c58687bdd -r 883ca83abac4 man/gnus.texi
--- a/man/gnus.texi	Wed Jul 27 18:02:08 2005 +0000
+++ b/man/gnus.texi	Wed Jul 27 22:20:46 2005 +0000
@@ -1468,15 +1468,17 @@
 @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