Merge branch '2.3'

Author: weaverryan

book/controller.rst

@@ -452,7 +452,8 @@ perform a 301 (permanent) redirect, modify the second argument::
 Forwarding
 ~~~~~~~~~~
 
-You can also easily forward to another controller internally with the ``forward()``
+You can also easily forward to another controller internally with the
+:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::forward`
 method. Instead of redirecting the user's browser, it makes an internal sub-request,
 and calls the specified controller. The ``forward()`` method returns the ``Response``
 object that's returned from that controller::
@@ -492,17 +493,22 @@ value to each variable.
 
     Like other base ``Controller`` methods, the ``forward`` method is just
     a shortcut for core Symfony2 functionality. A forward can be accomplished
-    directly via the ``http_kernel`` service and returns a ``Response``
-    object::
+    directly by duplicating the current request. When this
+    :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;
+    
+        $path = array(
+            '_controller' => 'AcmeHelloBundle:Hello:fancy',
+            'name'        => $name,
+            'color'       => 'green',
+        );
+        $request = $this->container->get('request');
+        $subRequest = $request->duplicate(array(), null, $path);
 
         $httpKernel = $this->container->get('http_kernel');
-        $response = $httpKernel->forward(
-            'AcmeHelloBundle:Hello:fancy',
-            array(
-                'name'  => $name,
-                'color' => 'green',
-            )
-        );
+        $response = $httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
 
 .. index::
    single: Controller; Rendering templates

book/forms.rst

@@ -307,6 +307,8 @@ querying if the "Save and add" button was clicked::
 .. index::
    single: Forms; Validation
 
+.. _book-forms-form-validation:
+
 Form Validation
 ---------------
 
@@ -731,8 +733,6 @@ of code. Of course, you'll usually need much more flexibility when rendering:
 
             {{ form_row(form.task) }}
             {{ form_row(form.dueDate) }}
-
-            <input type="submit" />
         {{ form_end(form) }}
 
     .. code-block:: html+php
@@ -743,8 +743,6 @@ of code. Of course, you'll usually need much more flexibility when rendering:
 
             <?php echo $view['form']->row($form['task']) ?>
             <?php echo $view['form']->row($form['dueDate']) ?>
-
-            <input type="submit" />
         <?php echo $view['form']->end($form) ?>
 
 Take a look at each part:

book/propel.rst

@@ -479,5 +479,5 @@ You should read the dedicated section for `Propel commands in Symfony2`_.
 .. _`Working With Symfony2`: http://propelorm.org/cookbook/symfony2/working-with-symfony2.html#installation
 .. _`PropelBundle configuration section`: http://propelorm.org/cookbook/symfony2/working-with-symfony2.html#configuration
 .. _`Relationships`: http://propelorm.org/documentation/04-relationships.html
-.. _`Behaviors reference section`: http://propelorm.org/documentation/#behaviors_reference
-.. _`Propel commands in Symfony2`: http://propelorm.org/cookbook/symfony2/working-with-symfony2#the_commands
+.. _`Behaviors reference section`: http://propelorm.org/documentation/#behaviors-reference
+.. _`Propel commands in Symfony2`: http://propelorm.org/cookbook/symfony2/working-with-symfony2#the-commands

book/templating.rst

@@ -670,6 +670,8 @@ string syntax for controllers (i.e. **bundle**:**controller**:**action**):
 Whenever you find that you need a variable or a piece of information that
 you don't have access to in a template, consider rendering a controller.
 Controllers are fast to execute and promote good code organization and reuse.
+Of course, like all controllers, they should ideally be "skinny", meaning
+that as much code as possible lives in reusable :doc:`services</book/service_container>`.
 
 Asynchronous Content with hinclude.js
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

components/console/events.rst

@@ -14,6 +14,8 @@ the wheel, it uses the Symfony EventDispatcher component to do the work::
     use Symfony\Component\Console\Application;
     use Symfony\Component\EventDispatcher\EventDispatcher;
 
+    $dispatcher = new EventDispatcher();
+
     $application = new Application();
     $application->setDispatcher($dispatcher);
     $application->run();

components/dependency_injection/parameters.rst

@@ -337,6 +337,12 @@ Start the string with  ``@`` or ``@?`` to reference a service in Yaml.
 * ``@?mailer`` references the ``mailer`` service. If the service does not
   exists, it will be ignored;
 
+.. tip::
+
+    Use ``@@`` to escape the ``@`` symbol in Yaml. ``@@mailer`` will be
+    converted into the string ``"@mailer"`` instead of referencing the
+    ``mailer`` service.
+
 Xml
 ~~~
 

components/finder.rst

@@ -97,7 +97,7 @@ Exclude directories from matching with the
     $finder->in(__DIR__)->exclude('ruby');
 
 .. versionadded:: 2.3
-   The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs``
+   The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs`
    method was added in Symfony 2.3.
 
 It's also possible to ignore directories that you don't have permission to read::

components/form/index.rst

@@ -0,0 +1,7 @@
+Form
+====
+
+.. toctree::
+    :maxdepth: 2
+
+    introduction