Sep 22, 2016 · Sep 22, 2016
diff --git a/components/console/helpers/table.rst b/components/console/helpers/table.rst
 .. tip::

    You can create a multiple-line page title using a header cell that spans
    theenire table width::
    theentire table width::

        $table->setHeaders(array(
            array(new TableCell('Main table title', array('colspan' => 3))),
diff --git a/controller/argument_value_resolver.rst b/controller/argument_value_resolver.rst
        // app/config/services.php
        use Symfony\Component\DependencyInjection\Definition;

        $defintion = new Definition(
        $definition = new Definition(
            'AppBundle\ArgumentResolver\UserValueResolver',
            array(new Reference('security.token_storage'))
        );
diff --git a/deployment/fortrabbit.rst b/deployment/fortrabbit.rst
 PHP Settings
 ~~~~~~~~~~~~

 The PHP version and enabled extensions areconfiguable under the PHP settings
 The PHP version and enabled extensions areconfigurable under the PHP settings
 of your App within the fortrabbit Dashboard.

 Environment Variables
 Document Root
 ~~~~~~~~~~~~~

 The document root isconfiguable for every custom domain you setup for your App.
 The document root isconfigurable for every custom domain you setup for your App.
 The default is ``/htdocs``, but for Symfony you probably want to change it to
 ``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.

diff --git a/doctrine.rst b/doctrine.rst
 mapping metadata information to map an object's data to a particular database
 table.

 Doctrine has a lot more complex features to learn, likerelationshps, complex queries,
 Doctrine has a lot more complex features to learn, likerelationships, complex queries,
 and event listeners.

 Learn more
diff --git a/doctrine/associations.rst b/doctrine/associations.rst

 While the many-to-one mapping shown earlier was mandatory, this one-to-many
 mapping is optional. It is included here to help demonstrate Doctrine's range
 of relationship managementcapabailties. Plus, in the context of this application,
 of relationship managementcapabilities. Plus, in the context of this application,
 it will likely be convenient for each ``Category`` object to automatically
 own a collection of its related ``Product`` objects.

diff --git a/form/data_transformers.rst b/form/data_transformers.rst
    }

 Internally the ``tags`` are stored as an array, but displayed to the user as a
 simple commaseperated string to make them easier to edit.
 simple commaseparated string to make them easier to edit.

 This is a *perfect* time to attach a custom data transformer to the ``tags``
 field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`
diff --git a/form/direct_submit.rst b/form/direct_submit.rst
    When submitting a form via a "PATCH" request, you may want to update only a few
    submitted fields. To achieve this, you may pass an optional second boolean
    parameter to ``submit()``. Passing ``false`` will remove any missing fields
    within the form object. Otherwise, themising fields will be set to ``null``.
    within the form object. Otherwise, themissing fields will be set to ``null``.
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst

 A lot of different attacks have been discovered relying on inconsistencies
 in handling the ``Host`` header by various software (web servers, reverse
 proxies, web frameworks, etc.). Basically,everytime the framework is
 proxies, web frameworks, etc.). Basically,every time the framework is
 generating an absolute URL (when sending an email to reset a password for
 instance), the host might have been manipulated by an attacker.

diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
 .. note::

    This option expects an array of entity objects (that's actually the same as with
    the ``ChoiceType`` field,whichs requires an array of the preferred "values").
    the ``ChoiceType`` field,which requires an array of the preferred "values").

 .. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc

diff --git a/security/ldap.rst b/security/ldap.rst

 **type**: ``string`` **default**: ``null``

 This is your read-only user's password,wich will be used to authenticate
 This is your read-only user's password,which will be used to authenticate
 against the LDAP server in order to fetch the user's information.

 default_roles
diff --git a/serializer/custom_encoders.rst b/serializer/custom_encoders.rst

 The:doc:`Serializer Component</components/serializer>` uses Normalizers
 to transform any data to an array. Then, by leveraging *Encoders*, that data can
 beconvereted into any data-structure (e.g. JSON).
 beconverted into any data-structure (e.g. JSON).

 The Component provides several built-in encoders that are described
 :doc:`in their own section</serializer/encoders>` but you may want
diff --git a/service_container/definitions.rst b/service_container/definitions.rst
 ..caution::

    Don't use ``get()`` to get a service that you want to inject as constructor
    argument, the service is not yetavailabe. Instead, use a
    argument, the service is not yetavailable. Instead, use a
    ``Reference`` instance as shown above.

 Method Calls
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst

            use Symfony\Component\DependencyInjection\Reference;

            $container->register('app.decorating_mailer', 'AppBundle\DeocratingMailer')
            $container->register('app.decorating_mailer', 'AppBundle\DecoratingMailer')
                ->setDecoratedService('foo', 'app.decorating_mailer.wooz')
                ->addArgument(new Reference('app.decorating_mailer.wooz'))
                // ...
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
        </Directory>

        # uncomment the following lines if you install assets as symlinks
        # or run into problems when compiling LESS/Sass/CoffeScript assets
        # or run into problems when compiling LESS/Sass/CoffeeScript assets
        # <Directory /var/www/project>
        #     Options FollowSymlinks
        # </Directory>
        </Directory>

        # uncomment the following lines if you install assets as symlinks
        # or run into problems when compiling LESS/Sass/CoffeScript assets
        # or run into problems when compiling LESS/Sass/CoffeeScript assets
        # <Directory /var/www/project>
        #     Options FollowSymlinks
        # </Directory>
        </Directory>

        # uncomment the following lines if you install assets as symlinks
        # or run into problems when compiling LESS/Sass/CoffeScript assets
        # or run into problems when compiling LESS/Sass/CoffeeScript assets
        # <Directory /var/www/project>
        #     Options FollowSymlinks
        # </Directory>
        </Directory>

        # uncomment the following lines if you install assets as symlinks
        # or run into problems when compiling LESS/Sass/CoffeScript assets
        # or run into problems when compiling LESS/Sass/CoffeeScript assets
        # <Directory /var/www/project>
        #     Options FollowSymlinks
        # </Directory>
diff --git a/templating.rst b/templating.rst

 .. code-block:: twig

    <!--outupt escaping is on automatically -->
    <!--output escaping is on automatically -->
    {{ description }} <!-- I &lt3 this product -->

    <!-- disable output escaping with the raw filter -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -222,7 +222,7 @@ This results in:
		.. tip::

		You can create a multiple-line page title using a header cell that spans
		theenire table width::
		theentire table width::

		$table->setHeaders(array(
		array(new TableCell('Main table title', array('colspan' => 3))),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -172,7 +172,7 @@ and adding a priority.
		// app/config/services.php
		use Symfony\Component\DependencyInjection\Definition;

		$defintion = new Definition(
		$definition = new Definition(
		'AppBundle\ArgumentResolver\UserValueResolver',
		array(new Reference('security.token_storage'))
		);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -175,7 +175,7 @@ Configuring the Environment in the Dashboard
		PHP Settings
		~~~~~~~~~~~~

		The PHP version and enabled extensions areconfiguable under the PHP settings
		The PHP version and enabled extensions areconfigurable under the PHP settings
		of your App within the fortrabbit Dashboard.

		Environment Variables
Expand All		@@ -187,7 +187,7 @@ config files get loaded. ENV vars are configuable in fortrabbit Dashboard as wel
		Document Root
		~~~~~~~~~~~~~

		The document root isconfiguable for every custom domain you setup for your App.
		The document root isconfigurable for every custom domain you setup for your App.
		The default is ``/htdocs``, but for Symfony you probably want to change it to
		``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -887,7 +887,7 @@ Doctrine allows you to use any PHP object to hold your data and relies on
		mapping metadata information to map an object's data to a particular database
		table.

		Doctrine has a lot more complex features to learn, likerelationshps, complex queries,
		Doctrine has a lot more complex features to learn, likerelationships, complex queries,
		and event listeners.

		Learn more
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -162,7 +162,7 @@ to hold those associated objects.

		While the many-to-one mapping shown earlier was mandatory, this one-to-many
		mapping is optional. It is included here to help demonstrate Doctrine's range
		of relationship managementcapabailties. Plus, in the context of this application,
		of relationship managementcapabilities. Plus, in the context of this application,
		it will likely be convenient for each ``Category`` object to automatically
		own a collection of its related ``Product`` objects.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
		}

		Internally the ``tags`` are stored as an array, but displayed to the user as a
		simple commaseperated string to make them easier to edit.
		simple commaseparated string to make them easier to edit.

		This is a perfect time to attach a custom data transformer to the ``tags``
		field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,4 +82,4 @@ method, pass the submitted data directly to
		When submitting a form via a "PATCH" request, you may want to update only a few
		submitted fields. To achieve this, you may pass an optional second boolean
		parameter to ``submit()``. Passing ``false`` will remove any missing fields
		within the form object. Otherwise, themising fields will be set to ``null``.
		within the form object. Otherwise, themissing fields will be set to ``null``.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -300,7 +300,7 @@ trusted_hosts

		A lot of different attacks have been discovered relying on inconsistencies
		in handling the ``Host`` header by various software (web servers, reverse
		proxies, web frameworks, etc.). Basically,everytime the framework is
		proxies, web frameworks, etc.). Basically,every time the framework is
		generating an absolute URL (when sending an email to reset a password for
		instance), the host might have been manipulated by an attacker.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -263,7 +263,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
		.. note::

		This option expects an array of entity objects (that's actually the same as with
		the ``ChoiceType`` field,whichs requires an array of the preferred "values").
		the ``ChoiceType`` field,which requires an array of the preferred "values").

		.. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,7 +196,7 @@ search_password

		type: ``string`` default: ``null``

		This is your read-only user's password,wich will be used to authenticate
		This is your read-only user's password,which will be used to authenticate
		against the LDAP server in order to fetch the user's information.

		default_roles
Expand Down