New order for Vocal; thanks Valentin!

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 999e908cfd8237f11e265f04bcc5b7fca5828477..538868182507993639880e488fb239c1086f5d5f 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
 
@@ -80,7 +80,7 @@ This document is also available as a
 @titlefont{User manual}
 @author The LilyPond development team
 
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -111,7 +111,7 @@ Free Documentation License''.
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2006 by the authors
+Copyright @copyright{} 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -126,7 +126,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2006 by the authors
+Copyright 1999--2007 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -158,20 +158,9 @@ 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.
+* Musical notation::               Musical notation.
+* Specialist notation::            Notation which is only used for
+    specific purposes.
 * Changing defaults::              Tuning output.
 * Non-musical notation::           Output that is not musical notation.
 * Spacing issues::                 Display of output on paper.
@@ -180,9 +169,7 @@ Notation Reference
 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,16 +181,10 @@ 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 notation.itely
+@include specialist.itely
+
 @include changing-defaults.itely
 @include non-music.itely
 @include spacing.itely
@@ -211,9 +192,7 @@ Appendices
 
 
 @include literature.itely
-@include scheme-tutorial.itely
 @include notation-appendices.itely
-@include templates.itely
 @include cheatsheet.itely
 @include fdl.itexi