# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1130680970 0
# Node ID 6c85f5b61c07163926ad89a6a289ce6e16381199
# Parent  ba2cdafde95641c1cfd598f3000d3ace1c1b3415
.emacs.d/.emacs changed to .emacs.d/init.el

diff -r ba2cdafde956 -r 6c85f5b61c07 etc/NEWS
--- a/etc/NEWS	Sun Oct 30 12:10:14 2005 +0000
+++ b/etc/NEWS	Sun Oct 30 14:02:50 2005 +0000
@@ -192,8 +192,9 @@
 
 +++
 ** Init file changes
-You can now put the init files .emacs and .emacs_SHELL under
-~/.emacs.d or directly under ~.  Emacs will find them in either place.
+If the init file ~/.emacs does not exist, Emacs will try
+~/.emacs.d/init.el or ~/.emacs.d/init.elc.  You can also put the shell
+init file .emacs_SHELL under ~/.emacs.d.
 
 +++
 ** Emacs now reads the standard abbrevs file ~/.abbrev_defs