(Overview of Emerge): Add cross reference. Remove duplication.

diff --git a/man/ChangeLog b/man/ChangeLog
index 4a6d2dd07bb61a8490d1bec41c68b8e4d4fa7ce0..cc6b7a89c16a65cb4694533d1585af22b0b3ddf6 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-18  Lute Kamstra  <lute@gnu.org>
 
+       * maintaining.texi (Overview of Emerge): Add cross reference.
+       Remove duplication.
+
        * emacs.texi (Top): Update to the current structure of the manual.
        * misc.texi (Emacs Server): Add menu description.
        * files.texi (Saving): Fix menu.

diff --git a/man/maintaining.texi b/man/maintaining.texi
index 347a15d3c95b970a9e5f3f22d5ca9011e6dd16f3..b11ae6b6cdd7e78a86c503a1b92762d1045604b5 100644 (file)
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -963,10 +963,9 @@ variant B, and the common ancestor.
 
   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