Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / web / introduction.itexi

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 018b151f1e7ec9d77949eda4c81b267043de258a..2f14efa1e1d5a5c55bbc347c3f8479038300cea8 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -291,7 +291,7 @@ staff.
 
 Standard output can be modified heavily.  Here is an impressive
 Schenkerian analysis, created by Kris Schaffer, for an article
 
 Standard output can be modified heavily.  Here is an impressive
 Schenkerian analysis, created by Kris Schaffer, for an article

-in @uref{http://www.linuxjournal.com/article/8364 , Linux Journal.}.
+in @uref{http://www.linuxjournal.com/article/8364 , Linux Journal}.

 The colors have been added for better visibility.
 
 @exampleImage{bach-schenker}
 The colors have been added for better visibility.
 
 @exampleImage{bach-schenker}


@@ -582,6 +582,18 @@ If you've already decided to try LilyPond, first read about our
 @divClass{keep-bullets}
 @itemize
 
 @divClass{keep-bullets}
 @itemize
 

+@item
+April 2011
+
+@uref{http://www.linux-magazine.com,Linux Magazine} publishes an
+article titled
+@uref{http://www.linux-magazine.com/w3/issue/126/088-090_projects.pdf,
+Projects on the Move}.  It is an introductory article on MuseScore,
+LilyPond and Chordii.  Author Carla Schroder states @qq{LilyPond is
+driven from the command line, but don’t let the lack of a GUI scare
+you away; LilyPond is user-friendly and easy to learn}, and provides
+a hands-on example.
+

 @item
 May 2010
 
 @item
 May 2010
 


@@ -908,8 +920,8 @@ entered with backslashes.
 @imageFloat{text-input-1-annotate,png,center}
 @imageFloat{text-input-1-output,png,center}
 
 @imageFloat{text-input-1-annotate,png,center}
 @imageFloat{text-input-1-output,png,center}
 

-Alterations are made with different names: add @code{-is} for
-sharp, and @code{-es} for flat (these are Dutch note names, other
+Alterations are made with different names: add @w{@code{-is}} for
+sharp, and @w{@code{-es}} for flat (these are Dutch note names, other

 languages are available).  LilyPond figures out where to put
 accidentals.
 
 languages are available).  LilyPond figures out where to put
 accidentals.