Synch to No Gnus 200507272221.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index da9e4d9..aec41b5 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -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-20  Didier Verna  <didier@xemacs.org>
 
        * gnus.texi (Email Based Diary): New. Proper documentation for the

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 81f3183..a5d1c65 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1509,7 +1509,7 @@ gnus \e$B$,$I$N%0%k!<%W$,?7$7$$$+$N5-O?$r;}$C$F$$$J$$$3$H$K$J$j$^$9$N$G!"?7\e(B
 @vindex gnus-init-file
 @vindex gnus-site-init-file
 Gnus \e$B$,5/F0$9$k$H!"\e(B@code{gnus-site-init-file} (\e$B=i4|@_Dj$G\e(B
-\e$B$O\e(B @file{.../site-lisp/gnus}) \e$B$H\e(B @code{gnus-init-file} (\e$B=i4|@_Dj$G\e(B
+\e$B$O\e(B @file{.../site-lisp/gnus-init}) \e$B$H\e(B @code{gnus-init-file} (\e$B=i4|@_Dj$G\e(B
 \e$B$O\e(B @file{~/.gnus}) \e$B$N%U%!%$%k$rFI$_9~$_$^$9!#$3$l$i$OIaDL\e(B
 \e$B$N\e(B Emacs Lisp \e$B%U%!%$%k$G!"\e(B@file{~/.emacs} \e$B$d\e(B @file{site-init} \e$B%U%!%$%k\e(B
 \e$B$r\e(B gnus \e$B4X78$N$b$N$GMp;($K$7$J$$$h$&$K$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#\e(B
@@ -1517,7 +1517,10 @@ Gnus \e$B$O$3$l$i$HF1$8L>A0$N%U%!%$%k$K!"@\Hx8l\e(B @file{.elc} \e$B$H\e(B @file{.el
 \e$BIU$$$F$$$k$b$N$bD4$Y$^$9!#8@$$49$($l$P!"\e(B
 @code{gnus-init-file} \e$B$r\e(B @file{~/.gnus} \e$B$K@_Dj$9$k$H!"\e(B
 gnus \e$B$O\e(B @file{~/.gnus.elc}, @file{~/.gnus.el} \e$B$rC5$7!":G8e\e(B
-\e$B$K\e(B @file{~/.gnus} \e$B$r\e(B (\e$B$3$N=gHV$K\e(B) \e$BC5$7$^$9!#\e(B
+\e$B$K\e(B @file{~/.gnus} \e$B$r\e(B (\e$B$3$N=gHV$K\e(B) \e$BC5$7$^$9!#\e(B@option{-q} \e$B$^$?\e(B
+\e$B$O\e(B @option{--no-init-file} \e$B%*%W%7%g%s\e(B (@pxref{Initial Options, ,Initial
+Options, emacs, The Emacs Manual}) \e$B$,;XDj$5$l$F\e(B Emacs \e$B$,5/F0$5$l$?>l9g!"\e(B
+Gnus \e$B$O\e(B @code{gnus-init-file} \e$B$rFI$_9~$_$^$;$s!#\e(B
 
 @node Auto Save
 @section \e$B<+F0J]B8\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 49f2113..0f48b68 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1497,16 +1497,18 @@ 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}
+When Gnus starts, it will read the @code{gnus-site-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
+@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