Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / learning.tely

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 571f18c9ab14048d4e2f76fdd09860ab943c965a..2e4c15ce1a94df09b948795b94501a665251b4e4 100644 (file)
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -3,7 +3,8 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @setfilename lilypond-learning.info
@@ -17,12 +18,12 @@ This file provides an introduction to LilyPond version
 @version{}.
 @end macro
 
+@c `Learning Manual' was born 1999-10-10 with git commit b9abaac...
 @macro copyrightDeclare
-Copyright @copyright{} 
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-by the authors.
+Copyright @copyright{} 1999--2010 by the authors.
 @end macro
 
+@set FDL
 @include macros.itexi
 
 
@@ -42,7 +43,7 @@ by the authors.
 @ifnottex
 
 @menu
-* Introduction::                   Basics of typesetting with LilyPond.
+* Tutorial::                       Basics of typesetting with LilyPond.
 * Common notation::                Writing very commmon notation.
 * Fundamental concepts::           Basic concepts required for reading the rest of the manuals.
 * Tweaking output::                Introduction to modifying output.
@@ -50,7 +51,6 @@ by the authors.
 Appendices
 
 * Templates::                      Ready-made templates.
-* Scheme tutorial::                Programming inside LilyPond.
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
@@ -62,16 +62,16 @@ Appendices
 @c TOC - tex
 @contents
 
+@allowcodebreaks false
 
 @c INCLUDES
 
-@include learning/introduction.itely
+@include learning/tutorial.itely
 @include learning/common-notation.itely
 @include learning/fundamental.itely
 @include learning/tweaks.itely
 
 @include learning/templates.itely
-@include learning/scheme-tutorial.itely
 @include fdl.itexi