Document ~/.emacs.d/init.el.

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 50cb7baa1bcb1aad5d113bbe4b540594bef1e882..0b8b80760a2a50307fac837a2eb1b69be3e4e53e 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * os.texi (Init File): Document ~/.emacs.d/init.el.
+
 2005-10-29  Richard M. Stallman  <rms@gnu.org>
 
        * internals.texi (Garbage Collection): Document memory-full.

diff --git a/lispref/os.texi b/lispref/os.texi
index ac2350ac255734c0d39286e2c19428aae6e9e4c7..3761620c7d025b9f4a315c784eaa8a5e3a35dd03 100644 (file)
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -180,10 +180,11 @@ for someone else.
 
   When you start Emacs, it normally attempts to load your @dfn{init
 file}, a file in your home directory.  Its normal name is
-@file{.emacs}, but you can alternatively call it @file{.emacs.el}.
-You can also store it inside a subdirectory @file{.emacs.d}.
-Whichever place you use, you can also compile the file (@pxref{Byte
-Compilation}); then the actual file loaded will be @file{.emacs.elc}.
+@file{.emacs}, but you can also call it @file{.emacs.el}.
+Alternatively, you can use a file named @file{init.el} in a
+subdirectory @file{.emacs.d}.  Whichever place you use, you can also
+compile the file (@pxref{Byte Compilation}); then the actual file
+loaded will be @file{.emacs.elc} or @file{init.elc}.
 
   The command-line switches @samp{-q}, @samp{-Q}, and @samp{-u}
 control whether and where to find the init file; @samp{-q} (and the