[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107976: Fix up merged ChangeLog entries

[Glenn Morris]

------------------------------------------------------------
revno: 107976
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-04-20 09:27:52 -0700
message:
  Fix up merged ChangeLog entries
modified:
  ChangeLog
  doc/lispref/ChangeLog
  doc/misc/ChangeLog

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-20 08:48:50 +0000
+++ b/ChangeLog 2012-04-20 16:27:52 +0000
@@ -2,10 +2,6 @@
 
        * configure.in: Don't use the -R option (Bug#11251).
 
-2012-04-20  Teodor Zlatanov  <address@hidden>
-
-       * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls.
-
 2012-04-18  Paul Eggert  <address@hidden>
 
        configure: new option --enable-gcc-warnings (Bug#11207)

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-04-20 08:48:50 +0000
+++ b/doc/lispref/ChangeLog     2012-04-20 16:27:52 +0000
@@ -16,8 +16,6 @@
        * elisp.texi, vol1.texi, vol2.texi, minibuf.texi (Completion):
        Update "High-Level Completion" description.
 
-2012-04-19  Glenn Morris  <address@hidden>
-
        * 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  <address@hidden>
-
        * processes.texi (Serial Ports, Byte Packing, Bindat Spec)
        (Bindat Functions): Copyedits.
 
-2012-04-18  Christopher Schmidt  <address@hidden>
+2012-04-20  Christopher Schmidt  <address@hidden>
 
        * files.texi (Saving Buffers): Document `visit and `visit-save'
        values of require-final-newline.
 
-2012-04-18  Glenn Morris  <address@hidden>
+2012-04-20  Glenn Morris  <address@hidden>
 
        * 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  <address@hidden>
+2012-04-20  Chong Yidong  <address@hidden>
 
        * 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  <address@hidden>
+2012-04-20  Glenn Morris  <address@hidden>
 
        * processes.texi (Process Information, Input to Processes)
        (Signals to Processes, Output from Processes, Process Buffers)

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-04-20 08:48:50 +0000
+++ b/doc/misc/ChangeLog        2012-04-20 16:27:52 +0000
@@ -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  <address@hidden>
-
-       * Makefile.in: Replace non-portable use of $< in emacs-gnutls rules.
-
-2012-04-20  Eli Zaretskii  <address@hidden>
-
-       * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add emacs-gnutls.
-       ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets.
-
-2012-04-20  Teodor Zlatanov  <address@hidden>
-
-       * emacs-gnutls.texi: Add documentation for the GnuTLS integration.
-       * Makefile.in: Add emacs-gnutls.texi to build.
-
-2012-04-20  Alan Mackenzie  <address@hidden>
 2012-04-14  Alan Mackenzie  <address@hidden>
 
        * cc-mode.texi (c-offsets-alist): Correct a typo.