Merge branch '2.2' into 2.3

Conflicts:
	book/forms.rst
	components/index.rst
	reference/forms/types.rst

Author: weaverryan

book/forms.rst

@@ -1412,7 +1412,7 @@ renders the form:
 
         {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' 'AcmeTaskBundle:Form:fields2.html.twig' %}
 
-        {{ form(form) }}
+        <!-- ... render the form -->
 
     .. code-block:: html+php
 
@@ -1421,7 +1421,7 @@ renders the form:
 
         <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form', 'AcmeTaskBundle:Form')) ?>
 
-        <?php echo $view['form']->form($form) ?>
+        <!-- ... render the form -->
 
 The ``form_theme`` tag (in Twig) "imports" the fragments defined in the given
 template and uses them when rendering the form. In other words, when the

book/internals.rst

@@ -30,7 +30,7 @@ on top of the previous one.
 
 The deepest level is the :namespace:`Symfony\\Component\\HttpFoundation`
 component. HttpFoundation provides the main objects needed to deal with HTTP.
-It is an Object-Oriented abstraction of some native PHP functions and
+It is an object-oriented abstraction of some native PHP functions and
 variables:
 
 * The :class:`Symfony\\Component\\HttpFoundation\\Request` class abstracts

book/performance.rst

@@ -37,7 +37,7 @@ to ensure that the cache is cleared whenever any source files change. Otherwise,
 the updates you've made won't be seen.
 
 For example, to disable these checks in APC, simply add ``apc.stat=0`` to
-your php.ini configuration.
+your ``php.ini`` configuration.
 
 .. index::
    single: Performance; Autoloader

book/propel.rst

@@ -476,8 +476,8 @@ Commands
 
 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
+.. _`Working With Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#installation
+.. _`PropelBundle configuration section`: http://propelorm.org/Propel/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
+.. _`Propel commands in Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2#the-commands

book/routing.rst

@@ -707,8 +707,8 @@ form via the same URL, while using distinct controllers for the two actions.
 
     If no ``methods`` are specified, the route will match on *all* methods.
 
-Adding a Host
-~~~~~~~~~~~~~
+Adding a Host Requirement
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
     Host matching support was added in Symfony 2.2
@@ -1067,8 +1067,8 @@ from the new routing resource.
     :doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/routing>`
     to see how.
 
-Adding a Host regex to Imported Routes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Adding a Host requirement to Imported Routes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
     Host matching support was added in Symfony 2.2

book/security.rst

@@ -146,7 +146,7 @@ that looks like the following:
 * Any URL matching ``/admin/*`` is secured, and only the ``admin`` user
   can access it;
 * All URLs *not* matching ``/admin/*`` are accessible by all users (and the
-  user is never prompted to login).
+  user is never prompted to log in).
 
 Let's look briefly at how security works and how each part of the configuration
 comes into play.
@@ -1633,9 +1633,9 @@ the first provider is always used:
             ),
         ));
 
-In this example, if a user tries to login via HTTP authentication, the authentication
+In this example, if a user tries to log in via HTTP authentication, the authentication
 system will use the ``in_memory`` user provider. But if the user tries to
-login via the form login, the ``user_db`` provider will be used (since it's
+log in via the form login, the ``user_db`` provider will be used (since it's
 the default for the firewall as a whole).
 
 For more information about user provider and firewall configuration, see
@@ -1867,7 +1867,7 @@ Impersonating a User
 --------------------
 
 Sometimes, it's useful to be able to switch from one user to another without
-having to logout and login again (for instance when you are debugging or trying
+having to log out and log in again (for instance when you are debugging or trying
 to understand a bug a user sees that you can't reproduce). This can be easily
 done by activating the ``switch_user`` firewall listener:
 

book/testing.rst

@@ -244,9 +244,9 @@ document::
         )
 
     The ``server`` array is the raw values that you'd expect to normally
-    find in the PHP `$_SERVER`_ superglobal. For example, to set the `Content-Type`,
-    `Referer` and `X-Requested-With' HTTP headers, you'd pass the following (mind
-    the `HTTP_` prefix for non standard headers)::
+    find in the PHP `$_SERVER`_ superglobal. For example, to set the ``Content-Type``,
+    ``Referer`` and ``X-Requested-With`` HTTP headers, you'd pass the following (mind
+    the ``HTTP_`` prefix for non standard headers)::
 
         $client->request(
             'GET',

components/console/helpers/dialoghelper.rst

@@ -31,7 +31,7 @@ the following to your command::
         return;
     }
 
-In this case, the user will be asked "Continue with this action", and will return
+In this case, the user will be asked "Continue with this action?", and will return
 ``true`` if the user answers with ``y`` or false in any other case. The third
 argument to ``askConfirmation`` is the default value to return if the user doesn't
 enter any input.

components/event_dispatcher/generic_event.rst

@@ -5,8 +5,8 @@ The Generic Event Object
 ========================
 
 The base :class:`Symfony\\Component\\EventDispatcher\\Event` class provided by the
-``Event Dispatcher`` component is deliberately sparse to allow the creation of
-API specific event objects by inheritance using OOP. This allow for elegant and
+Event Dispatcher component is deliberately sparse to allow the creation of
+API specific event objects by inheritance using OOP. This allows for elegant and
 readable code in complex applications.
 
 The :class:`Symfony\\Component\\EventDispatcher\\GenericEvent` is available

components/event_dispatcher/introduction.rst

