Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

diff --cc Documentation/fr/notation/rhythms.itely
index 0d82de628faaa3663b35c04e46653e6f0647f767,015ac7c308917854143dc24b6ffa65afb19c6c48..c02b794315e76fb1d02ebadd937078e1baf1d028
--- 1/Documentation/fr/notation/rhythms.itely
--- 2/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@@ -289,9 -285,9 +289,9 @@@ comme indiqué au chapitre @ref{Changem
  @funindex tupletSpannerDuration
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
- {entering-several-tuplets-using-only-one--times-command.ly}
+ {entering-several-tuplets-using-only-one--tuplet-command.ly}
  
 -@cindex nolet, modification du chiffre
 +@cindex n-olet, modification du chiffre
  
  @funindex TupletNumber
  

diff --cc Documentation/music-glossary.tely
Simple merge