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 1b5da49c1f99e4718deda14c87c4e5467e149f61..5295651a30de684a5d4961566f805e7969f2fc95 100644 (file)
--- 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