Minor fixes.

diff --git a/ChangeLog b/ChangeLog
index 1091714c84e2028b3625a67f61686d26544cf96d..a38c57d07d5500f5bb609e66466667b29a038b92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-09  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/examles.itely: attempted fix for broken
+       string quartet template.
+
+       * Documentation/user/notation.itely: remove unnecessary broken
+       link.
+
 2005-01-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * VERSION (PACKAGE_NAME): release 2.5.7

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index c0226a5b771b5e94b02a629e9c530db648e6c826..095d5d5c86d0bd2e4a216cfbeda8247883c19507 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -435,41 +435,40 @@ pedal = {
 This template demonstrates a string quartet.  It also uses a @code{\global}
 section for time and key signatures.
 
-@ignore
-@li lypond[quote,verbatim,raggedright]
-version "2.4.0"
+@lilypond[quote,verbatim,raggedright]
+\version "2.4.0"
 
 global= {
   \time 4/4
   \key c \major
 }
 
-Violinone = \new Voice { \relative c''{
+violinOne = \new Voice { \relative c''{
   \set Staff.instrument = "Violin 1 "
 
   c2 d e1
 
 \bar "|." }}
-Violintwo = \new Voice { \relative c''{
+violinTwo = \new Voice { \relative c''{
   \set Staff.instrument = "Violin 2 "
 
   g2 f e1
 
 \bar "|." }}
-Viola = \new Voice { \relative c' {
+viola = \new Voice { \relative c' {
   \set Staff.instrument = "Viola "
   \clef alto
 
   e2 d c1
 
 \bar "|." }}
-Cello = \new Voice { \relative c' {
+cello = \new Voice { \relative c' {
   \set Staff.instrument = "Cello     "
   \clef bass
 
   c2 b a1
 
-\bar "|."}}   %**********************************
+\bar "|."}}
 
 \score {
    \new StaffGroup <<
@@ -482,7 +481,6 @@ Cello = \new Voice { \relative c' {
    \midi { \tempo 4=60}
 }
 @end lilypond
-@end ignore
 
 @subsection String quartet parts
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 9ca44ceeff2d2f760e2d2ef86f1da71afd131ef0..681731e354df8a6ae4c75449830475d7ff8deed8 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -4086,10 +4086,6 @@ Program reference: @internalsref{LyricCombineMusic},
 @internalsref{Lyrics}, @internalsref{Melisma_translator}.
 
 
-@c link broken:
-@c Examples: @ref{Small ensembles},
-
-
 @inputfileref{input/@/regression,lyric@/-combine@/-new@/.ly}.
 @c TODO: make separate section for melismata