Merge remote-tracking branch 'origin/2.3' into 2.3

weaverryan · weaverryan · commit ad7c1dc8e48c · 2013-07-18T21:41:16.000-05:00
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
@@ -23,7 +23,7 @@ test the core types and you can use it to test your types too.
 .. versionadded:: 2.3
     The ``TypeTestCase`` has moved to the ``Symfony\Component\Form\Test``
     namespace in 2.3. Previously, the class was located in
-    ``Symfony\Component\Form\Tests\Core\Extension\Type``.
+    ``Symfony\Component\Form\Tests\Extension\Core\Type``.
 
 The Basics
 ----------
diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst
@@ -157,10 +157,11 @@ your code. This should also be taken into account when declaring your service:
         <services>
             <service id="greeting_card_manager"
                 class="Acme\HelloBundle\Mail\GreetingCardManager"
-            />
-            <call method="setRequest">
-                <argument type="service" id="request" on-invalid="null" strict="false" />
-            </call>
+            >
+                <call method="setRequest">
+                    <argument type="service" id="request" on-invalid="null" strict="false" />
+                </call>
+            </service>
         </services>
 
     .. code-block:: php
diff --git a/cookbook/session/php_bridge.rst b/cookbook/session/php_bridge.rst
@@ -2,7 +2,7 @@
    single: Sessions
 
 Bridge a legacy application with Symfony Sessions
--------------------------------------------------
+=================================================
 
 .. versionadded:: 2.3
     The ability to integrate with a legacy PHP session was added in Symfony 2.3.
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
@@ -50,8 +50,8 @@ choices
 
 **default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()``
 
-The country type defaults the ``choices`` option to the all locales.
-It uses the default locale to determine the language.
+The country type defaults the ``choices`` option to the whole list of countries.
+The locale is used to translate the countries names.
 
 Inherited options
 -----------------
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -51,8 +51,8 @@ choices
 
 **default**: ``Symfony\Component\Intl\Intl::getLanguageBundle()->getLanguageNames()``.
 
-The choices option defaults to all languages. It uses the default locale to
-specify the language.
+The choices option defaults to all languages.
+The default locale is used to translate the languages names.
 
 Inherited Options
 -----------------
