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

diff -r 673d94c09ed4 -r 142b6109f5b7 man/ChangeLog
--- a/man/ChangeLog	Sun Oct 30 03:55:56 2005 +0000
+++ b/man/ChangeLog	Sun Oct 30 03:56:16 2005 +0000
@@ -1,3 +1,9 @@
+2005-10-29  Chong Yidong  <cyd@stupidchicken.com>
+
+	* custom.texi (Init File): Document ~/.emacs.d/init.el.
+
+	* anti.texi (Antinews): Likewise.
+
 2005-10-29  Sascha Wilde  <wilde@sha-bang.de>
 
 	* pgg.texi (How to use): Update the example to add autoload of
diff -r 673d94c09ed4 -r 142b6109f5b7 man/anti.texi
--- a/man/anti.texi	Sun Oct 30 03:55:56 2005 +0000
+++ b/man/anti.texi	Sun Oct 30 03:56:16 2005 +0000
@@ -63,9 +63,10 @@
 functions.
 
 @item
-Emacs now looks for @file{.emacs} and @file{.emacs_SHELL} in one
-standard location---your home directory.  Don't put these files in
-@file{~/.emacs.d}; they won't be found.
+We have standardized on one location for the user init file: the file
+named @file{.emacs} in your home directory.  Emacs will not look for
+the init file in @file{~/.emacs.d/init.el}.  Similarly, don't try
+putting @file{.emacs_SHELL} in @file{~/.emacs.d}; Emacs won't find it.
 
 @item
 Emacs will not read @file{~/.abbrev_defs} automatically.  If you want
diff -r 673d94c09ed4 -r 142b6109f5b7 man/custom.texi
--- a/man/custom.texi	Sun Oct 30 03:55:56 2005 +0000
+++ b/man/custom.texi	Sun Oct 30 03:56:16 2005 +0000
@@ -1983,13 +1983,15 @@
 @cindex startup (init file)
 
   When Emacs is started, it normally loads a Lisp program from the
-file @file{.emacs} or @file{.emacs.el} in your home directory.  (You
-can also put it in a subdirectory @file{~/.emacs.d} and Emacs will
-still find it.)  We call this file your @dfn{init file} because it
-specifies how to initialize Emacs for you.  You can use the command
-line switch @samp{-q} to prevent loading your init file, and @samp{-u}
-(or @samp{--user}) to specify a different user's init file
-(@pxref{Initial Options}).
+file @file{.emacs} or @file{.emacs.el} in your home directory.  We
+call this file your @dfn{init file} because it specifies how to
+initialize Emacs for you.  You can use the command line switch
+@samp{-q} to prevent loading your init file, and @samp{-u} (or
+@samp{--user}) to specify a different user's init file (@pxref{Initial
+Options}).
+
+  You can also use @file{~/.emacs.d/init.el} as the init file.  Emacs
+tries this if it cannot find @file{~/.emacs} or @file{~/.emacs.el}.
 
 @cindex @file{default.el}, the default init file
   There can also be a @dfn{default init file}, which is the library