Merge changes from emacs-23 branch

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 142ece63f36dda30b91a32b46a16c21d4ef8e8f7..4b02d9b1d085158d129a92d8402fdfe7ff07b0a7 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -386,7 +386,7 @@
        * srecode/doc-default.srt (section-comment, function-comment)
        (variable-same-line-comment, group-comment-start, group-comment-end):
        * srecode/doc-java.srt (function-comment, variable-same-line-comment)
-       (group-comment-start, gropu-comment-end):
+       (group-comment-start, group-comment-end):
        Fix typos in template docstrings.
 
 2010-01-14  Kenichi Handa  <handa@m17n.org>