Merge branch '2.4' into 2.5

* 2.4:
  $this->request replaced by $request
  Security] [Custom Provider] Use properties on WebserviceUser
  Use getters on WebserviceUser
  removed one space
  Update submit.rst
  Also apply it for .rst.inc files
  Fixed a minor syntax error
  Added editorconfig
  apply headline guidelines to the cookbook articles
  link to the deployment index
  remove "..." from XML element tags
  quote YAML strings starting with % or @ characters

Author: weaverryan

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.{rst,rst.inc}]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

book/forms.rst

@@ -1675,7 +1675,7 @@ file:
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                                 http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-            <framework:config ...>
+            <framework:config>
                 <framework:templating>
                     <framework:form>
                         <framework:resource>AcmeTaskBundle:Form</framework:resource>

book/http_cache.rst

@@ -862,13 +862,13 @@ First, to use ESI, be sure to enable it in your application configuration:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony
+                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-            <framework:config ...>
+            <framework:config>
                 <!-- ... -->
                 <framework:esi enabled="true" />
             </framework:config>
-
         </container>
 
     .. code-block:: php

book/internals.rst

@@ -644,7 +644,7 @@ If you enable the web profiler, you also need to mount the profiler routes:
     .. code-block:: yaml
 
         _profiler:
-            resource: @WebProfilerBundle/Resources/config/routing/profiler.xml
+            resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
             prefix:   /_profiler
 
     .. code-block:: xml

book/service_container.rst

@@ -588,7 +588,7 @@ the service container gives you a much more appealing option:
             </parameters>
 
             <services>
-                <service id="my_mailer" ...>
+                <service id="my_mailer">
                 <!-- ... -->
                 </service>
                 <service id="newsletter_manager" class="%newsletter_manager.class%">
@@ -794,7 +794,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
             </parameters>
 
             <services>
-                <service id="my_mailer" ...>
+                <service id="my_mailer">
                 <!-- ... -->
                 </service>
                 <service id="newsletter_manager" class="%newsletter_manager.class%">
@@ -960,7 +960,7 @@ it exists and do nothing if it doesn't:
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="my_mailer" ...>
+                <service id="my_mailer">
                 <!-- ... -->
                 </service>
                 <service id="newsletter_manager" class="%newsletter_manager.class%">

components/dependency_injection/configurators.rst

@@ -156,7 +156,7 @@ The service config for the above classes would look something like this:
     .. code-block:: xml
 
         <services>
-            <service id="my_mailer" ...>
+            <service id="my_mailer">
               <!-- ... -->
             </service>
             <service id="email_formatter_manager" class="EmailFormatterManager">

contributing/documentation/standards.rst

@@ -146,12 +146,11 @@ Language Standards
   point of view: use the second instead);
 * When referencing a hypothetical person, such as "a user with a session cookie", gender-neutral
   pronouns (they/their/them) should be used. For example, instead of:
-
-   * he or she, use they
-   * him or her, use them
-   * his or her, use their
-   * his or hers, use theirs
-   * himself or herself, use themselves
+  * he or she, use they
+  * him or her, use them
+  * his or her, use their
+  * his or hers, use theirs
+  * himself or herself, use themselves
 
 .. _`the Sphinx documentation`: http://sphinx-doc.org/rest.html#source-code
 .. _`Twig Coding Standards`: http://twig.sensiolabs.org/doc/coding_standards.html

cookbook/assetic/apply_to_option.rst

@@ -1,7 +1,7 @@
 .. index::
    single: Assetic; Apply filters
 
-How to Apply an Assetic Filter to a Specific File Extension
+How to Apply an Assetic Filter to a specific File Extension
 ===========================================================
 
 Assetic filters can be applied to individual files, groups of files or even,
@@ -49,7 +49,7 @@ An example configuration might look like this:
             ),
         ));
 
-Filter a Single File
+Filter a single File
 --------------------
 
 You can now serve up a single CoffeeScript file as JavaScript from within your
@@ -75,7 +75,7 @@ templates:
 This is all that's needed to compile this CoffeeScript file and serve it
 as the compiled JavaScript.
 
-Filter Multiple Files
+Filter multiple Files
 ---------------------
 
 You can also combine multiple CoffeeScript files into a single output file:
@@ -107,7 +107,7 @@ JavaScript.
 
 .. _cookbook-assetic-apply-to:
 
-Filtering based on a File Extension
+Filtering Based on a File Extension
 -----------------------------------
 
 One of the great advantages of using Assetic is reducing the number of asset
@@ -146,7 +146,7 @@ applied to all ``.coffee`` files:
                 apply_to="\.coffee$" />
                 <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
         </assetic:config>
-        
+
     .. code-block:: php
 
         // app/config/config.php

cookbook/assetic/asset_management.rst

@@ -159,7 +159,7 @@ the :ref:`cssrewrite <cookbook-assetic-cssrewrite>` filter.
 
 .. _cookbook-assetic-including-image:
 
-Including images
+Including Images
 ~~~~~~~~~~~~~~~~
 
 To include an image you can use the ``image`` tag.
@@ -422,7 +422,7 @@ into your template:
 A more detailed guide about configuring and using Assetic filters as well as
 details of Assetic's debug mode can be found in :doc:`/cookbook/assetic/uglifyjs`.
 
-Controlling the URL used
+Controlling the URL Used
 ------------------------
 
 If you wish to, you can control the URLs that Assetic produces. This is
@@ -471,7 +471,7 @@ it might be downright frustrating.
 Fortunately, Assetic provides a way to dump your assets to real files, instead
 of being generated dynamically.
 
-Dumping Asset Files in the ``prod`` environment
+Dumping Asset Files in the ``prod`` Environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In the ``prod`` environment, your JS and CSS files are represented by a single
@@ -500,7 +500,7 @@ This will physically generate and write each file that you need (e.g. ``/js/abcd
 If you update any of your assets, you'll need to run this again to regenerate
 the file.
 
-Dumping Asset Files in the ``dev`` environment
+Dumping Asset Files in the ``dev`` Environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 By default, each asset path generated in the ``dev`` environment is handled

cookbook/assetic/jpeg_optimize.rst

@@ -1,7 +1,7 @@
 .. index::
    single: Assetic; Image optimization
 
-How to Use Assetic For Image Optimization with Twig Functions
+How to Use Assetic for Image Optimization with Twig Functions
 =============================================================
 
 Amongst its many filters, Assetic has four filters which can be used for on-the-fly
@@ -111,7 +111,7 @@ remove these by using the ``strip_all`` option:
             ),
         ));
 
-Lowering Maximum Quality
+Lowering maximum Quality
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The quality level of the JPEG is not affected by default. You can gain
@@ -152,7 +152,7 @@ image quality:
             ),
         ));
 
-Shorter syntax: Twig Function
+Shorter Syntax: Twig Function
 -----------------------------
 
 If you're using Twig, it's possible to achieve all of this with a shorter