1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 718a9588712..30fae4d4bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2014-12-19  Stephen Leake  <stephen_leake@stephe-leake.org>
+
+        Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi
+
+        Fixes bug#19299
+
+        * CONTRIBUTE: Move user-level information to doc/emacs/trouble.texi
+          (commit messages): new, gathered from comments on emacs-devel
+          (Changelog notes): add reference to GNU coding standards section 5.2;
+          doc 'present tense', bug fix format
+          (branches): freeze announcements are made on info-gnu-emacs mailing
+          list
+          (git vs rename): new
+
+        * doc/emacs/trouble.texi: Move user-level information from CONTRIBUTE here
+
+        * lisp/startup.el (fancy-about-text): change buttons for etc/CONTRIBUTE
+          to (info "(emacs)Contributing")
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Spelling fixes