modification description
Merge branch 'french' into gh-pages