Improve addr2line suggestion.

Fixes: debbugs:13445

2 files changed, 8 insertions, 8 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a3725185ac2..3b7ab6527aa 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,9 +1,10 @@
 2013-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * trouble.texi (Crashing): Suggest -p for recent addrline.  (Bug#13445)
-        Without it, I don't see function names.  Older addrlines will die
-        out sooner or later, so tailor the suggestion to recent addrline
-        and put in a comment about older ones.
+        * trouble.texi (Crashing): Suggest -p for newer addr2line.  (Bug#13445)
+        Without it, I don't see function names.  Older addr2line
+        implementations will die out sooner or later, so tailor the
+        first suggestion to recent addr2line, with a followup about
+        older ones.
 
 2013-01-19  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 32a3ee6a3c3..97c0ff97530 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -326,7 +326,6 @@ backtrace with source-code line numbers:
 @example
 sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} |
   addr2line -C -f -i -p -e @var{bindir}/@var{emacs-binary}
-# Omit '-p' for binutils 2.20 and earlier.
 @end example
 
 @noindent
@@ -334,9 +333,9 @@ Here, @var{backtrace} is the name of a text file containing a copy of
 the backtrace, @var{bindir} is the name of the directory that
 contains the Emacs executable, and @var{emacs-binary} is the name of
 the Emacs executable file, normally @file{emacs} on GNU and Unix
-systems and @file{emacs.exe} on MS-Windows and MS-DOS.@footnote{You
-may wish to add the @option{-p} option, if your version of
-@command{addr2line} supports it.}
+systems and @file{emacs.exe} on MS-Windows and MS-DOS.  Omit the
+@option{-p} option if your version of @command{addr2line} is too old
+to have it.
 
 @cindex core dump
   Optionally, Emacs can generate a @dfn{core dump} when it crashes, on