Merge branch 'master' into translation

diff --combined Documentation/fr/notation/rhythms.itely
index 0b91efb5702caac1e12057fe49a66bb470acb5aa,43484e2a1f1689e638ea41837021a045e9f479f4..73be69908936ceeaade9edc134fd19bf24fa2319
--- 1/Documentation/fr/notation/rhythms.itely
--- 2/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@@ -1,7 -1,7 +1,7 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  
  @ignore
 -    Translation of GIT committish: 47c20999a49c7c77167089761a4dd964884e53fe
 +    Translation of GIT committish: bd751630011a6fbfcf069ec1fc41a8eaed8a6b87
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
@@@ -154,7 -154,7 +154,7 @@@ chapitre @ref{Direction et positionneme
  
  @snippets
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
- {alternative-breve-note.ly}
+ {alternative-breve-notes.ly}
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
  {changing-the-number-of-augmentation-dots-per-note.ly}

diff --combined Documentation/it/notation/rhythms.itely
index 119c4cf5bb7263803179e0e63e5be0cbb0159132,4e6cc9ab37b83b09cfbc3ca3fde152a00d1f3582..bb2f8fec1ea9ed87536fb3d269bc6ad5e0d38c6c
--- 1/Documentation/it/notation/rhythms.itely
--- 2/Documentation/it/notation/rhythms.itely
+++ b/Documentation/it/notation/rhythms.itely
@@@ -9,9 -9,6 +9,9 @@@
  
  @c \version "2.17.6"
  
 +@c Translators: Federico Bruni
 +@c Translation checkers:
 +
  @node Ritmi
  @section Ritmi
  @translationof Rhythms
@@@ -148,7 -145,7 +148,7 @@@ o sotto il rigo; si veda @ref{Directio
  @snippets
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
- {alternative-breve-note.ly}
+ {alternative-breve-notes.ly}
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
  {changing-the-number-of-augmentation-dots-per-note.ly}