Fix up merged ChangeLog entries

diff --git a/ChangeLog b/ChangeLog
index d2da3d8527b4081b8db3802118d124b9d75add25..3b48ce425008ecfa86f1ef5fdae3978386d87455 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,6 @@
 
        * configure.in: Don't use the -R option (Bug#11251).
 
-2012-04-20  Teodor Zlatanov  <tzz@lifelogs.com>
-
-       * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls.
-
 2012-04-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        configure: new option --enable-gcc-warnings (Bug#11207)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 284a1230a830251ffa7fec9a10e65acd8254155b..cc5660653f6767e7948f6e10968ccd55e0e4d77e 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -16,8 +16,6 @@
        * elisp.texi, vol1.texi, vol2.texi, minibuf.texi (Completion):
        Update "High-Level Completion" description.
 
-2012-04-19  Glenn Morris  <rgm@gnu.org>
-
        * minibuf.texi (Minibuffers):
        * elisp.texi, vol1.texi, vol2.texi: Fix minibuffer subsection order.
 
@@ -36,17 +34,15 @@
        (Minibuffer Misc): Mention minibuffer-message-timeout, and
        minibuffer-inactive-mode.
 
-2012-04-18  Glenn Morris  <rgm@gnu.org>
-
        * processes.texi (Serial Ports, Byte Packing, Bindat Spec)
        (Bindat Functions): Copyedits.
 
-2012-04-18  Christopher Schmidt  <christopher@ch.ristopher.com>
+2012-04-20  Christopher Schmidt  <christopher@ch.ristopher.com>
 
        * files.texi (Saving Buffers): Document `visit and `visit-save'
        values of require-final-newline.
 
-2012-04-18  Glenn Morris  <rgm@gnu.org>
+2012-04-20  Glenn Morris  <rgm@gnu.org>
 
        * processes.texi (Output from Processes, Filter Functions):
        Mention waiting-for-user-input-p.
@@ -56,14 +52,14 @@
        (Network): Add encrypted network overview paragraph.
        Cross-reference the Emacs-GnuTLS manual.  Use @acronym.
 
-2012-04-17  Chong Yidong  <cyd@gnu.org>
+2012-04-20  Chong Yidong  <cyd@gnu.org>
 
        * help.texi (Keys in Documentation): Mention :advertised-binding.
 
        * keymaps.texi (Menu Bar): Move most of the :advertised-binding
        description to help.texi.
 
-2012-04-16  Glenn Morris  <rgm@gnu.org>
+2012-04-20  Glenn Morris  <rgm@gnu.org>
 
        * processes.texi (Process Information, Input to Processes)
        (Signals to Processes, Output from Processes, Process Buffers)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 20c453544bc9df142edc1c71688ad4d843d5abcd..14f389044bba44a00858c2f7d53776333bec1022 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -3,21 +3,6 @@
        * faq.texi (New in Emacs 24): New section.
        (Packages that do not come with Emacs): Mention M-x list-packages.
 
-2012-04-20  Glenn Morris  <rgm@gnu.org>
-
-       * Makefile.in: Replace non-portable use of $< in emacs-gnutls rules.
-
-2012-04-20  Eli Zaretskii  <eliz@gnu.org>
-
-       * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add emacs-gnutls.
-       ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets.
-
-2012-04-20  Teodor Zlatanov  <tzz@lifelogs.com>
-
-       * emacs-gnutls.texi: Add documentation for the GnuTLS integration.
-       * Makefile.in: Add emacs-gnutls.texi to build.
-
-2012-04-20  Alan Mackenzie  <acm@muc.de>
 2012-04-14  Alan Mackenzie  <acm@muc.de>
 
        * cc-mode.texi (c-offsets-alist): Correct a typo.