merge changes in emacs-23 branch

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 3bee2a1011ab5cec78c113e705e80770f672d0b1..47f059e7d3cf742b71488d5b25fa42126d6dd45f 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -6,10 +6,14 @@
 
        * Version 23.2 released.
 
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Branch for 23.2.
+
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
-       * emacs.1: Copyedits.  Update options -Q, -mm and --daemon.  Remove
-       deprecated --unibyte option.
+       * emacs.1: Copyedits.  Update options -Q, -mm and --daemon.
+       Remove deprecated --unibyte option.
 
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>