From: gpercival <gpercival>
Date: Fri, 10 Sep 2004 19:45:40 +0000 (+0000)
Subject: Small fixes.
X-Git-Tag: release/2.3.24^2~255
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=16533189cb4a43dc2343d22806c408c5eaee1e2a;p=lilypond.git

Small fixes.
---

diff --git a/ChangeLog b/ChangeLog
index 461b43cfcd..878ef3c9d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-10  Graham Percival  <gperlist@shaw.ca>
+
+	* Documentation/user/notation.itely: small fixes to docs.
+
 2004-09-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* VERSION (PACKAGE_NAME): release 2.3.15
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index d014f92b0c..0df5e096b0 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -690,15 +690,17 @@ There is also a syntax that is separate from the notes.  The syntax
 \octave @var{pitch}
 @end example
 
-
-@c FIXME: what is the second sentence trying to say?  \octave check  -gp
-
 This checks that @var{pitch} (without quotes) yields @var{pitch} (with
 quotes) in \relative mode.  If not, a warning is printed, and the
-octave is corrected, for example, the first check is passed
-successfully.  The second check fails with an error message.  The
-octave is adjusted so the following notes are in the correct octave
+octave is corrected.
+
+In the example below, the first check passes without incident, since
+the @code{e} (in relative mode) is within a fifth of @code{a'}.  However,
+the second check produces a warning, since the @code{e} is not within
+a fifth of @code{b'}.  The warning message is printed, and the octave
+is adjusted so that the following notes are in the correct octave
 once again.
+
 @example
 \relative c' @{
   e
@@ -764,13 +766,11 @@ used.  It is described in the next section.
 It is also possible to redefine the meaning of @code{|}.  This is done
 by assigning a music expression to @code{pipeSymbol},
 
-FIXME: example removed to allow doc builds.  Needs to be fixed soon.  -gp
-
-@c @lilypond[quote,fragment,raggedright,verbatim]
-@c pipeSymbol = \bar "||"
+@lilypond[quote,raggedright,verbatim]
+pipeSymbol = \bar "||"
 
-@c { c'2 c' | c'2 c }
-@c @end lilypond 
+{ c'2 c' | c'2 c }
+@end lilypond 
 
 
 @node Skipping corrected music