# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1130644556 0
# Node ID 673d94c09ed4f4e25dd4d1c5b1a3722985b4eb2c
# Parent  33b15a14f9b352cf5d935f937ba45ed0e44ab204
Document ~/.emacs.d/init.el.

diff -r 33b15a14f9b3 -r 673d94c09ed4 lispref/ChangeLog
--- a/lispref/ChangeLog	Sun Oct 30 03:02:43 2005 +0000
+++ b/lispref/ChangeLog	Sun Oct 30 03:55:56 2005 +0000
@@ -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 -r 33b15a14f9b3 -r 673d94c09ed4 lispref/os.texi
--- a/lispref/os.texi	Sun Oct 30 03:02:43 2005 +0000
+++ b/lispref/os.texi	Sun Oct 30 03:55:56 2005 +0000
@@ -180,10 +180,11 @@
 
   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