Backport of proofreading.

diff --git a/ChangeLog b/ChangeLog
index 1da77d69e77edca6aaf3a195f6c91107110cf9ba..a33ef2fc398a9aba7c546528dcde25fcc74e8653 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/tweaking.itely, advanced-notation.itely:
+       backport from 2.9.
+
 2006-05-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * flower/file-name.cc: add unistd.h

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 99042c5eb6a16ef2d56b342d0785fd1a086265f4..b4335de9a011f2267579729691f3add36741afe5 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -2177,7 +2177,7 @@ If x11-color cannot make sense of the parameter then the color returned
 defaults to black.  It should be obvious from the final score that
 something is wrong.
 
-This example, illustrates the use of x11-color.  Notice that the stem
+This example illustrates the use of x11-color.  Notice that the stem
 color remains black after being set to (x11-color 'Boggle), which is
 deliberate nonsense.
 
@@ -2211,6 +2211,10 @@ normal colors are recommended.
 An x11 color is not necessarily exactly the same shade as a similarly
 named normal color. 
 
+Notes in a chord cannot be colored with @code{\override}; use
+@code{\tweak} instead.  See @ref{Objects connected to the input}
+for details.
+
 
 @node Parentheses
 @subsection Parentheses

diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 0df2567f3a003b9aff339502a5667dbc3441a2dd..da51813e112664834bf3b205ce3ceca86d9a1e5b 100644 (file)
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -2,7 +2,7 @@
 @node Tweaking output
 @chapter Tweaking output
 
-This chapter discusses how modify output.  LilyPond is extremely
+This chapter discusses how to modify output.  LilyPond is extremely
 configurable; virtually every fragment of output may be changed.
 
 
@@ -17,7 +17,7 @@ configurable; virtually every fragment of output may be changed.
 @node Fixing overlapping notation
 @section Fixing overlapping notation
 
-This may come as a surprise, but LilyPond isn't perfect.  Some notation
+This may come as a surprise, but LilyPond is not perfect.  Some notation
 elements can overlap.  This is unfortunate, but (in most cases) is easily
 solved.
 
@@ -72,7 +72,8 @@ Another solution gives us complete control over placing the object -- we
 can move it horizontally or vertically.  This is done with the
 @code{extra-offset} property.  It is slightly more complicated and can
 cause other problems.  When we move objects with @code{extra-offset},
-the movement is done after LilyPond has placed all other objects.  This means
+the movement is done after LilyPond has placed all other objects.  This 
+means
 that the result can overlap with other objects.
 
 @lilypond[quote,fragment,ragged-right,verbatim,relative=2]
@@ -140,7 +141,7 @@ sections.
 
 The complete list of modifications available for each type of
 object (like slurs or beams) are documented in the Program
-Reference.  However, many layout objects share properties, which can be
+Reference.  However, many layout objects share properties which can be
 used to apply generic tweaks.
 
 @itemize @bullet
@@ -170,15 +171,15 @@ d1
 
 Note in the second example how important it is to figure out what
 context handles a certain object.  Since the @code{MetronomeMark} object
-is handled in the Score context, property changes in the @code{Voice}
-context will not be noticed.  For more details, see
+is handled in the @code{Score} context, property changes in the
+@code{Voice} context will not be noticed.  For more details, see
 @ref{Constructing a tweak}.
 
 @cindex @code{extra-offset}
 @item The @code{extra-offset} property moves objects around
 in the output; it requires a pair of numbers.  The first number
 controls horizontal movement; a positive number will
-move the object to the right.  The second number controls vertical 
+move the object to the right.  The second number controls vertical
 movement; a positive number will move it higher.  The
 @code{extra-offset} property is a low-level feature: the
 formatting engine is completely oblivious to these offsets.
@@ -190,7 +191,7 @@ the left, and 1.8 staff space downwards:
 \stemUp
 f-5
 \once \override Fingering
-    #'extra-offset = #'(-0.3 . -1.8) 
+    #'extra-offset = #'(-0.3 . -1.8)
 f-5
 @end lilypond
 
@@ -237,7 +238,7 @@ voices:
 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
+are measured in staff-spaces.  For more information, see the
 relevant portion of the program reference.