summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLute Kamstra <lute@gnu.org>2005-01-27 08:58:52 +0000
committerLute Kamstra <lute@gnu.org>2005-01-27 08:58:52 +0000
commit56366094d765e90c933bf6fc88e16bda25ebad87 (patch)
treec08e1fb01c705b4fad08825379c827feb8dd22e8
parent3bf93f74020a5df8e1449b7aecb130e667c78af7 (diff)
downloademacs-56366094d765e90c933bf6fc88e16bda25ebad87.tar.gz
(Initial Options): Add a cross reference to `Init File'. Mention the
`-Q' option at the `--no-site-file' option.
-rw-r--r--man/ChangeLog5
-rw-r--r--man/cmdargs.texi9
2 files changed, 10 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 63e3591265e..0e4f2a88bbf 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-26 Lute Kamstra <lute@gnu.org>
+
+ * cmdargs.texi (Initial Options): Add a cross reference to `Init
+ File'. Mention the `-Q' option at the `--no-site-file' option.
+
2005-01-24 David Kastrup <dak@gnu.org>
* faq.texi: Update AUCTeX version info.
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index b06aac4bdb6..960f2d0bd65 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -169,8 +169,9 @@ sections.
Some initial options affect the loading of init files. The normal
actions of Emacs are to first load @file{site-start.el} if it exists,
then your own init file @file{~/.emacs} if it exists, and finally
-@file{default.el} if it exists; certain options prevent loading of some
-of these files or substitute other files for them.
+@file{default.el} if it exists. @xref{Init File}. Certain options
+prevent loading of some of these files or substitute other files for
+them.
@table @samp
@item -t @var{device}
@@ -257,8 +258,8 @@ changed with the @kbd{M-x customize} command and its variants.
@opindex --no-site-file
@cindex @file{site-start.el} file, not loading
Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u}
-and @samp{--batch} have no effect on the loading of this file---this is
-the only option that blocks it.
+and @samp{--batch} have no effect on the loading of this file---this
+option and @samp{-Q} are the only options that block it.
@item -Q
@opindex -Q