merge conflict

4 files changed, 12 insertions, 4 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e9ab5edd57e..39ffa2c2acc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,8 +1,12 @@
-2010-01-19  Mark A. Hershberger  <mah@everybody.org>
+2010-01-24  Mark A. Hershberger  <mah@everybody.org>
 
         * programs.texi (Other C Commands): Replace reference to obsolete
         c-subword-mode.
 
+2010-01-21  Glenn Morris  <rgm@gnu.org>
+
+        * trouble.texi (Bugs): Fix PROBLEMS keybinding.
+
 2010-01-12  Glenn Morris  <rgm@gnu.org>
 
         * trouble.texi (Checklist): Use bug-gnu-emacs rather than
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 218aa3a64d4..b0b54d572f6 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -419,7 +419,7 @@ to do so effectively, you must know when and how to do it.
 
   Before reporting a bug, it is a good idea to see if it is already
 known.  You can find the list of known problems in the file
-@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-e} to read
+@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-p} to read
 it.  Some additional user-level problems can be found in @ref{Bugs and
 problems, , Bugs and problems, efaq, GNU Emacs FAQ}.  Looking up your
 problem in these two documents might provide you with a solution or a
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 50673dc7147..fe34433c391 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,8 @@
-2010-01-19  Mark A. Hershberger  <mah@everybody.org>
+2010-01-24  Mark A. Hershberger  <mah@everybody.org>
+
+        * gnus.texi (Score File Format): Fix typo.
+
+2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * cc-mode.texi: Replace references to obsolete c-subword-mode.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a33a91ba6f1..75720a94da1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21803,7 +21803,7 @@ not be loaded, even though they would normally be so, for some reason or
 other.
 
 @item eval
-The value of this entry will be @code{eval}el.  This element will be
+The value of this entry will be @code{eval}ed.  This element will be
 ignored when handling global score files.
 
 @item read-only