Merge branch '2.3' into 2.7

Conflicts:
	reference/constraints/Callback.rst

Author: xabbuh

best_practices/creating-the-project.rst

@@ -33,7 +33,7 @@ to create files and execute the following commands:
 
     # Windows
     c:\> cd projects/
-    c:\projects\> php symfony.phar new blog
+    c:\projects\> php symfony new blog
 
 This command creates a new directory called ``blog`` that contains a fresh new
 project based on the most recent stable Symfony version available. In addition,
@@ -110,10 +110,10 @@ Symfony documentation uses the AppBundle name.
     There is no need to prefix the AppBundle with your own vendor (e.g.
     AcmeAppBundle), because this application bundle is never going to be
     shared.
-    
+
 .. note::
-    
-    Another reason to create a new bundle is when you're overriding something 
+
+    Another reason to create a new bundle is when you're overriding something
     in a vendor's bundle (e.g. a controller). See :doc:`/cookbook/bundles/inheritance`.
 
 All in all, this is the typical directory structure of a Symfony application

book/controller.rst

@@ -655,7 +655,7 @@ and then redirects. The message key (``notice`` in this example) can be anything
 you'll use this key to retrieve the message.
 
 In the template of the next page (or even better, in your base layout template),
-read any flash messages from the session::
+read any flash messages from the session:
 
 .. configuration-block::
 

book/installation.rst

@@ -32,7 +32,7 @@ Open your command console and execute the following commands:
 
 .. code-block:: bash
 
-    $ sudo curl -LsS http://symfony.com/installer -o /usr/local/bin/symfony
+    $ sudo curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony
     $ sudo chmod a+x /usr/local/bin/symfony
 
 This will create a global ``symfony`` command in your system.
@@ -44,7 +44,7 @@ Open your command console and execute the following command:
 
 .. code-block:: bash
 
-    c:\> php -r "readfile('http://symfony.com/installer');" > symfony
+    c:\> php -r "readfile('https://symfony.com/installer');" > symfony
 
 Then, move the downloaded ``symfony`` file to your project's directory and
 execute it as follows:

book/routing.rst

@@ -1555,7 +1555,9 @@ By default, the router will generate relative URLs (e.g. ``/blog``). From
 a controller, simply pass ``true`` to the third argument of the ``generateUrl()``
 method::
 
-    $this->generateUrl('blog_show', array('slug' => 'my-blog-post'), true);
+    use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+    $this->generateUrl('blog_show', array('slug' => 'my-blog-post'), UrlGeneratorInterface::ABSOLUTE_URL);
     // http://www.example.com/blog/my-blog-post
 
 From a template, in Twig, simply use the ``url()`` function (which generates an absolute URL)

cookbook/controller/service.rst

@@ -285,8 +285,7 @@ controller:
         in the :class:`Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface`.
 
 :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getDoctrine` (service: ``doctrine``)
-
-    *Simply inject doctrine instead of fetching it from the container*
+    *Simply inject doctrine instead of fetching it from the container.*
 
 :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getUser` (service: ``security.token_storage``)
     .. code-block:: php

cookbook/security/custom_provider.rst

@@ -324,9 +324,9 @@ options, the password may be encoded multiple times and encoded to base64.
     before comparing it to your encoded password. If ``getSalt()`` returns
     nothing, then the submitted password is simply encoded using the algorithm
     you specify in ``security.yml``. If a salt *is* specified, then the following
-    value is created and *then* hashed via the algorithm:
+    value is created and *then* hashed via the algorithm::
 
-        ``$password.'{'.$salt.'}';``
+        $password.'{'.$salt.'}'
 
     If your external users have their passwords salted via a different method,
     then you'll need to do a bit more work so that Symfony properly encodes

cookbook/upgrade/_update_dep_errors.rst.inc

@@ -4,6 +4,8 @@ Dependency Errors
 If you get a dependency error, it may simply mean that you need to upgrade
 other Symfony dependencies too. In that case, try the following command:
 
+.. code-block:: bash
+
     $ composer update symfony/symfony --with-dependencies
 
 This updates ``symfony/symfony`` and *all* packages that it depends on, which will