# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1137033305 0
# Node ID 3466a3a9a18149796f0a694674bb88ef420674f2
# Parent  7864e29d620b4c9b8ce021e9ce8774d8e427833e
*** empty log message ***

diff -r 7864e29d620b -r 3466a3a9a181 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jan 12 02:33:20 2006 +0000
+++ b/lisp/ChangeLog	Thu Jan 12 02:35:05 2006 +0000
@@ -1,3 +1,15 @@
+2006-01-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* cus-edit.el (custom-reset-menu, custom-buffer-create-internal)
+	(custom-variable-menu, custom-face-menu, custom-group-menu)
+	(Custom-mode-menu): Change names of menu items.  (As discussed on
+	emacs-devel.)
+	(custom-face-menu): Add "Undo Edits" item.
+
+	* startup.el (init-file-user): defcustom -> defvar.
+
+	* tooltip.el (tooltip-mode): Doc fix.
+
 2006-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* reveal.el (reveal-post-command): window-buffer signals an error on
diff -r 7864e29d620b -r 3466a3a9a181 man/ChangeLog
--- a/man/ChangeLog	Thu Jan 12 02:33:20 2006 +0000
+++ b/man/ChangeLog	Thu Jan 12 02:35:05 2006 +0000
@@ -1,3 +1,8 @@
+2006-01-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* custom.texi (Changing a Variable, Face Customization): Update
+	for changes in Custom menus.
+
 2006-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.
@@ -40,7 +45,7 @@
 
 2006-01-05  Carsten Dominik  <dominik@science.uva.nl>
 
-	* org.texi: (Agenda Views): Chapter reorganized.
+	* org.texi (Agenda Views): Chapter reorganized.
 
 2006-01-02  Chong Yidong  <cyd@stupidchicken.com>