From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Sat, 9 Aug 2014 09:44:55 +0000 (+0200)
Subject: Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation
X-Git-Tag: release/2.19.12-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

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

e8b68d8a878a0ee0381719230cf911dbcefa168d
diff --cc Documentation/fr/notation/rhythms.itely
index 0d82de628f,015ac7c308..c02b794315
--- a/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