note-collison.cc: Scale shifts by width of note at left; issue 1713

[lilypond.git] / Documentation / music-glossary.tely

diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index b2df038dc722d5ec91047f054db0d7c9e0ccfe1f..1983f83dc717d68bf9ce04762a4d43befabedf91 100644 (file)
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -1998,7 +1998,7 @@ Another name for @ref{common time}.
 ES: ?,
 I: ?,
 F: ?,
-D: ?,
+D: Kunstmusik,
 NL: ?,
 DK: ?,
 S: ?,
@@ -5882,7 +5882,7 @@ or bracket) to indicate that the music is to be played in a different octave:
 For longer passages, it may be more practical to mark the octave change at the
 beginning with a phrase (see the list below for examples), but without a bracket
 or extender line.  Then, when the music returns to the written pitch, the octave
-change is cancelled with the word @notation{loco} (q.v.).
+change is canceled with the word @notation{loco} (q.v.).
 
 To parallel the list above: