# HG changeset patch
# User John Paul Wallington <jpw@pobox.com>
# Date 1214078404 0
# Node ID 68c23dc0c0cc25fe109ff0aeae629ce08f9c05a3
# Parent  9db96e091168e8fa05eaa76d47ad643a8a73f1f5
*** empty log message ***

diff -r 9db96e091168 -r 68c23dc0c0cc lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 21 19:57:50 2008 +0000
+++ b/lisp/ChangeLog	Sat Jun 21 20:00:04 2008 +0000
@@ -1,3 +1,9 @@
+2008-06-21  John Paul Wallington  <jpw@pobox.com>
+
+	* emacs-lisp/derived.el (define-derived-mode): Add `doc-string' decl.
+
+	* textmodes/rst.el (rst-mode): Put docstring in right place.
+
 2008-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* startup.el (fancy-about-text, fancy-startup-tail): Increase text