Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index c80600f362d4fd4323045698550d51725f12b528..ce5b8b4f1096d886611866f52d669f54acb8f3d6 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -22,15 +22,19 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @c    LilyPond  program.
 @end ignore
 
+
+@c
+@c Info files are installed in subdirectories to allow images to be present. 
+@c 
 @dircategory LilyPond
 @direntry
-* LilyPond: (lilypond).           The GNU music typesetter.
-* abc2ly: (lilypond)Invoking abc2ly.          Importing ABC.      
-* convert-ly: (lilypond)Invoking convert-ly.  Older LilyPond versions.
-* etf2ly: (lilypond)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond)LilyPond-book.     Itegrating text and music.
-* midi2ly: (lilypond)Invoking midi2ly.        Importing MIDI.
-* mup2ly: (lilypond)Invoking mup2ly.          Importing Mup.
+* LilyPond: (lilypond/lilypond).           The GNU music typesetter.
+* abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
+* convert-ly: (lilypond/lilypond)Invoking convert-ly.  Older LilyPond versions.
+* etf2ly: (lilypond/lilypond)Invoking etf2ly.          Importing Finale.
+* lilypond-book: (lilypond/lilypond)LilyPond-book.     Itegrating text and music.
+* midi2ly: (lilypond/lilypond)Invoking midi2ly.        Importing MIDI.
+* mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
 @end direntry
 
 @c don't remove this comment.
@@ -129,7 +133,7 @@ Free Documentation License''.
 @top GNU LilyPond --- The music typesetter
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user manual for GNU LilyPond 2.8.x series.
+This is the user manual for GNU LilyPond 2.10.x series.
 @ifhtml
 (See the bottom of this page for the exact version number).
 @end ifhtml
@@ -197,11 +201,11 @@ Appendices
 @include instrument-notation.itely
 @include advanced-notation.itely
 @include changing-defaults.itely
-@include global.itely
-@include page.itely
+@include non-music.itely
+@include spacing.itely
 @include programming-interface.itely
 
-@include invoking.itely
+@include running.itely
 @include lilypond-book.itely
 @include converters.itely
 
@@ -209,7 +213,7 @@ Appendices
 @include literature.itely
 @include scheme-tutorial.itely
 @include notation-appendices.itely
-@include examples.itely
+@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi