Sync to HEAD

[bpt/emacs.git] / man / trouble.texi

diff --git a/man/trouble.texi b/man/trouble.texi
index 737fcf1..e7f6ae7 100644 (file)
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -124,8 +124,8 @@ about the undo facility.
 normally, and how to recognize them and correct them.  For a list of
 additional problems you might encounter, see @ref{Bugs and problems, ,
 Bugs and problems, efaq, GNU Emacs FAQ}, and the file @file{etc/PROBLEMS}
-in the Emacs distribution.  Type @kbd{C-h F} to read the FAQ; type
-@kbd{C-h P} to read the @file{PROBLEMS} file.
+in the Emacs distribution.  Type @kbd{C-h C-f} to read the FAQ; type
+@kbd{C-h C-e} to read the @file{PROBLEMS} file.
 
 @menu
 * DEL Does Not Delete::   What to do if @key{DEL} doesn't delete.
@@ -426,7 +426,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 P} to read
+@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-e} 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
@@ -683,7 +683,7 @@ terminal-dependent bug without access to a terminal of the type that
 stimulates the bug.@refill
 
 @item
-If non-ASCII text or internationalization is relevant, the locale that
+If non-@acronym{ASCII} text or internationalization is relevant, the locale that
 was current when you started Emacs.  On GNU/Linux and Unix systems, or
 if you use a Posix-style shell such as Bash, you can use this shell
 command to view the relevant values:
@@ -1062,3 +1062,7 @@ Look in the service directory for someone who might help you for a fee.
 The service directory is found in the file named @file{etc/SERVICE} in the
 Emacs distribution.
 @end itemize
+
+@ignore
+   arch-tag: c9cba76d-b2cb-4e0c-ae3f-19d5ef35817c
+@end ignore