aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2010-12-18 13:28:51 -0800
committerGlenn Morris2010-12-18 13:28:51 -0800
commitd3658de7373f55d5f153748aafe82e5806672085 (patch)
treed80d12ce136288efb409fce0d690e26e93701041 /doc
parent287e63bb58cf30457222598c64b4bf551cdeb381 (diff)
downloademacs-d3658de7373f55d5f153748aafe82e5806672085.tar.gz
emacs-d3658de7373f55d5f153748aafe82e5806672085.zip
Minor doc fix for manual; bug#7674
* doc/emacs/maintaining.texi: Move inclusion of emerge after EDE, so that it matches its position in the menu.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/maintaining.texi11
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8a062393020..7fa2c1aaf76 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12010-12-18 Glenn Morris <rgm@gnu.org>
2
3 * maintaining.texi: Move inclusion of emerge after EDE, so that it
4 matches its position in the menu. (Bug#7674)
5
12010-12-14 Glenn Morris <rgm@gnu.org> 62010-12-14 Glenn Morris <rgm@gnu.org>
2 7
3 * trouble.texi (Checklist): Mention not replying via news either. 8 * trouble.texi (Checklist): Mention not replying via news either.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index a2240330a9d..733336774eb 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2280,10 +2280,6 @@ details.
2280 You can also use the collection of tag names to complete a symbol 2280 You can also use the collection of tag names to complete a symbol
2281name in the buffer. @xref{Symbol Completion}. 2281name in the buffer. @xref{Symbol Completion}.
2282 2282
2283@ifnottex
2284@include emerge-xtra.texi
2285@end ifnottex
2286
2287@node EDE 2283@node EDE
2288@section Emacs Development Environment 2284@section Emacs Development Environment
2289@cindex EDE (Emacs Development Environment) 2285@cindex EDE (Emacs Development Environment)
@@ -2347,6 +2343,7 @@ To build all the targets in the project, type @kbd{C-c . C}
2347(@code{ede-compile-project}). EDE uses the file types to guess how 2343(@code{ede-compile-project}). EDE uses the file types to guess how
2348the target should be built. 2344the target should be built.
2349 2345
2350@ignore 2346@ifnottex
2351 arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb 2347@include emerge-xtra.texi
2352@end ignore 2348@end ifnottex
2349