Merge branch '2.8'

wouterj · Jul 2, 2015 · b3a32af · b3a32af
2 parents 3cdbc7c + cb482dc
commit b3a32af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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
 -------
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ the follow command: @@
     .. code-block:: bash
-        $ composer --dev update
+        $ composer update
     Running
     -------
@@ Expand Down @@