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 05c9e4cf7a6f93aa9e9572d704c646d799b5314d..ce5b8b4f1096d886611866f52d669f54acb8f3d6 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -22,7 +22,11 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @c    LilyPond  program.
 @end ignore
 
-@dircategory GNU music project
+
+@c
+@c Info files are installed in subdirectories to allow images to be present. 
+@c 
+@dircategory LilyPond
 @direntry
 * LilyPond: (lilypond/lilypond).           The GNU music typesetter.
 * abc2ly: (lilypond/lilypond)Invoking abc2ly.          Importing ABC.      
@@ -33,7 +37,6 @@ Distributions will want to install lilypond.info in postinstall, doing:
 * mup2ly: (lilypond/lilypond)Invoking mup2ly.          Importing Mup.
 @end direntry
 
-
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
@@ -130,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
@@ -198,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
 
@@ -210,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