Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu

1 files changed, 25 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9b58992d2d9..ce556568c56 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,28 @@
+2012-12-27  Glenn Morris  <rgm@gnu.org>
+
+        * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings):
+        Avoid some overfull lines.
+
+        * widget.texi (Programming Example): Break some long lines.
+
+        * wisent.texi (Wisent Overview): Fix xref.
+        (Grammar format, Understanding the automaton): Avoid overfill.
+
+        * bovine.texi (Optional Lambda Expression): Allow line break.
+
+        * auth.texi (Help for users): Break long lines.
+
+        * ada-mode.texi (Project file variables):
+        Reword to reduce underfull hbox.
+        (No project files, Use GNAT project file):
+        Use smallexample to make some overfull lines less terrible.
+
+        * autotype.texi, bovine.texi, ede.texi, eieio.texi, pcl-cvs.texi:
+        Fix cross-references to separate manuals.
+
+        * Makefile.in (gfdl): New variable.  Use throughout where
+        appropriate so that targets depend on doclicense.texi.
+
 2012-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Customizing the IMAP Connection): Mention the other