patch::: 1.3.122.jcn2

[lilypond.git] / Documentation / user / lilypond.tely

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 412acc343d7fa6262e7b6b09b63cb1f764096156..c6c63bd78bcb5e46fa17540aff8313b8e384cade 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -87,6 +87,7 @@ than the names being similar :-)"
 
 @ifnottex
 @node Top
+@c FIXME: this should not be necessary...
 @top
 @end ifnottex
 
@@ -104,13 +105,13 @@ this and other documentation.
 
 
 @menu
-* Tutorial::                       A tutorial introduction to lilypond.
+* Tutorial::                       A tutorial introduction to LilyPond.
 * Invoking LilyPond::              Operation.
 * Bug reports::                   Where to report bugs.
 * Reference Manual::               Reference Manual.
-@c Move to Reference Manual?
+* Features::                       Features, tips and tricks.
 * Internals:(lilypond-internals).  Auto generated detailed documentation.
-* convert-ly::                     Upgrading input files.
+* Programs::                       External programs.
 * Internals::                      How it all works.
 * Development::                    On developing code for LilyPond.
 * Index::                          Unified index.
@@ -118,16 +119,8 @@ this and other documentation.
 
 @contents
 
-@macro keyindex {word}
-@cindex @code{ \word\ }
-
-@end macro
-
-@macro indexcode {word}
-@cindex @code{ \word\ }
-
-@end macro
 
+@mbinclude macros.itexi
 
 @mbinclude tutorial.itely
 
@@ -137,10 +130,13 @@ this and other documentation.
 
 @mbinclude refman.itely
 
-@mbinclude convert-ly.itexi
+@mbinclude features.itely
+
+@mbinclude programs.itexi
 
 @mbinclude development.itexi
 
+@c FIXME: Index has two alphabetically sorted lists @code vs plain?
 @node Index
 @unnumbered Index