From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 9 Jun 2009 08:40:33 +0000 (+0200)
Subject: Doc-fr: rhythms.itely, prevent conflict on further merge
X-Git-Tag: release/2.13.2-0~19^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3d681df96a6afb8f0df76aa5967326c2fd3c20da;p=lilypond.git

Doc-fr: rhythms.itely, prevent conflict on further merge

Ease merging with master, by parts.
---

diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely
index 1b5da49c1f..5295651a30 100644
--- a/Documentation/fr/user/rhythms.itely
+++ b/Documentation/fr/user/rhythms.itely
@@ -892,16 +892,16 @@ numéros de mesure.
 @cindex kirchenpausen
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{changing-form-of-multi--measure-rests.ly}
+{changing-form-of-multi-measure-rests.ly}
 
 @cindex silence multi-mesures, positionnement
 @cindex positionnement des silences multi-mesures
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{positioning-multi--measure-rests.ly}
+{positioning-multi-measure-rests.ly}
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{multi--measure-rest-markup.ly}
+{multi-measure-rest-markup.ly}
 
 
 @seealso