Merge branch '2.6' into 2.7

Author: wouterj

contributing/code/security.rst

@@ -103,6 +103,7 @@ Security Advisories
 This section indexes security vulnerabilities that were fixed in Symfony
 releases, starting from Symfony 1.0.0:
 
+* May 26, 2015: `CVE-2015-4050: ESI unauthorized access <http://symfony.com/blog/cve-2015-4050-esi-unauthorized-access>`_ (Symfony 2.3.29, 2.5.12 and 2.6.8)
 * April 1, 2015: `CVE-2015-2309: Unsafe methods in the Request class <http://symfony.com/blog/cve-2015-2309-unsafe-methods-in-the-request-class>`_ (Symfony 2.3.27, 2.5.11 and 2.6.6)
 * April 1, 2015: `CVE-2015-2308: Esi Code Injection <http://symfony.com/blog/cve-2015-2308-esi-code-injection>`_ (Symfony 2.3.27, 2.5.11 and 2.6.6)
 * September 3, 2014: `CVE-2014-6072: CSRF vulnerability in the Web Profiler <http://symfony.com/blog/cve-2014-6072-csrf-vulnerability-in-the-web-profiler>`_ (Symfony 2.3.19, 2.4.9 and 2.5.4)

contributing/documentation/format.rst

@@ -210,7 +210,7 @@ submitting your documentation, follow these steps:
 
 * Install Sphinx_;
 * Install the Sphinx extensions using git submodules: ``$ git submodule update --init``;
-* Run ``make html`` and view the generated HTML in the ``build/`` directory.
+* Run ``make html`` and view the generated HTML in the ``_build/html`` directory.
 
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Sphinx: http://sphinx-doc.org/

cookbook/console/command_in_controller.rst

@@ -45,13 +45,14 @@ Run this command from inside your controller via::
                'command' => 'swiftmailer:spool:send',
                '--message-limit' => $messages,
             ));
-            // our use NullOutput() if you don't need the outpu
+            // You can use NullOutput() if you don't need the output
             $output = new BufferedOutput();
             $application->run($input, $output);
 
-            // return the output
+            // return the output, don't use if you used NullOutput()
             $content = $output->fetch();
-
+            
+            // return new Response(""), if you used NullOutput()
             return new Response($content);
         }
     }

cookbook/deployment/platformsh.rst

@@ -79,7 +79,8 @@ your Git repository which contains the following files:
     # .platform/routes.yaml
     "http://{default}/":
         type: upstream
-        upstream: "php:php"
+        # the first part should be your project name
+        upstream: "myphpproject:php"
 
 .. code-block:: yaml
 
@@ -95,13 +96,13 @@ Configure Database Access
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Platform.sh overrides your database specific configuration via importing the
-following file::
+following file (it's your role to add this file to your code base)::
 
     // app/config/parameters_platform.php
     <?php
     $relationships = getenv("PLATFORM_RELATIONSHIPS");
-        if (!$relationships) {
-            return;
+    if (!$relationships) {
+        return;
     }
 
     $relationships = json_decode(base64_decode($relationships), true);

quick_tour/the_big_picture.rst

@@ -254,7 +254,7 @@ you'll see the following code:
     {% extends 'base.html.twig' %}
 
     {% block body %}
-        <h1>Welcome to Symfony!</h1>
+        Homepage.
     {% endblock %}
 
 This template is created with `Twig`_, a new template engine created for