9 files changed, 34 insertions, 14 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 036059ec15c..b0d44d6f64d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-17  Glenn Morris  <rgm@gnu.org>
 
+	* maintaining.texi (Old Revisions): Fix cross-refs to Ediff manual.
+
 	* ack.texi (Acknowledgments): Mention Gnulib.
 
 	* ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í".
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index d2f92bf0da5..e812c9112df 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -725,7 +725,7 @@ call this command from a Dired buffer (@pxref{Dired}).
 
 @ifnottex
 @item M-x vc-ediff
-Like @kbd{C-x v =}, but using Ediff.  @xref{Top, Ediff, ediff, The
+Like @kbd{C-x v =}, but using Ediff.  @xref{Top,, Ediff, ediff, The
 Ediff Manual}.
 @end ifnottex
 
@@ -777,7 +777,7 @@ current VC fileset.
 @ifnottex
 @findex vc-ediff
   @kbd{M-x vc-ediff} works like @kbd{C-x v =}, except that it uses an
-Ediff session.  @xref{Top, Ediff, ediff, The Ediff Manual}.
+Ediff session.  @xref{Top,, Ediff, ediff, The Ediff Manual}.
 @end ifnottex
 
 @findex vc-root-diff
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index bf08571f6fb..f3a95ab85ff 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-17  Glenn Morris  <rgm@gnu.org>
+
+	* emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax)
+	(count-words-in-defun): Fix cross-refs to Emacs manual.
+
 2012-01-28  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* emacs-lisp-intro.texi (Top): Move setting of COUNT-WORDS outside
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index a72fd253bc8..ae1e2bf0b6d 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -13972,10 +13972,9 @@ this is:
 
 @noindent
 The buffer's syntax table determines which characters are and are not
-word constituents.  (@xref{Syntax, , What Constitutes a Word or
-Symbol?}, for more about syntax.  Also, see @ref{Syntax, Syntax, The
-Syntax Table, emacs, The GNU Emacs Manual}, and @ref{Syntax Tables, ,
-Syntax Tables, elisp, The GNU Emacs Lisp Reference Manual}.)
+word constituents.  For more information about syntax,
+@pxref{Syntax Tables, , Syntax Tables, elisp, The GNU Emacs Lisp
+Reference Manual}.
 
 @need 800
 The search expression looks like this:
@@ -14836,8 +14835,7 @@ constituent} characters.  Word constituent characters are members of
 one syntax category.  Other syntax categories include the class of
 punctuation characters, such as the period and the comma, and the
 class of whitespace characters, such as the blank space and the tab
-character.  (For more information, see @ref{Syntax, Syntax, The Syntax
-Table, emacs, The GNU Emacs Manual}, and @ref{Syntax Tables, , Syntax
+character.  (For more information, @pxref{Syntax Tables, , Syntax
 Tables, elisp, The GNU Emacs Lisp Reference Manual}.)
 
 Syntax tables specify which characters belong to which categories.
@@ -15007,7 +15005,7 @@ word and symbol by symbol, and another expression that counts the
 jumps.  The true-or-false-test for the @code{while} loop should test
 true so long as point should jump forward, and false when point is at
 the end of the definition.  We have already redefined the regular
-expression for this (@pxref{Syntax}), so the loop is straightforward:
+expression for this, so the loop is straightforward:
 
 @smallexample
 @group
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5e67238726e..ab01544c453 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-17  Glenn Morris  <rgm@gnu.org>
+
+	* hooks.texi (Standard Hooks): Fix cross-ref to Emacs manual.
+
 2012-02-16  Chong Yidong  <cyd@gnu.org>
 
 	* syntax.texi (Syntax Tables, Syntax Descriptors)
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index ef3ebc4be35..551d9141574 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -275,8 +275,7 @@ for appointment notification.
 @item lisp-indent-function
 
 @item mail-setup-hook
-@xref{Mail Mode Misc,, Mail Mode Miscellany, emacs, the GNU Emacs
-Manual}.
+@xref{Mail Misc,, Mail Miscellany, emacs, the GNU Emacs Manual}.
 
 @item menu-bar-update-hook
 @xref{Menu Bar}.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a88ac5f0bd4..a11dd9d9a4d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-17  Glenn Morris  <rgm@gnu.org>
+
+	* gnus.texi (Posting Styles):
+	* remember.texi (Org): Fix cross-refs to other manuals.
+
 2012-02-15  Glenn Morris  <rgm@gnu.org>
 
 	* smtpmail.texi (Emacs Speaks SMTP): General update for 24.1.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c149ddfcf0f..ae2c5dbd092 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12763,8 +12763,8 @@ from date id references chars lines xref extra.
 In the case of a string value, if the @code{match} is a regular
 expression, a @samp{gnus-match-substitute-replacement} is proceed on
 the value to replace the positional parameters @samp{\@var{n}} by the
-corresponding parenthetical matches (see @xref{Replacing the Text that
-Matched, , Text Replacement, elisp, The Emacs Lisp Reference Manual}.)
+corresponding parenthetical matches (see @xref{Replacing Match,,
+Replacing the Text that Matched, elisp, The Emacs Lisp Reference Manual}.)
 
 @vindex message-reply-headers
 
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index a04ba53443d..1dd7d1b6153 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -389,8 +389,15 @@ The default priority for remembered mail messages.
 @section Saving to an Org Mode file
 @cindex org mode, integration
 
+@ignore
+From org.texi:
+Up to version 6.36 Org used a special setup
+for @file{remember.el}.  @file{org-remember.el} is still part of Org mode for
+backward compatibility with existing setups.  You can find the documentation
+for org-remember at @url{http://orgmode.org/org-remember.pdf}.
+@end ignore
 For instructions on how to integrate Remember with Org Mode,
-consult @ref{Remember, , , org}.
+consult @ref{Capture, , , org}.
 
 @node GNU Free Documentation License, Concept Index, Backends, Top
 @appendix GNU Free Documentation License