changeset 70451:4b75ae0fccd3

(Maintaining) [ifnottex]: Add menu entry for "Emerge". (List Tags) [ifnottex]: @include emerge-xtra.texi.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 06 May 2006 12:58:40 +0000
parents 170d8c260430
children fddb2c4fae49
files man/maintaining.texi
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/man/maintaining.texi	Sat May 06 12:58:11 2006 +0000
+++ b/man/maintaining.texi	Sat May 06 12:58:40 2006 +0000
@@ -14,6 +14,9 @@
 * Format of ChangeLog:: What the change log file looks like.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
+@ifnottex
+* Emerge::              A convenient way of merging two versions of a program.
+@end ifnottex
 @end menu
 
 @node Change Log
@@ -845,6 +848,10 @@
   You can also use the collection of tag names to complete a symbol
 name in the buffer.  @xref{Symbol Completion}.
 
+@ifnottex
+@include emerge-xtra.texi
+@end ifnottex
+
 @ignore
    arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
 @end ignore