From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 21 Dec 2010 07:10:31 +0000 (+0800)
Subject: Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~73
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e14ad691966cd844eed62d4cb3793d0ecb07e45b;p=emacs.git

Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).
---

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index cf504b6be2a..8442586ab27 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2288,10 +2288,6 @@ 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
-
 @node EDE
 @section Emacs Development Environment
 @cindex EDE (Emacs Development Environment)
@@ -2355,6 +2351,10 @@ To build all the targets in the project, type @kbd{C-c . C}
 (@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