Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 06ff5782003332152dc6493302af7694fde74474..8a2a90f7895305337d7eb694f12a34687f754367 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,8 +1,40 @@
+2012-12-02  Kevin Ryde  <user42@zip.com.au>
+
+       * etags.1: Mention effect of --declarations in Lisp.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+       * rcs-checkin.1: Remove.
+
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.1: Bump version to 24.1.50.
+
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * etags.1: Fix typo.
+
+2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * emacsclient.1: Document how -a "" starts the daemon.
+
+2011-09-17  Sven Joachim  <svenjoac@gmx.de>
+
+       * emacs.1: Escape a dash.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+       * emacsclient.1: Document exit status.
+
+2011-06-25  Andreas Rottmann  <a.rottmann@gmx.at>
+
+       * emacsclient.1: Mention --frame-parameters.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.
 
-2011-01-02  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
+2011-01-02  Jari Aalto  <jari.aalto@cante.net>
 
        * emacsclient.1: Arrange options alphabetically (Bug#7620).
 
@@ -110,11 +142,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007-2011  Free Software Foundation, Inc.
+  Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.