Prefer Carbon if --enable-carbon-app or --with-carbon is explicitly

[gnu-emacs] / man / trouble.texi

diff --git a/man/trouble.texi b/man/trouble.texi
index da14f25568f4ca58b539e8a91db612fb37b4d6da..f9d56d221945acb95d2655eaf69beb36eda7b64d 100644 (file)
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -1,5 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985,86,87,93,94,95,1997,2001,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Dealing with Common Problems
@@ -303,8 +304,7 @@ the following in your @file{.emacs} file:
 
   When flow control is enabled, you must type @kbd{C-\} to get the
 effect of a @kbd{C-s}, and type @kbd{C-^} to get the effect of a
-@kbd{C-q}.  (These aliases work by means of keyboard translations; see
-@ref{Keyboard Translations}.)
+@kbd{C-q}.
 
 @node Memory Full
 @subsection Running out of Memory
@@ -368,7 +368,7 @@ available.  For each buffer, it lists a buffer number.  To save a
 buffer, use @code{ysave-buffer}; you specify the buffer number, and
 the file name to write that buffer into.  You should use a file name
 which does not already exist; if the file does exist, the script does
-not make make a backup of its old contents.
+not make a backup of its old contents.
 
 @node Emergency Escape
 @subsection Emergency Escape
@@ -595,8 +595,8 @@ or machine-readable media to this address:
 @format
 GNU Emacs Bugs
 Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA 02111-1307 USA
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301 USA
 @end format
 
   We do not promise to fix the bug; but if the bug is serious,