2 files changed, 18 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4375de0c189..53adc193d6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 16e9373c5b3..faecf0e138b 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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>