Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / Documentation / user / vocal.itely

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 712ca7890c9e86126cfda66d81caf67b72b84cdf..6b88aebbe4c76871d37de3e2884bc645f2c33e5b 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -34,10 +34,10 @@ by examining the simplest method, and gradually increase complexity.
 * More about stanzas::          
 @end menu
 
-@commonprop
+@snippets
 
 Checking to make sure that text scripts and lyrics are within the margins is
-a relatively large computational task.  To speed up processing, lilypond does
+a relatively large computational task.  To speed up processing, LilyPond does
 not perform such calculations by default; to enable it, use
 
 @example
@@ -473,7 +473,7 @@ A complete example of a SATB score setup is in section
 @rlearning{Vocal ensembles}.
 
 
-@refcommands
+@predefined
 
 @code{\melisma}, @code{\melismaEnd}
 @funindex \melismaEnd
@@ -485,7 +485,7 @@ Internals Reference: @internalsref{Melisma_translator}.
 
 @c @lsr{vocal,lyric@/-combine.ly}.
 
-@refbugs
+@knownissues
 
 Melismata are not detected automatically, and extender lines must be
 inserted by hand.
@@ -510,7 +510,7 @@ Centered hyphens are entered as @samp{ -- } between syllables of a same word
 will be centered between the syllables, and its length will be adjusted
 depending on the space between the syllables.
 
-In tighly engraved music, hyphens can be removed.  Whether this
+In tightly engraved music, hyphens can be removed.  Whether this
 happens can be controlled with the @code{minimum-distance} (minimum
 distance between two syllables) and the @code{minimum-length}
 (threshold below which hyphens are removed).
@@ -906,7 +906,7 @@ These numbers are put just before the start of the first syllable.
 @subsubsection Adding dynamics marks
 
 Stanzas differing in loudness may be indicated by putting a
-dynamics mark before each stanza.  In Lilypond, everthing coming in
+dynamics mark before each stanza.  In LilyPond, everything coming in
 front of a stanza goes into the @code{StanzaNumber} object; dynamics marks
 are no different.  For technical reasons, you have to set the stanza
 outside @code{\lyricmode}:
@@ -1002,7 +1002,7 @@ its fleece was white as snow.
 When a piece of music has many verses, they are often printed in
 multiple columns across the page.  An outdented verse number often
 introduces each verse.  The following example shows how to produce such
-output in Lilypond.
+output in LilyPond.
 
 @lilypond[ragged-right,quote,verbatim]
 melody = \relative c' {