Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit cc10e472a7fa · 2015-11-01T19:37:55.000+01:00
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -581,6 +581,6 @@ Learn More!
 * :doc:`/components/console/console_arguments`
 
 .. _Packagist: https://packagist.org/packages/symfony/console
-.. _ConEmu: https://code.google.com/p/conemu-maximus5/
+.. _ConEmu: https://conemu.github.io/
 .. _ANSICON: https://github.com/adoxa/ansicon/releases
 .. _Mintty: https://mintty.github.io/
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -69,7 +69,7 @@ can be accessed via several public properties:
 
 * ``server``: equivalent of ``$_SERVER``;
 
-* ``headers``: mostly equivalent to a sub-set of ``$_SERVER``
+* ``headers``: mostly equivalent to a subset of ``$_SERVER``
   (``$request->headers->get('User-Agent')``).
 
 Each property is a :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`
@@ -90,7 +90,7 @@ instance (or a sub-class of), which is a data holder class:
 * ``headers``: :class:`Symfony\\Component\\HttpFoundation\\HeaderBag`.
 
 All :class:`Symfony\\Component\\HttpFoundation\\ParameterBag` instances have
-methods to retrieve and update its data:
+methods to retrieve and update their data:
 
 :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::all`
     Returns the parameters.
@@ -157,16 +157,16 @@ sometimes, you might want to get the value for the "original" parameter name:
 :method:`Symfony\\Component\\HttpFoundation\\Request::get` via the third
 argument::
 
-        // the query string is '?foo[bar]=bar'
+    // the query string is '?foo[bar]=bar'
 
-        $request->query->get('foo');
-        // returns array('bar' => 'bar')
+    $request->query->get('foo');
+    // returns array('bar' => 'bar')
 
-        $request->query->get('foo[bar]');
-        // returns null
+    $request->query->get('foo[bar]');
+    // returns null
 
-        $request->query->get('foo[bar]', null, true);
-        // returns 'bar'
+    $request->query->get('foo[bar]', null, true);
+    // returns 'bar'
 
 .. _component-foundation-attributes:
 
@@ -515,7 +515,7 @@ You can still set the ``Content-Type`` of the sent file, or change its ``Content
 .. versionadded:: 2.6
     The ``deleteFileAfterSend()`` method was introduced in Symfony 2.6.
 
-It is possible to delete the file after the request is sent with the 
+It is possible to delete the file after the request is sent with the
 :method:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse::deleteFileAfterSend` method.
 Please note that this will not work when the ``X-Sendfile`` header is set.
 
diff --git a/cookbook/routing/custom_route_loader.rst b/cookbook/routing/custom_route_loader.rst
@@ -16,7 +16,7 @@ A custom route loader does not enable your bundle to inject routes
 without the need to modify the routing configuration
 (e.g. ``app/config/routing.yml``) manually.
 If your bundle provides routes, whether via a configuration file, like
-the `WebProfilerBundle` does, or via a custom route loader, like the 
+the `WebProfilerBundle` does, or via a custom route loader, like the
 `FOSRestBundle`_ does, an entry in the routing configuration is always
 necessary.
 
@@ -46,7 +46,7 @@ Take these lines from the ``routing.yml`` in the Symfony Standard Edition:
 
     # app/config/routing.yml
     app:
-        resource: @AppBundle/Controller/
+        resource: "@AppBundle/Controller/"
         type:     annotation
 
 When the main loader parses this, it tries all registered delegate loaders and calls
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -40,7 +40,7 @@ TwigBundle Configuration ("twig")
 
             # The following were added in Symfony 2.3.
             # See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
-            autoescape_service:        ~ # Example: @my_service
+            autoescape_service:        ~ # Example: "@my_service"
             autoescape_service_method: ~ # use in combination with autoescape_service option
             base_template_class:       ~ # Example: Twig_Template
             cache:                     "%kernel.cache_dir%/twig"
