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

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

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index bad65e6894215c083177eb718d08490fd2c32d27..dbb02ffdd7052009b312115c442f4a25aedb0275 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -87,9 +87,8 @@ computer edition.
 @end ifnottex
 @end ifnotinfo
 @ifinfo
 @end ifnottex
 @end ifnotinfo
 @ifinfo

-@c workaround for makeinfo-4.6: line breaks and multi-column cookies
-@image{henle-flat-bw,,,png} @image{baer-flat-bw,,,png}
-@image{lily-flat-bw,,,png}
+@image{lilypond/henle-flat-bw,,,png} @image{lilypond/baer-flat-bw,,,png}
+@image{lilypond/lily-flat-bw,,,png}

 @end ifinfo
 
 @item @tab
 @end ifinfo
 
 @item @tab


@@ -569,14 +568,18 @@ The syntax is also the user-interface for LilyPond, hence it is easy
 to type
 
 @example
 to type
 
 @example

-c'4 d'8
+@{
+  c'4 d'8
+@}

 @end example
 
 @noindent
 a quarter note C1 (middle C) and an eighth note D1 (D above middle C)
 
 @end example
 
 @noindent
 a quarter note C1 (middle C) and an eighth note D1 (D above middle C)
 

-@lilypond[quote,fragment]
-c'4 d'8
+@lilypond[quote]
+{
+  c'4 d'8
+}

 @end lilypond
 
 On a microscopic scale, such syntax is easy to use.  On a larger
 @end lilypond
 
 On a microscopic scale, such syntax is easy to use.  On a larger


@@ -651,8 +654,11 @@ of music engraving into a computer program.  Thanks to all that hard
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 

-@lilypond[quote,relative=1,fragment]
-\time 2/4 c4 c g'4 g a4 a g2
+@lilypond[quote,relative=1]
+{
+  \time 2/4
+  c4 c g'4 g a4 a g2
+}

 @end lilypond
 
 @noindent
 @end lilypond
 
 @noindent


@@ -715,7 +721,7 @@ users should start here.
 
 @item
 @emph{@ref{Fundamental concepts}},
 
 @item
 @emph{@ref{Fundamental concepts}},

-explains some general concepts about the lilypond file format.  If
+explains some general concepts about the LilyPond file format.  If

 you are not certain where to place a command, read this chapter!
 
 @item
 you are not certain where to place a command, read this chapter!
 
 @item


@@ -896,7 +902,7 @@ advisable to consult the glossary.
 @item
 The
 @ifhtml
 @item
 The
 @ifhtml

-@uref{source/input/lsr/collated-files.html,Snippets}
+@uref{source/input/lsr/snippets/index.html,Snippets}

 @end ifhtml
 @ifnothtml
 Snippets
 @end ifhtml
 @ifnothtml
 Snippets


@@ -955,7 +961,7 @@ initialization and example files.  Throughout this manual, we refer to
 input files relative to the top-directory of the source archive.  For
 example, @file{input/@/lsr/@/dirname/@/bla@/.ly} may refer to the file
 @file{lilypond@/2.x.y/@/input/@/lsr/@/dirname/@/bla@/.ly}.  On binary
 input files relative to the top-directory of the source archive.  For
 example, @file{input/@/lsr/@/dirname/@/bla@/.ly} may refer to the file
 @file{lilypond@/2.x.y/@/input/@/lsr/@/dirname/@/bla@/.ly}.  On binary

-packages for the Unix platform, the documentation and examples can
+packages for the UNIX platform, the documentation and examples can

 typically be found somewhere below
 @file{/usr/@/share/@/doc/@/lilypond/}.  Initialization files, for
 example @file{scm/@/lily@/.scm}, or @file{ly/@/engraver@/-init@/.ly},
 typically be found somewhere below
 @file{/usr/@/share/@/doc/@/lilypond/}.  Initialization files, for
 example @file{scm/@/lily@/.scm}, or @file{ly/@/engraver@/-init@/.ly},


@@ -967,7 +973,7 @@ are usually found in the directory @file{/usr/@/share/@/lilypond/}.
 @cindex lilypond-internals
 @cindex internal documentation
 @cindex Scheme
 @cindex lilypond-internals
 @cindex internal documentation
 @cindex Scheme

-@cindex extending lilypond
+@cindex extending LilyPond

 @cindex index
 
 Finally, this and all other manuals, are available online both as PDF
 @cindex index
 
 Finally, this and all other manuals, are available online both as PDF