Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org

1 files changed, 58 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9de75390937..225f9c6964d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,61 @@
+2012-12-13  Glenn Morris  <rgm@gnu.org>
+
+        * wisent.texi: Small edits.  Set copyright to FSF, update license to
+        GFDL 1.3+.
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add wisent.
+        (wisent, $(buildinfodir)/wisent$(INFO_EXT), wisent.dvi, wisent.pdf):
+        New targets.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add wisent.
+        ($(infodir)/wisent$(INFO_EXT), wisent.dvi): New targets.
+
+        * bovine.texi: Small edits.  Set copyright to FSF, update license to
+        GFDL 1.3+, remove empty index.
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add bovine.
+        (bovine, $(buildinfodir)/bovine$(INFO_EXT), bovine.dvi, bovine.pdf):
+        New targets.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add bovine.
+        ($(infodir)/bovine$(INFO_EXT), bovine.dvi): New targets.
+
+2012-12-13  Eric Ludlam  <zappo@gnu.org>
+            David Ponce  <david@dponce.com>
+            Richard Kim  <emacs18@gmail.com>
+
+        * bovine.texi, wisent.texi: New files, imported from CEDET trunk.
+
+2012-12-13  Glenn Morris  <rgm@gnu.org>
+
+        * flymake.texi (Customizable variables, Locating the buildfile):
+        Remove refs to flymake-buildfile-dirs, removed 2007-07-20.  (Bug#13148)
+
+        * srecode.texi: Small edits.  Set copyright to FSF, add explicit
+        GFDL 1.3+ license, fix up index.
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add srecode.
+        (srecode, $(buildinfodir)/srecode$(INFO_EXT), srecode.dvi)
+        (srecode.pdf): New targets.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add srecode.
+        ($(infodir)/srecode$(INFO_EXT), srecode.dvi): New targets.
+
+2012-12-13  Eric Ludlam  <zappo@gnu.org>
+
+        * srecode.texi: New file, imported from CEDET trunk.
+
+2012-12-13  Bastien Guerry  <bzg@gnu.org>
+
+        * org.texi (Summary, Code block specific header arguments)
+        (Code block specific header arguments)
+        (Header arguments in function calls, var, noweb)
+        (Results of evaluation, Code evaluation security):
+        Small reformatting: add a blank line before some example.
+
+        * org.texi (System-wide header arguments)
+        (Header arguments in Org mode properties, Conflicts)
+        (Dynamic blocks, Using the mapping API):
+        Fix indentation of Elisp code examples.
+
+        * org.texi (Comment lines): Fix description of the comment syntax.
+
+        * org.texi (Installation): Mention "make test" in the correct section.
+
 2012-12-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * doclicense.texi, gpl.texi: Update to latest version from FSF.