diff man/maintaining.texi @ 83307:21eea50897a7

Merged from [e-mail]--gnu-2005 (patch 69, 313-319) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-313 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-314 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-315 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-316 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-317 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-318 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-319 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-69 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-347

--- a/man/maintaining.texi	Mon May 16 15:49:27 2005 +0000
+++ b/man/maintaining.texi	Fri May 20 17:44:36 2005 +0000
@@ -963,10 +963,9 @@
 
   After the comparison is done and the buffers are prepared, the
 interactive merging starts.  You control the merging by typing special
-@dfn{merge commands} in the merge buffer.  The merge buffer shows you a
-full merged text, not just differences.  For each run of differences
-between the input texts, you can choose which one of them to keep, or
-edit them both together.
+@dfn{merge commands} in the merge buffer (@pxref{Merge Commands}).
+For each run of differences between the input texts, you can choose
+which one of them to keep, or edit them both together.
 
   The merge buffer uses a special major mode, Emerge mode, with commands
 for making these choices.  But you can also edit the buffer with