Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

[lilypond.git] / Documentation / user / templates.itely

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index c621d1e61fa16cf218aa794dcba4a34ce6850e4e..03b23bd8ed043d087e9737027992544906161e2c 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+@c This file is part of lilypond-learning.tely
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
@@ -7,6 +7,8 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.61"
+
 @node Templates
 @appendix Templates
 
@@ -14,15 +16,15 @@ This section of the manual contains templates with the LilyPond score
 already set up for you.  Just add notes, run LilyPond, and enjoy
 beautiful printed scores!
 
-@c bad node name for ancient notation to avoid confict
+@c bad node name for ancient notation to avoid conflict
 @menu
-* Single staff::                
-* Piano templates::             
-* String quartet::              
-* Vocal ensembles::             
-* Ancient notation templates::  
-* Jazz combo::                  
-* Lilypond-book templates::     
+* Single staff::
+* Piano templates::
+* String quartet::
+* Vocal ensembles::
+* Ancient notation templates::
+* Jazz combo::
+* lilypond-book templates::
 @end menu
 
 
@@ -108,7 +110,7 @@ beautiful printed scores!
 {vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly}
 
 
-@c bad node name to avoid node name confict
+@c bad node name to avoid node name conflict
 @node Ancient notation templates
 @appendixsec Ancient notation templates
 
@@ -150,7 +152,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `line-width' is for \header.
 @li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.11.38"
+\version "2.11.61"
 \header {
   dedication = "dedication"
   title = "Title"
@@ -199,8 +201,8 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 @end ignore
 
 
-@node Lilypond-book templates
-@appendixsec Lilypond-book templates
+@node lilypond-book templates
+@appendixsec lilypond-book templates
 
 These templates are for use with @code{lilypond-book}.  If you're not familiar
 with this program, please refer to @rprogram{LilyPond-book}.
@@ -279,7 +281,7 @@ d4 c b a
 \usepackage{graphicx}
 
 \begin{document}
-\title{A short document with lilypond and xelatex}
+\title{A short document with LilyPond and xelatex}
 \maketitle
 
 Normal \textbf{font} commands inside the \emph{text} work,
@@ -289,7 +291,7 @@ should include them again in a \verb+\ifxetex+ environment.
 You can use this to print the \ifxetex \XeTeX{} command \else
 XeTeX command \fi which is not known to normal \LaTeX .
 
-In normal text you can easily use lilypond commands, like this:
+In normal text you can easily use LilyPond commands, like this:
 
 \begin{lilypond}
 {a2 b c'8 c' c' c'}
@@ -298,8 +300,8 @@ In normal text you can easily use lilypond commands, like this:
 \noindent
 and so on.
 
-The fonts of snippets set with lilypond will have to be set from
-inside 
+The fonts of snippets set with LilyPond will have to be set from
+inside
 of the snippet. For this you should read the AU on how to use
 lilypond-book.