(Acknowledgments): Fix bad @/ form.

[gnu-emacs] / man / maintaining.texi

diff --git a/man/maintaining.texi b/man/maintaining.texi
index f0b5f1c31af538312de518caba5aee1ceb1bd194..facde7020bc2dcf47bcb6f8c3a5cdddf8f51d7d1 100644 (file)
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -14,6 +14,9 @@ also particularly useful for this purpose.
 * 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
@@ -116,11 +119,11 @@ between them.
   You should put a copyright notice and permission notice at the
 end of the change log file.  Here is an example:
 
-@example
+@smallexample
 Copyright 1997, 1998 Free Software Foundation, Inc.
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.
-@end example
+@end smallexample
 
 @noindent
 Of course, you should substitute the proper years and copyright holder.
@@ -179,7 +182,8 @@ convenient.  Each name recorded is called a @dfn{tag}.
 @item
 In C code, any C function or typedef is a tag, and so are definitions of
 @code{struct}, @code{union} and @code{enum}.
-@code{#define} macro definitions and @code{enum} constants are also
+@code{#define} macro definitions, @code{#undef} and @code{enum}
+constants are also 
 tags, unless you specify @samp{--no-defines} when making the tags table.
 Similarly, global variables are tags, unless you specify
 @samp{--no-globals}.  Use of @samp{--no-globals} and @samp{--no-defines}
@@ -352,9 +356,9 @@ the syntax of several languages, as described in
 @iftex
 the previous section.
 @end iftex
-@ifinfo
+@ifnottex
 @ref{Tag Syntax}.
-@end ifinfo
+@end ifnottex
 Here is how to run @code{etags}:
 
 @example
@@ -845,6 +849,10 @@ details.
   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