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

5 files changed, 11 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d0f229a9c9e..ef9bf827acf 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-03  Glenn Morris  <rgm@gnu.org>
+
+        * bovine.texi (top):
+        * cc-mode.texi (AWK Mode Font Locking):
+        * mh-e.texi (Preface):
+        * url.texi (URI Parsing): Fix cross-references to other manuals.
+
 2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Client-Side IMAP Splitting):
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index 978345e5cc8..81ec2eb80ec 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -76,7 +76,7 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an
 implementation of an @acronym{LL} parser.  It is good for simple
 languages.  It has many conveniences making grammar writing easy.  The
 conveniences make it less powerful than a Bison-like @acronym{LALR}
-parser.  For more information, @inforef{top, the Wisent Parser Manual,
+parser.  For more information, @inforef{Top, The Wisent Parser Manual,
 wisent}.
 
 Bovine @acronym{LL} grammars are stored in files with a @file{.by}
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 4fa4e12cf88..4cc5d9c5767 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -2111,7 +2111,7 @@ contributing it: send a note to @email{bug-cc-mode@@gnu.org}.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 The general appearance of font-locking in AWK mode is much like in any
-other programming mode.  @xref{Faces For Font Lock,,,elisp, GNU Emacs
+other programming mode.  @xref{Faces for Font Lock,,,elisp, GNU Emacs
 Lisp Reference Manual}.
 
 The following faces are, however, used in a non-standard fashion in
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 154120f2e3b..353cc17fe69 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -233,7 +233,7 @@ read an online tutorial by starting GNU Emacs and typing @kbd{C-h t}
 @cite{GNU Emacs Manual},
 @end iftex
 @ifinfo
-@ref{top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
+@ref{Top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
 @end ifinfo
 @ifhtml
 @uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/,
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 49f8f3f0959..fdec68b1c61 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -138,7 +138,7 @@ Given a parsed URI, this function returns the corresponding URI string.
   The return value of @code{url-generic-parse-url}, and the argument
 expected by @code{url-recreate-url}, is a @dfn{parsed URI}: a CL
 structure whose slots hold the various components of the URI@.
-@xref{top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
+@xref{Top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
 details about CL structures.  Most of the other functions in the
 @code{url} library act on parsed URIs.