From: Lute Kamstra Date: Wed, 18 May 2005 14:31:32 +0000 (+0000) Subject: (Overview of Emerge): Add cross reference. Remove duplication. X-Git-Tag: ttn-vms-21-2-B4~181 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee7c0964efddcae0a4125450316486221b1bd834;p=emacs.git (Overview of Emerge): Add cross reference. Remove duplication. --- diff --git a/man/ChangeLog b/man/ChangeLog index 4a6d2dd07bb..cc6b7a89c16 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,5 +1,8 @@ 2005-05-18 Lute Kamstra + * 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 347a15d3c95..b11ae6b6cdd 100644 --- 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