Backport doc stuff.

diff --git a/ChangeLog b/ChangeLog
index 744e4f67571a760ecad87f33595ad64fe5fc6a4d..f09a70e3c57f3f391b1cbd93cb91c1ff31dfa804 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-31  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/ advanced-notation, changing-defaults,
+       instrument-notation, invoking, music-glossary: backport doc.
+
 2006-03-31  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/pango-font.cc (pango_item_string_stencil): update from 2.9.x

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index c50eb9d12e2b69a1172199e81e5de703a9d1a20b..c02d58a4733fc2bf5b5669b990dae914b5abc710 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -554,7 +554,7 @@ example,
 
 @seealso
 
-Examples: @file{ly/@/font@/-family@/-override.ly}
+Examples: @inputfileref{input/@/regression,font@/-family@/-override.ly}.
 
 
 @node New dynamic marks
@@ -565,6 +565,12 @@ with dynamics.  Use @code{make-dynamic-script} to create these
 marks.  Note that the dynamic font only contains the characters
 @code{f,m,p,r,s} and @code{z}.
 
+Some situations (such as dynamic marks) have preset font-related
+properties.  If you are creating text in such situations, it
+is advisable to cancel those properties with
+@code{normal-text}.  See @ref{Overview of text markup commands}
+for more details.
+
 @cindex make-dynamic-script
 
 @lilypond[quote,verbatim,ragged-right]

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 5b073113bde036773ddfb009c4db4c55f070778b..70ba3ad66addf8276109019939151d5ba46e9ff5 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1047,13 +1047,20 @@ This engraver creates the following layout objects: @internalsref{Fingering}.
 
 In other words, once the @code{FingerEvent}s are interpreted, the
 @code{Fingering_engraver} plug-in will process them.
+
+@ignore
+@c  I can't figure out what this is supposed to mean.  -gp
+
 The @code{Fingering_engraver} is also listed to create
 @internalsref{Fingering} objects,
 
-
-Lo and behold, that is also the
+@c  old info?  it doesn't make any sense to me with our current docs.
+This is also the
 second bit of information listed under @b{See also} in the Notation
-manual.  By clicking around in the program reference, we can follow the
+manual.
+@end ignore
+
+By clicking around in the program reference, we can follow the
 flow of information within the program, either forward (like we did
 here), or backwards, following links like this:
 
@@ -1283,7 +1290,7 @@ an @internalsref{event} from the input, for example
 @end itemize
 
 It notably does not work for stems and accidentals (these are caused
-by note heads, not by music events), clefs (these are not caused by
+by note heads, not by music events) or clefs (these are not caused by
 music inputs, but rather by the change of a property value).
  
 In a similar vein, objects may be parenthesized by prefixing

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 8254fadbe4ad2bf4352cb44a83df2b32d4b5216e..c859f70812dbcc07bff6e23a7fa297c5669a784f 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -753,7 +753,7 @@ d d e d | c1 |
 
 text = \lyricmode {
 \set stanza = "1." Ma- ry had a lit- tle lamb,
-it's fleece was white as snow.
+its fleece was white as snow.
 }
 
 \book{

diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index 96095a9a680e9c45bf6bc65264336bc09d64378d..9cfb8b18d972a8bb9af09a9d6ac8b8e96aa0b51f 100644 (file)
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -329,6 +329,19 @@ invoking them directly, e.g.
 @var{path/to}/LilyPond.app/Contents/Resources/bin/convert-ly
 @end example 
 
+Alternatively, you may add this directory to your path.  Modify (or create)
+a file called @code{.profile} in your home directory such that it contains
+
+@example
+export PATH=$PATH:@var{path/to}/LilyPond.app/Contents/Resources/bin
+@end example
+
+@noindent
+This file should end with a blank line.
+
+Note that @var{path/to} will generally be @code{/Applications/}.
+
+
 @node Error messages
 @section Error messages
 

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 9173020019e6f78dde2ad48610aa817c340c8700..08f03e9c142feec82d23c150bbb21cb6044ce668 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -2367,7 +2367,7 @@ variants of the base chords.
 \context Voice \relative c'' {
   <g e c >1 < a f d > < b g e >
   <c a f > < d b g > < e c a > < f d b > }
-\context Lyrics \lyrics { T Sp Dp S D Tp "\ \ D{\\kern-5pt}$\\mid$" }
+\context Lyrics \lyrics { T Sp Dp S D Tp \markup{ D\translate #(cons -2 0) {"|"}  } }
 @end lilypond
 
 @node G