Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit cb482dcb01e3 · 2015-07-02T21:39:45.000+02:00
diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -168,10 +168,10 @@ example, assume you're trying to translate into the ``fr_FR`` locale:
    fallback locales set explicitly on the translator.
 
 For (3), the fallback locales can be set by calling
-:method:`Symfony\\Component\\Translation\\Translator::setFallbackLocale`::
+:method:`Symfony\\Component\\Translation\\Translator::setFallbackLocales`::
 
     // ...
-    $translator->setFallbackLocale(array('en'));
+    $translator->setFallbackLocales(array('en'));
 
 .. _using-message-domains:
 
diff --git a/contributing/code/tests.rst b/contributing/code/tests.rst
@@ -45,7 +45,7 @@ the follow command:
 
 .. code-block:: bash
 
-    $ composer --dev update
+    $ composer update
 
 Running
 -------
