Yet more ChangeLog merge fixes

2 files changed, 0 insertions, 58 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 60fba317232..80d9381ec42 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -3,47 +3,6 @@
 	* frames.texi (Mouse References, Mouse Commands): Fix index
 	entries (Bug#11362).
 
-2012-05-09  Glenn Morris  <rgm@gnu.org>
-
-	* custom.texi (Customization Groups, Custom Themes, Examining):
-	Improve page breaks.
-
-	* rmail.texi (Rmail Display): Use example rather than smallexample.
-
-	* calendar.texi: Convert inforefs to refs.
-
-	* dired.texi (Dired Enter): Improve page break.
-
-	* abbrevs.texi (Abbrev Concepts): Copyedits.
-
-	* maintaining.texi (Registering, Tag Syntax):
-	Tweak line and page breaks.
-
-	* programs.texi (Programs, Electric C): Copyedits.
-	(Program Modes): Add xref to Fortran.
-	(Left Margin Paren): Remove what was (oddly enough) the only use
-	of defvar in the entire Emacs manual.
-	(Hungry Delete): Remove footnote about ancient Emacs version.
-	(Other C Commands): Use example rather than smallexample.
-
-	* text.texi (Pages, Filling, Foldout, Org Mode, HTML Mode)
-	(Nroff Mode, Enriched Indentation, Table Rows and Columns):
-	Tweak line and page breaks.
-
-	* modes.texi (Major Modes, Minor Modes): Reword to improve page-breaks.
-	(Major Modes): Use example rather than smallexample.
-
-	* mule.texi (Output Coding): Reword to improve page-breaks.
-
-	* frames.texi (Fonts): Tweak line and page breaks.
-	Use example rather than smallexample.  Change cross-reference.
-	(Text-Only Mouse): Fix xref.
-
-	* buffers.texi (Buffers, Kill Buffer, Several Buffers)
-	(Indirect Buffers): Tweak line- and page-breaks.
-
-	* fixit.texi (Fixit, Undo): Reword to improve page-breaks.
-
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
 	* custom.texi (Customization Groups, Custom Themes, Examining):
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7c2f61d1298..1b9fa0991e4 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -38,23 +38,6 @@
 	(Sequencing, Conditionals, Signaling Errors, Handling Errors):
 	Tweak page breaks.
 
-	* lists.texi (List-related Predicates, List Variables):
-	Tweak page-breaks.
-	(Sets And Lists): Convert inforef to xref.
-
-	* text.texi (Auto Filling): Don't mention Emacs 19.
-
-	* commands.texi (Event Input Misc): Don't mention unread-command-char.
-	* numbers.texi (Predicates on Numbers): Don't mention Emacs 18.
-
-	* objects.texi (Process Type, Overlay Type): Tweak page-breaks.
-
-	* intro.texi (Caveats): Copyedit.
-	(Lisp History): Convert inforef to xref.
-	(Lisp History, Printing Notation, Version Info): Improve page-breaks.
-
-	* elisp.texi (DATE): Forgot to change the month in 2012-04-21 change.
-
 2012-05-08  Glenn Morris  <rgm@gnu.org>
 
 	* two.el: Remove; unused since creation of two-volume.make.