# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292915431 -28800
# Node ID 03d428c4090e2b188113526292c1b85b441ed97b
# Parent  79209520f4c4677cbca0e7fbd4c75a27c2aa82a8
Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).

diff -r 79209520f4c4 -r 03d428c4090e doc/emacs/maintaining.texi
--- a/doc/emacs/maintaining.texi	Tue Dec 21 14:45:11 2010 +0800
+++ b/doc/emacs/maintaining.texi	Tue Dec 21 15:10:31 2010 +0800
@@ -2288,10 +2288,6 @@
   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
-
 @node EDE
 @section Emacs Development Environment
 @cindex EDE (Emacs Development Environment)
@@ -2355,6 +2351,10 @@
 (@code{ede-compile-project}).  EDE uses the file types to guess how
 the target should be built.
 
+@ifnottex
+@include emerge-xtra.texi
+@end ifnottex
+
 @ignore
    arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
 @end ignore