merge trunk

2 files changed, 9 insertions, 5 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 77864c63f4c..131f10abc31 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-12  Glenn Morris  <rgm@gnu.org>
+
+        * trouble.texi (Checklist): Use bug-gnu-emacs rather than
+        emacs-pretest-bug for bug reports for development versions.
+
 2010-01-11  Glenn Morris  <rgm@gnu.org>
 
         * display.texi (Highlight Interactively): `t' does not mean highlight
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index cec7ead74ae..218aa3a64d4 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1,6 +1,7 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Dealing with Common Problems
@@ -540,10 +541,8 @@ well.
 
 @cindex reporting bugs
   The best way to send a bug report is to mail it electronically to the
-Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}, or to
-@email{emacs-pretest-bug@@gnu.org} if you are pretesting an Emacs beta
-release.  (If you want to suggest a change as an improvement, use the
-same address.)
+Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.  (If you want to
+suggest a change as an improvement, use the same address.)
 
   If you'd like to read the bug reports, you can find them on the
 newsgroup @samp{gnu.emacs.bug}; keep in mind, however, that as a