# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1264064351 0
# Node ID 5743e6bbd1dd9e79fcab114ffe7d14ee3d2cb938
# Parent  61b4d7e0482878bb58776304ad3346442146099e# Parent  e394375cf1dadcb0627ebfb6e610e5baddb4442f
Merge from mainline.

diff -r 61b4d7e04828 -r 5743e6bbd1dd doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Wed Jan 20 21:55:26 2010 +0000
+++ b/doc/emacs/ChangeLog	Thu Jan 21 08:59:11 2010 +0000
@@ -1,3 +1,7 @@
+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 -r 61b4d7e04828 -r 5743e6bbd1dd doc/emacs/trouble.texi
--- a/doc/emacs/trouble.texi	Wed Jan 20 21:55:26 2010 +0000
+++ b/doc/emacs/trouble.texi	Thu Jan 21 08:59:11 2010 +0000
@@ -419,7 +419,7 @@
 
   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