General fixes and draft preparation.

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 1db3c4c579a99d0e38b12302dc81ee87a18a279d..70b33fab334190b571144a41c7b181904335539b 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -43,6 +43,12 @@ articulations, just like simple notes
 For more information about chords, see @ref{Introducing chord
 names}.
 
+@refbugs
+
+Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
+accurately.  Use @code{<g a>8 <e a>8} instead.
+
+
 
 @node Clusters
 @unnumberedsubsubsec Clusters
@@ -71,44 +77,19 @@ Program reference: @internalsref{ClusterSpanner},
 
 Examples: @lsr{contemporary,cluster@/.ly}.
 
-@refbugs
-
-Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
-accurately.  Use @code{<g a>8 <e a>8} instead.
-
 
 
 @node Multiple voices
 @subsection Multiple voices
 
 @menu
-* TODO new sec voices::         
-* Collision Resolution::        
+* Collision resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
 
-@node TODO new sec voices
-@unnumberedsubsubsec TODO new sec voices
-
-In some instances of complex polyphonic music, you may need
-additional voices to avoid collisions between notes.  Additional
-voices are added by defining an variable, as shown below:
-
-@lilypond[quote,verbatim,ragged-right,relative=2]
-voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
-
-\relative c''' <<
-  { \voiceOne g4 ~  \stemDown g32[ f( es d c b a b64 )g] } \\
-  { \voiceThree  b4} \\
-  { \voiceFive d,} \\
-  { \voiceTwo g,}
->>
-@end lilypond
-
-
-@node Collision Resolution
-@unnumberedsubsubsec Collision Resolution
+@node Collision resolution
+@unnumberedsubsubsec Collision resolution
 
 Normally, note heads with a different number of dots are not
 merged, but when the object property
@@ -171,6 +152,22 @@ move the top @code{g} out of the column, and
 >>
 @end lilypond
 
+In some instances of complex polyphonic music, you may need
+additional voices to avoid collisions between notes.  Additional
+voices are added by defining an variable, as shown below:
+
+@lilypond[quote,verbatim,ragged-right,relative=2]
+voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
+
+\relative c''' <<
+  { \voiceOne g4 ~  \stemDown g32[ f( es d c b a b64 )g] } \\
+  { \voiceThree  b4} \\
+  { \voiceFive d,} \\
+  { \voiceTwo g,}
+>>
+@end lilypond
+
+
 
 @refcommands
 

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 4b4d8eea8c0fdbe03e0ce5f54de5d6e5f967cc8c..e8b73df439f827e06ef42f52eddc87e15a36d576 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -314,7 +314,8 @@ For more details, see @ref{Text markup}.
 
 @seealso
 
-Program reference: @internalsref{MetronomeMark}.
+Program reference: @internalsref{MetronomeMark}, @ref{MIDI
+output}.
 
 
 @refbugs