* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

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

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index f9f656f4a51313c960554c42a4c52544e50cc16a..83c5d893c3050632c714562c3486065e1ede69cb 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -160,8 +160,7 @@ HINTS FOR STYLE
 @end ignore
 
 @ifhtml
-This document is also available in @uref{../lilypond.ps.gz,gzipped
-PostScript} and @uref{../lilypond.pdf,PDF}.
+This document is also available in @uref{source/Documentation/user/out-www/lilypond.pdf,PDF}.
 @end ifhtml
 
 
@@ -184,7 +183,7 @@ PostScript} and @uref{../lilypond.pdf,PDF}.
 
 
 
-Copyright @copyright{} 1999--2004 by the authors
+Copyright @copyright{} 1999--2005 by the authors
 
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.1
@@ -219,7 +218,7 @@ Copyright @copyright{} 1999--2004 by the authors
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2004 by the authors
+Copyright 1999--2005 by the authors
 
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.1
@@ -253,10 +252,13 @@ of this and other documentation.
 * Preface::                        Preface.
 * Introduction::                   What, Why, How.
 * Tutorial::                       A tutorial introduction.
-* Example templates::              Larger examples
-* Notation manual::                All notation supported, and how to
-                                   produce it.
-* Sound::                          Producing MIDI output
+* Example templates::              Larger examples.
+* Basic notation::                 Standard musical notation.
+* Instrument-specific notation::   Notation that is only used for some
+                                   instruments.
+* Advanced notation::              Less frequently used notation.
+* Global issues::                  Non-notation commands.
+
 * Changing defaults::              Tuning output.
 * Interfaces for programmers::
 * Running LilyPond::               Operation.
@@ -281,8 +283,11 @@ of this and other documentation.
 @include tutorial.itely
 @include examples.itely
 @include invoking.itely
-@include notation.itely
-@include sound-output.itexi
+@include basic-notation.itely
+@include instrument-notation.itely
+@include advanced-notation.itely
+@include global.itely
+
 @include changing-defaults.itely
 @include programming-interface.itely
 @include lilypond-book.itely
@@ -296,10 +301,8 @@ of this and other documentation.
 @include scheme-tutorial.itely
 @include notation-appendices.itely
 @include point-and-click.itely
-
-@include fdl.itexi
-
 @include cheatsheet.itely
+@include fdl.itexi
 
 @node Unified index
 @appendix Unified index