# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1167616642 0
# Node ID 61482036b5b2771ddb6d73c6935f53fa54331b0e
# Parent  b1c1e60969db629ad1a6d4132531aabe2fb9ba96
*** empty log message ***

diff -r b1c1e60969db -r 61482036b5b2 man/ChangeLog
--- a/man/ChangeLog	Mon Jan 01 01:57:16 2007 +0000
+++ b/man/ChangeLog	Mon Jan 01 01:57:22 2007 +0000
@@ -1,6 +1,15 @@
+2007-01-01  Richard Stallman  <rms@gnu.org>
+
+	* commands.texi (User Input): Document keys stolen by window mangers.
+
+2006-12-31  Richard Stallman  <rms@gnu.org>
+
+	* custom.texi (Specific Customization): Document customize-option
+	instead of customize-variable.
+
 2006-12-31  Kim F. Storm  <storm@cua.dk>
 
-	* major.texi (Choosing Modes): Document auto-mode-case-fond.
+	* major.texi (Choosing Modes): Document auto-mode-case-fold.
 
 2006-12-30  Kim F. Storm  <storm@cua.dk>
 
@@ -44,6 +53,7 @@
 	(IMAP): Document nnimap-search-uids-not-since-is-evil and
 	nnimap-nov-is-evil.
 
+>>>>>>> 1.1170
 2006-12-27  Eli Zaretskii  <eliz@gnu.org>
 
 	* msdog.texi (Windows Keyboard): Mention widespread Windows bindings,