Merge master into nested-bookparts

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

diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index c1e811970a73750e823db5657674879a4d2586ed..6bdff0541ca92953565c0eba23bf77a253f00ad3 100644 (file)
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -10,6 +10,8 @@
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -23,12 +25,17 @@
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
-@omfdescription User manual of the LilyPond music engraving system
+@omfdescription Learning Manual of the LilyPond music engraving system
 @omftype program usage
 @omfcategory Applications|Publishing
 @omflanguage English
 @end ignore
 
+@ifnottex
+@node Top
+@top GNU LilyPond --- Learning Manual
+@end ifnottex
+
 
 @ifhtml
 This document is also available as a
@@ -51,7 +58,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2007 by the authors
+Copyright @copyright{} 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -64,25 +71,11 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2007 by the authors
+Copyright @copyright{} 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -97,7 +90,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond for beginners.
 
-Copyright 1999--2007 by the authors
+Copyright 1999--2008 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -110,14 +103,9 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond --- learning manual
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
-
-This is the learning manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the Learning Manual (LM) for GNU LilyPond version @version{}.
+For more information about how this fits with the other
+documentation, see @ref{About the documentation}.
 
 @cindex web site
 @cindex URL
@@ -130,8 +118,7 @@ of this and other documentation.
 * Preface::                        Preface.
 * Introduction::                   What, Why, How.
 * Tutorial::                       A tutorial introduction.
-* Fundamental concepts::           Basic concepts required for reading
-the rest of this manual.
+* Fundamental concepts::           Basic concepts required for reading the rest of this manual.
 * Tweaking output::                Introduction to modifying output.
 * Working on LilyPond projects::   Discusses real-life usage.
 
@@ -147,8 +134,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include preface.itely
 @include introduction.itely
 @include tutorial.itely