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

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

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 1c596303d74afaf03b41c91639bffd5f80315af0..0220f410491b54f772b4337c3e24bc774e830f6a 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -73,7 +73,7 @@ German glossary,
 Original author of LilyPond glossary, Danish glossary,
 @item David González
 Spanish glossary,
-@item Fran@,{c}ois Pinard
+@item François Pinard
 Original glossary of GNU music project, French glossary,
 @item Han-Wen Nienhuys
 Dutch glossary,
@@ -312,6 +312,7 @@ Languages in this order.
 * ornament::                    
 * ossia::                       
 * part::                        
+* pause::                       
 * pennant::                     
 * percussion::                  
 * perfect interval::            
@@ -2243,7 +2244,7 @@ symbol indicates playing an octave lower (for example on double bass
 
 ES: calderón,
 I: corona,
-F: point d'orgue, point d'arr@^et,
+F: point d'orgue, point d'arrêt,
 D: Fermate,
 NL: fermate,
 DK: fermat,
@@ -3414,7 +3415,7 @@ and hears a tone.
 
 ES: cabeza,
 I: testa, testina, capocchia,
-F: t@^ete de la note,
+F: tête de la note,
 D: Notenkopf,
 NL: nootballetje,
 DK: nodehovede,
@@ -3610,6 +3611,11 @@ FI: stemma, instrumenttiosuus.
 or voice.  2.@tie{}in contrapuntal music @aref{counterpoint} the single
 melodic line of the contrapunctal web.
 
+@node pause
+@section pause
+
+@ref{fermata}
+
 @node pennant
 @section pennant