@@ -188,7 +188,7 @@ In many cases, a special ``Event`` subclass that's specific to the given event
 is passed to the listener. This gives the listener access to special
 information about the event. Check the documentation or implementation of each
 event to determine the exact ``Symfony\Component\EventDispatcher\Event``
-instance that's being passed. For example, the ``kernel.event`` event passes an
+instance that's being passed. For example, the ``kernel.response`` event passes an
 instance of ``Symfony\Component\HttpKernel\Event\FilterResponseEvent``::
 
     use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
@@ -306,7 +306,7 @@ the ``dispatch`` method. Now, any listener to the ``store.order`` event will
 receive the ``FilterOrderEvent`` and have access to the ``Order`` object via
 the ``getOrder`` method::
 
-    // some listener class that's been registered for "STORE_ORDER" event
+    // some listener class that's been registered for "store.order" event
     use Acme\StoreBundle\Event\FilterOrderEvent;
 
     public function onStoreOrder(FilterOrderEvent $event)

components/filesystem.rst

@@ -46,7 +46,7 @@ endpoint for filesystem operations::
 Mkdir
 ~~~~~
 
-:method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates directory.
+:method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory.
 On posix filesystems, directories are created with a default mode value
 `0777`. You can use the second argument to set your own mode::
 

components/http_foundation/introduction.rst

@@ -14,7 +14,7 @@ In PHP, the request is represented by some global variables (``$_GET``,
 generated by some functions (``echo``, ``header``, ``setcookie``, ...).
 
 The Symfony2 HttpFoundation component replaces these default PHP global
-variables and functions by an Object-Oriented layer.
+variables and functions by an object-oriented layer.
 
 Installation
 ------------
@@ -412,7 +412,7 @@ represented by a PHP callable instead of a string::
 .. note::
 
     The ``flush()`` function does not flush buffering. If ``ob_start()`` has
-    been called before or the ``output_buffering`` php.ini option is enabled,
+    been called before or the ``output_buffering`` ``php.ini`` option is enabled,
     you must call ``ob_flush()`` before ``flush()``.
 
     Additionally, PHP isn't the only layer that can buffer output. Your web

components/http_foundation/session_configuration.rst

@@ -26,7 +26,7 @@ So-called 'native' handlers, are save handlers which are either compiled into
 PHP or provided by PHP extensions, such as PHP-Sqlite, PHP-Memcached and so on.
 
 All native save handlers are internal to PHP and as such, have no public facing API.
-They must be configured by PHP ini directives, usually ``session.save_path`` and
+They must be configured by ``php.ini`` directives, usually ``session.save_path`` and
 potentially other driver specific directives. Specific details can be found in
 docblock of the ``setOptions()`` method of each class.
 
@@ -87,7 +87,7 @@ Configuring PHP Sessions
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage`
-can configure most of the PHP ini configuration directives which are documented
+can configure most of the ``php.ini`` configuration directives which are documented
 at `php.net/session.configuration`_.
 
 To configure these settings, pass the keys (omitting the initial ``session.`` part
@@ -131,7 +131,7 @@ example if these were set to ``5/100`` respectively, it would mean a probability
 of 5%. Similarly, ``3/4`` would mean a 3 in 4 chance of being called, i.e. 75%.
 
 If the garbage collection handler is invoked, PHP will pass the value stored in
-the PHP ini directive ``session.gc_maxlifetime``. The meaning in this context is
+the ``php.ini`` directive ``session.gc_maxlifetime``. The meaning in this context is
 that any stored session that was saved more than ``maxlifetime`` ago should be
 deleted. This allows one to expire records based on idle time.
 

components/http_foundation/sessions.rst

@@ -46,7 +46,7 @@ Quick example::
 
 .. caution::
 
-    Symfony sessions are incompatible with PHP ini directive ``session.auto_start = 1``
+    Symfony sessions are incompatible with ``php.ini`` directive ``session.auto_start = 1``
     This directive should be turned off in ``php.ini``, in the webserver directives or
     in ``.htaccess``.
 

components/index.rst

@@ -10,8 +10,8 @@ The Components
     console/index
     css_selector
     debug
-    dom_crawler
     dependency_injection/index
+    dom_crawler
     event_dispatcher/index
     filesystem
     finder

components/map.rst.inc

@@ -103,6 +103,13 @@
   * :doc:`/components/routing/introduction`
   * :doc:`/components/routing/hostname_pattern`
 
+* :doc:`/components/security/index`
+
+  * :doc:`/components/security/introduction`
+  * :doc:`/components/security/firewall`
+  * :doc:`/components/security/authentication`
+  * :doc:`/components/security/authorization`
+
 * **Serializer**
 
   * :doc:`/components/serializer`
@@ -111,13 +118,6 @@
 
   * :doc:`/components/stopwatch`
 
-* :doc:`/components/security/index`
-
-  * :doc:`/components/security/introduction`
-  * :doc:`/components/security/firewall`
-  * :doc:`/components/security/authentication`
-  * :doc:`/components/security/authorization`
-
 * :doc:`/components/templating/index`
 
   * :doc:`/components/templating/introduction`

components/property_access/introduction.rst

@@ -166,7 +166,7 @@ The ``getValue`` method can also use the magic ``__get`` method::
     class Person
     {
         private $children = array(
-            'wouter' => array(...),
+            'Wouter' => array(...),
         );
 
         public function __get($id)
@@ -243,7 +243,7 @@ Writing to Objects
 ------------------
 
 The ``setValue`` method has the same features as the ``getValue`` method. You
-can use setters, the magic ``__set`` or properties to set values::
+can use setters, the magic ``__set`` method or properties to set values::
 
     // ...
     class Person