Update from Kurt.

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index ae4c536387055ac5ed36cbbec19138542f27302f..dc8a5298337e7680cbb3085a36d011719214fe2c 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -7,7 +7,7 @@
 @end ignore
 @setfilename lilypond.info
 @settitle GNU LilyPond user manual
-@documentencoding utf-8
+@documentencoding UTF-8
 @documentlanguage en
 
 @iftex
@@ -46,7 +46,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 * abc2ly: (lilypond/lilypond-program)Invoking abc2ly.          Importing ABC.      
 * convert-ly: (lilypond/lilypond-program)Invoking convert-ly.  Older LilyPond versions.
 * etf2ly: (lilypond/lilypond-program)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Itegrating text and music.
+* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Integrating text and music.
 * midi2ly: (lilypond/lilypond-program)Invoking midi2ly.        Importing MIDI.
 @end direntry
 
@@ -158,31 +158,20 @@ of this and other documentation.
 @include dedication.itely
 
 @menu
-Learning Manual
-
-* Preface::                        Preface.
-* Introduction::                   What, Why, How.
-* Tutorial::                       A tutorial introduction.
-* Putting it all together::        More explanation about LilyPond concepts.
-* Working on LilyPond projects::   Discusses real-life usage.
-* Tweaking output::                Introduction to modifying output.
-
-Notation Reference
-
-* Basic notation::                 Standard musical notation.
-* Instrument-specific notation::   Specialized notation.
-* Advanced notation::              Less frequently used notation.
-* Changing defaults::              Tuning output.
+* Musical notation::               Musical notation.
+* Specialist notation::            Notation which is only used for
+    specific purposes.
+* Input syntax::                   General information about
+    lilypond input files.
 * Non-musical notation::           Output that is not musical notation.
 * Spacing issues::                 Display of output on paper.
+* Changing defaults::              Tuning output.
 * Interfaces for programmers::     Expert usage.
 
 Appendices
 
 * Literature list::                Reference works about music notation.
-* Scheme tutorial::                Programming inside LilyPond.
 * Notation manual tables::         Tables and charts.
-* Templates::                      Ready-made templates.
 * Cheat sheet::                    Summary of LilyPond syntax.
 * GNU Free Documentation License:: License of this document.
 * LilyPond command index::
@@ -194,26 +183,20 @@ Appendices
 
 
 @include macros.itexi
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include putting.itely
-@include working.itely
-@include tweaks.itely
-
-@include basic-notation.itely
-@include instrument-notation.itely
-@include advanced-notation.itely
-@include changing-defaults.itely
+
+@include notation.itely
+@include specialist.itely
+
+@include input.itely
 @include non-music.itely
 @include spacing.itely
+
+@include changing-defaults.itely
 @include programming-interface.itely
 
 
 @include literature.itely
-@include scheme-tutorial.itely
 @include notation-appendices.itely
-@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi