Merge changes from emacs-23 branch.

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 1e355687c00684e665c120740ac94a29ee34a3e0..f2810be7f97eb07772880530b1798cec737114f5 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,11 +1,19 @@
-2010-10-10  Glenn Morris  <rgm@gnu.org>
+2010-10-12  Glenn Morris  <rgm@gnu.org>
 
        * emacs.1: Small fixes.
 
-2010-10-09  Ulrich Mueller  <ulm@gentoo.org>
+2010-10-12  Ulrich Mueller  <ulm@gentoo.org>
 
        * emacs.1: Update license description.
 
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+       * b2m.1: Remove file.
+
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+       * etags.1: xz compression is now supported.
+
 2010-08-26  Sven Joachim  <svenjoac@gmx.de>
 
        * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
@@ -14,10 +22,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>