From: Glenn Morris Date: Fri, 20 Apr 2012 16:27:52 +0000 (-0700) Subject: Fix up merged ChangeLog entries X-Git-Tag: emacs-24.2.90~471^2~331 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61bb069e8c230357017be65d59ccea36c3cd91b1;p=emacs.git Fix up merged ChangeLog entries --- diff --git a/ChangeLog b/ChangeLog index d2da3d8527b..3b48ce42500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,6 @@ * configure.in: Don't use the -R option (Bug#11251). -2012-04-20 Teodor Zlatanov - - * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls. - 2012-04-18 Paul Eggert configure: new option --enable-gcc-warnings (Bug#11207) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 284a1230a83..cc5660653f6 100644 --- 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 - * 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 - * processes.texi (Serial Ports, Byte Packing, Bindat Spec) (Bindat Functions): Copyedits. -2012-04-18 Christopher Schmidt +2012-04-20 Christopher Schmidt * files.texi (Saving Buffers): Document `visit and `visit-save' values of require-final-newline. -2012-04-18 Glenn Morris +2012-04-20 Glenn Morris * 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 +2012-04-20 Chong Yidong * 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 +2012-04-20 Glenn Morris * 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 20c453544bc..14f389044bb 100644 --- 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 - - * Makefile.in: Replace non-portable use of $< in emacs-gnutls rules. - -2012-04-20 Eli Zaretskii - - * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add emacs-gnutls. - ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets. - -2012-04-20 Teodor Zlatanov - - * emacs-gnutls.texi: Add documentation for the GnuTLS integration. - * Makefile.in: Add emacs-gnutls.texi to build. - -2012-04-20 Alan Mackenzie 2012-04-14 Alan Mackenzie * cc-mode.texi (c-offsets-alist): Correct a typo.