Merge from emacs-24; up to 2012-12-14T15:22:24Z!monnier@iro.umontreal.ca

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d4dde056461..05f53257fa8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,23 @@
+2013-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * cl.texi (Equality Predicates): Mention memql.
+
+2013-02-07  Eric Ludlam  <zappo@gnu.org>
+
+        * doc/misc/ede.texi (Creating a project): Make ede-new doc less
+        specific, and only about items it supports, indicating that there
+        might be more.  Remove refs to simple project and direct automake
+        from ede new.
+        (Simple projects): Re-write to not talk about ede-simple-project
+        which is deprecated, and instead use the term to mean projects
+        that don't do much management, just project wrapping.  Add
+        ede-generic-project link.
+        (ede-generic-project): New node (bug#11441).
+
+2013-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * cl.texi (Equality Predicates): Fix eq/eql pedantry.
+
 2013-02-01  Glenn Morris  <rgm@gnu.org>
 
         * calc.texi (Help Commands): Update calc-view-news description.