From 0d64c85807c4e5af5e110acf9e9a12bee3fecdac Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Fri, 29 Jun 2007 18:13:13 -0700
Subject: [PATCH] Doc typos and clarifications; thanks Mike!

---
 Documentation/user/basic-notation.itely      |  2 +-
 Documentation/user/instrument-notation.itely |  2 +-
 Documentation/user/tutorial.itely            | 14 +++++++-------
 Documentation/user/tweaks.itely              |  4 ++--
 THANKS                                       |  2 ++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 723bdf08ea..afcd3384dd 100644
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -1054,7 +1054,7 @@ These voices are all separate from the voice that contains the notes just
 outside the @code{<< \\ >>} construct.  This should be noted when making
 changes at the voice level.  This also means that slurs and ties cannot go
 into or out of a @code{<< \\ >>} construct.  Conversely, parallel voices
-from separate @code{<< \\ >>} constructs on the same staff are the the
+from separate @code{<< \\ >>} constructs on the same staff are the
 same voice.  Here is the same example, with different noteheads for each
 voice.  Note that the change to the note-head style in the main voice does
 not affect
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 07b54772e9..83478ba966 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -4598,7 +4598,7 @@ figures below the notes, use
 When using figured bass above the staff with extender lines and
 @code{implicitBassFigures} the lines may become swapped around.
 Maintaining order consistently will be impossible when multiple figures
-have overlapping extender lines.  To avoid this problem, plese
+have overlapping extender lines.  To avoid this problem, please
 use @code{stacking-dir} on @code{BassFigureAlignment}.
 
 
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c54307dba0..5c8c2aaedf 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -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.
@@ -1463,12 +1463,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 +1483,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
diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 8c681e5a61..eb03d1f699 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -307,8 +307,8 @@ voices:
 } >>
 @end lilypond
 
-To make sure that the just blanked stem doesn't squeeze the too much
-tie, we also lengthen the stem, by setting the @code{length} to
+To make sure that the just-blanked stem doesn't squeeze the tie too much,
+we also lengthen the stem, by setting the @code{length} to
 @code{8},
 
 @lilypond[quote,fragment,relative=2,verbatim]
diff --git a/THANKS b/THANKS
index c2b3ebe478..d81a5a6a0f 100644
--- a/THANKS
+++ b/THANKS
@@ -66,6 +66,7 @@ Martijn Vromans
 Marnen Laibow-Koser
 Maximilian Albert
 Mirosław Doroszewski
+Mike Coleman
 Nicolas Mayencourt
 Nicolas Sceaux
 Orm Finnendahl
@@ -80,6 +81,7 @@ Steven Weber
 Tomas Sauer
 Thomas Scharkowski
 Trevor Bača
+Valentin Villenave
 Vivian Barty-Taylor
 Werner Lemberg
 Wilbert Berendsen
-- 
2.39.5