Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c54307dba0434ce293428af498eadbf366741bf2..2bcdd07b1c6ee527ed185cf7c1aede606a0eda8b 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -158,7 +158,7 @@ produces a @file{.log} file that contains some information on what LilyPond
 has done to the file.  If any errors occur, please examine this file.
 
 Note that there are several other text editors available, with better
-support for LilyPond, see @ref{Editor support}, for more information.
+support for LilyPond, see @rprogram{Editor support}, for more information.
 
 @subsubheading Unix
 
@@ -168,7 +168,7 @@ example, you could open an xterm and execute
 is a @code{LilyPond-mode} for Emacs addicts.  If they have not been
 installed already, refer to the file @file{INSTALL.txt}.  The
 easiest editing environment is @file{LilyPondTool}.  See
-@ref{Editor support}, for more information.}.  In your
+@rprogram{Editor support}, for more information.}.  In your
 text editor, enter the following input and save the file as
 @file{test.ly}
 
@@ -296,7 +296,7 @@ automatically.
 If you do not specify a duration, the previous duration is used
 for the next note.  The duration of the first note defaults to a quarter.
 
-To create @rglos{dotted notes}, add a dot @samp{.} to the duration number.
+To create @rglos{dotted note}s, add a dot @samp{.} to the duration number.
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'' {
@@ -383,8 +383,8 @@ see @ref{Clef}.
 @node Working on text files
 @subsection Working on text files
 
-LilyPond input files are treated like files in most programming languages:
-they are case sensitive, white-space insensitive, expressions are
+LilyPond input files are similar to source files in many common programming languages.
+They are case sensitive, and white-space is generally equivalent.  Expressions are
 formed with curly braces @{ @}, and comments are denoted with @code{%} or
 @code{%@{ ... %@}}.
 
@@ -440,7 +440,7 @@ There are two types of comments.  The percent symbol @samp{%}
 introduces a line comment; anything after @samp{%} on that line is
 ignored.  A block comment marks a whole section of music
 input as a comment.  Anything that is enclosed in @code{%@{} and @code{%@}} is
-ignored.  The following fragment shows possible uses for comments
+ignored.  (Comments do not nest.)  The following fragment shows possible uses for comments
 
 @example
 % notes for twinkle twinkle follow
@@ -572,7 +572,7 @@ a
 @subheading Warning: key signatures and pitches
 
 To determine whether to print an accidental, LilyPond examines the
-pitches and the key signature.  The key signature only effects
+pitches and the key signature.  The key signature only affects
 the @emph{printed} accidentals, not the actual pitches!  This is a
 feature that often causes confusion to newcomers, so let us explain it
 in more detail.
@@ -651,7 +651,6 @@ d4( c16) cis( d e c cis d) e( d4)
 @cindex phrasing slurs
 @subheading Phrasing slurs
 
-@cindex phrasing slurs
 Slurs to indicate longer phrasing can be entered with @code{\(} and
 @code{\)}.  You can have both legato slurs and phrasing slurs at the
 same time, but you cannot have simultaneous slurs or simultaneous
@@ -697,7 +696,7 @@ see @ref{Phrasing slurs}.
 @cindex staccato
 @subheading Articulations
 
-Common @rglos{articulations} can be added to a note using a dash @samp{-}
+Common @rglos{articulation}s can be added to a note using a dash @samp{-}
 and a single character:
 
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
@@ -1285,7 +1284,7 @@ The @code{\version} statement marks for which version of LilyPond the file
 was written.  To mark a file for version 2.10.1, place
 
 @example
-\version "2.11.15"
+\version "2.11.23"
 @end example
 
 @noindent
@@ -1293,7 +1292,7 @@ at the top of your LilyPond file.
 
 These annotations make future upgrades of LilyPond go more
 smoothly.  Changes in the syntax are handled with a special program,
-@file{convert-ly} (see @ref{Updating files with convert-ly}), and it uses
+@file{convert-ly} (see @rprogram{Updating files with convert-ly}), and it uses
 @code{\version} to determine what rules to apply.
 
 
@@ -1306,7 +1305,7 @@ music expression; the @code{\header} block is usually placed underneath
 the @ref{Version number}.
 
 @example
-\version "2.11.15"
+\version "2.11.23"
 \header @{
   title = "Symphony"
   composer = "Me"
@@ -1463,12 +1462,12 @@ piece or two.  Start with one of the @ref{Templates}, and
 add notes.  If you need any notation that was not covered in the
 tutorial, look at the Notation Reference, starting with
 @ref{Basic notation}.  If you want to write for an instrument
-ensemble which is not covered in the templates,
+ensemble that is not covered in the templates,
 take a look at @ref{Extending the templates}.
 
 Once you have written a few short pieces, read the rest of
 the Learning Manual (chapters 3-5).  There's nothing wrong
-with reading them now, of course!  However, the rest of the
+with reading it now, of course!  However, the rest of the
 Learning Manual assumes that you are familiar with
 LilyPond input.  You may wish to skim these chapters right
 now, and come back to them after you have more experience.
@@ -1483,7 +1482,7 @@ example.
 
 In the rest of the manual, we are much more lax about the
 printed examples: sometimes they may have omitted a
-@code{\relative c'' @{ ... @}}, but in other times a different initial
+@code{\relative c'' @{ ... @}}, but other times a different initial
 pitch may be used (such as @code{c'} or @code{c,,}), and in some cases
 the whole example is in absolute note mode!  However, ambiguities like
 this only exist where the pitches are not important.  In any example