Minor fixes from mailist.

diff --git a/ChangeLog b/ChangeLog
index 222f6c46c8160075ecb507d5fea320b098070eb7..d99e9b662a21e9334ee781c5b6826f17788227f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/ changing-defaults, instrument-notation,
+       tutorial: small fixes from mailist, mostly from Mats.  Thanks!
+
 2006-03-13 Heikki Junes  <hjunes@cc.hut.fi>
 
        * po/fi.po: update.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 311bb2e1b6cdb22c8d20bf820313c91449d67e92..0bd72c6883cc3151286593c027e4254e0bb30922 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -965,7 +965,7 @@ Distances in LilyPond are measured in staff-spaces, while most
 thickness properties are measured in line-thickness.  Some
 properties are different; for example, the thickness of beams
 is measured in staff-spaces.  For more information, see the
-relevant portion of the internals documentation.
+relevant portion of the program reference.
 
 More specific overrides are also possible.  The next section
 discusses in depth how to figure out these statements for yourself.

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index d1f9ba33eabe6305c3ccf34a6dbcfd0aa069bfdb..e3e3a17b19791d41ddfa5466c0fc808fa27c9434 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -826,10 +826,11 @@ like notes, but with pitches replaced by text.  For example,
 \lyricmode @{ Twin-4 kle4 twin- kle litt- le star2 @}
 @end example
 
-There is a difference between @code{\addlyrics} and
-@code{\lyricmode}.  @code{\addlyrics} and @code{\lyricsto}
-ignore all durations and aligns syllables to notes; @code{\lyricmode}
-uses the durations specified.
+There are two main methods to specify the horizontal placement
+of the syllables, either by specifying the duration of each syllable
+explicitly, like in the example above, or by automatically aligning
+the lyrics to a melody or other voice of music, using @code{\addlyrics}
+or @code{\lyricsto}.  For more details see @ref{The Lyrics context}.
 
 A word lyrics mode begins with an alphabetic character, and ends with
 any space or digit.  The following characters can be any character

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 5f293c90aefc1d376d90cd0774675102ca48bfd2..61a14f381883d587a84f689dbb54ea651ef1dd16 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1143,8 +1143,8 @@ Again, these expressions can be nested arbitrarily
   >>
   \new Staff <<
     \clef bass
-    { <c, g>1 ~ <c g>4 } \\
-    { e,4 d e2 ~ e4}
+    { <c g>1 ~ <c g>4 } \\
+    { e,,4 d e2 ~ e4}
   >>
 >>
 @end lilypond