Merge branch '2.3'

Author: weaverryan

book/controller.rst

@@ -502,7 +502,7 @@ value to each variable.
     :ref:`sub request <http-kernel-sub-requests>` is executed via the ``http_kernel``
     service the ``HttpKernel`` returns a ``Response`` object::
     
-        use Symfony\Component\HttpKernel/HttpKernelInterface;
+        use Symfony\Component\HttpKernel\HttpKernelInterface;
     
         $path = array(
             '_controller' => 'AcmeHelloBundle:Hello:fancy',

book/propel.rst

@@ -397,7 +397,7 @@ Now, try the code in action. Imagine you're inside a controller::
         }
     }
 
-Now, a single row is added to both the ``category`` and product tables. The
+Now, a single row is added to both the ``category`` and ``product`` tables. The
 ``product.category_id`` column for the new product is set to whatever the id is
 of the new category. Propel manages the persistence of this relationship for
 you.

book/translation.rst

@@ -520,15 +520,13 @@ via the ``request`` object::
 
     $request->setLocale('en_US');
 
-.. index::
-   single: Translations; Fallback and default locale
-
-It is also possible to store the locale in the session instead of on a per
-request basis. If you do this, each subsequent request will have this locale.
+.. tip::
 
-.. code-block:: php
+    Read :doc:`/cookbook/session/locale_sticky_session` to learn, how to store
+    the user's locale in the session.
 
-    $this->get('session')->set('_locale', 'en_US');
+.. index::
+   single: Translations; Fallback and default locale
 
 See the :ref:`book-translation-locale-url` section below about setting the
 locale via routing.

components/console/usage.rst

@@ -80,6 +80,8 @@ with:
 The verbose flag can optionally take a value between 1 (default) and 3 to
 output even more verbose messages:
 
+.. code-block:: bash
+
     $ php app/console list --verbose=2
     $ php app/console list -vv
     $ php app/console list --verbose=3

components/dependency_injection/parameters.rst

@@ -275,7 +275,7 @@ key, and define the type as ``constant``.
 
 .. note::
 
-    This does not works for Yaml configuration. If you're using Yaml, you can
+    This does not work for Yaml configuration. If you're using Yaml, you can
     import an XML file to take advantage of this functionality:
 
     .. configuration-block::

components/event_dispatcher/introduction.rst

@@ -143,10 +143,11 @@ The ``addListener()`` method takes up to three arguments:
 * A PHP callable that will be notified when an event is thrown that it listens
   to;
 
-* An optional priority integer (higher equals more important) that determines
-  when a listener is triggered versus other listeners (defaults to ``0``). If
-  two listeners have the same priority, they are executed in the order that
-  they were added to the dispatcher.
+* An optional priority integer (higher equals more important, and therefore
+  that the listener will be triggered earlier) that determines when a listener
+  is triggered versus other listeners (defaults to ``0``). If two listeners
+  have the same priority, they are executed in the order that they were added
+  to the dispatcher.
 
 .. note::
 

components/options_resolver.rst

@@ -194,6 +194,7 @@ value you guess based on the host. You can do that easily by using a
 Closure as the default value::
 
     use Symfony\Component\OptionsResolver\Options;
+    use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     // ...
     protected function setDefaultOptions(OptionsResolverInterface $resolver)
@@ -202,7 +203,7 @@ Closure as the default value::
 
         $resolver->setDefaults(array(
             'port' => function (Options $options) {
-                if (in_array($options['host'], array('127.0.0.1', 'localhost')) {
+                if (in_array($options['host'], array('127.0.0.1', 'localhost'))) {
                     return 80;
                 }
 
@@ -300,7 +301,7 @@ need to use the other options for normalizing::
 
         $resolver->setNormalizers(array(
             'host' => function (Options $options, $value) {
-                if (!in_array(substr($value, 0, 7), array('http://', 'https://')) {
+                if (!in_array(substr($value, 0, 7), array('http://', 'https://'))) {
                     if ($options['ssl']) {
                         $value = 'https://'.$value;
                     } else {

cookbook/assetic/asset_management.rst

@@ -18,11 +18,11 @@ directly:
 
     .. code-block:: html+jinja
 
-        <script src="{{ asset('js/script.js') }}" type="text/javascript" />
+        <script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
 
     .. code-block:: php
 
-        <script src="<?php echo $view['assets']->getUrl('js/script.js') ?>" type="text/javascript" />
+        <script src="<?php echo $view['assets']->getUrl('js/script.js') ?>" type="text/javascript"></script>
 
 But *with* Assetic, you can manipulate these assets however you want (or
 load them from anywhere) before serving them. This means you can:

cookbook/form/direct_submit.rst

@@ -86,7 +86,7 @@ method, pass the submitted data directly to
 Passing a Request to Form::submit() (deprecated)
 ------------------------------------------------
 
-.. versionadded::
+.. versionadded:: 2.3
     Before Symfony 2.3, the ``submit`` method was known as ``bind``.
 
 Before Symfony 2.3, the :method:`Symfony\Component\Form\FormInterface::submit`

cookbook/form/unit_testing.rst

@@ -168,6 +168,9 @@ on other extensions. You need add those extensions to the factory object::
     use Acme\TestBundle\Form\Type\TestedType;
     use Acme\TestBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
+    use Symfony\Component\Form\Forms;
+    use Symfony\Component\Form\FormBuilder;
+    use Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension;
 
     class TestedTypeTest extends TypeTestCase
     {