Merge from emacs-24; up to 2012-12-29T12:57:49Z!fgallina@gnu.org

2 files changed, 6 insertions, 2 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index a1fd9303866..4e6c2220f0d 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-03  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (edebug): Fix cross-references.
+
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (dist): Edit more configure variables.  (Bug#14660)
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 221376e2353..1479573e315 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -18483,7 +18483,7 @@ shows which line you are currently executing.
 You can walk through the execution of a function, line by line, or run
 quickly until reaching a @dfn{breakpoint} where execution stops.
 
-Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs
+Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs
 Lisp Reference Manual}.
 
 @need 1250
@@ -18610,7 +18610,7 @@ error or at specified stopping points; you can cause it to display the
 changing values of various expressions; you can find out how many
 times a function is called, and more.
 
-Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs
+Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs
 Lisp Reference Manual}.
 
 @need 1500