Merge branch '2.7' into 2.8

_theme/_templates/layout.html

@@ -46,7 +46,7 @@
                 <div id="demo-warning">
                     <h4>Pull request build</h4>
                     <p>Each pull request of the Symfony Documentation is automatically deployed and hosted on <a href="https://platform.sh">Platform.sh</a>.<br>
-                    Visit the page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
+                    View this page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
                 </div>
 
                 {%- include "globaltoc.html" %}

book/installation.rst

@@ -239,7 +239,7 @@ If there are any issues, correct them now before moving on.
         $ rm -rf app/cache/*
         $ rm -rf app/logs/*
 
-        $ HTTPDUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
+        $ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
         $ sudo chmod +a "$HTTPDUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
         $ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
 
@@ -254,7 +254,7 @@ If there are any issues, correct them now before moving on.
 
     .. code-block:: bash
 
-        $ HTTPDUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
+        $ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
         $ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
         $ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:`whoami`:rwX app/cache app/logs
 

cookbook/doctrine/pdo_session_storage.rst

@@ -170,7 +170,7 @@ of your project's data, you can use the connection settings from the
     .. code-block:: xml
 
         <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
-            <argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</agruement>
+            <argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
             <argument type="collection">
                 <argument key="db_username">%database_user%</argument>
                 <argument key="db_password">%database_password%</argument>

cookbook/email/dev_environment.rst

@@ -140,11 +140,11 @@ by adding the ``delivery_whitelist`` option:
             delivery_whitelist:
                # all email addresses matching this regex will *not* be
                # redirected to [email protected]
-               - "/@specialdomain.com$/"
+               - "/@specialdomain\.com$/"
 
                # all emails sent to [email protected] won't
                # be redirected to [email protected] too
-               - "/^[email protected]$/"
+               - "/^admin@mydomain\.com$/"
 
     .. code-block:: xml
 
@@ -156,10 +156,10 @@ by adding the ``delivery_whitelist`` option:
 
         <swiftmailer:config delivery-address="[email protected]">
             <!-- all email addresses matching this regex will *not* be redirected to [email protected] -->
-            <swiftmailer:delivery-whitelist-pattern>/@specialdomain.com$/</swiftmailer:delivery-whitelist-pattern>
+            <swiftmailer:delivery-whitelist-pattern>/@specialdomain\.com$/</swiftmailer:delivery-whitelist-pattern>
 
             <!-- all emails sent to [email protected] won't be redirected to [email protected] too -->
-            <swiftmailer:delivery-whitelist-pattern>/^[email protected]$/</swiftmailer:delivery-whitelist-pattern>
+            <swiftmailer:delivery-whitelist-pattern>/^admin@mydomain\.com$/</swiftmailer:delivery-whitelist-pattern>
         </swiftmailer:config>
 
     .. code-block:: php
@@ -170,11 +170,11 @@ by adding the ``delivery_whitelist`` option:
             'delivery_whitelist' => array(
                 // all email addresses matching this regex will *not* be
                 // redirected to [email protected]
-                '/@specialdomain.com$/',
+                '/@specialdomain\.com$/',
 
                 // all emails sent to [email protected] won't be
                 // redirected to [email protected] too
-                '/^[email protected]$/',
+                '/^admin@mydomain\.com$/',
             ),
         ));
 

cookbook/templating/namespaced_paths.rst

@@ -71,6 +71,13 @@ directory:
             );
         ));
 
+.. caution::
+
+    Prior to 2.8, templates in custom namespaces are not pre-compiled by
+    Symfony's cache warmup process. They are compiled on demand. This may
+    cause problems if two simultaneous requests are trying to use the
+    template for the first time.
+
 The registered namespace is called ``foo_bar``, which refers to the
 ``vendor/acme/foo-bar/templates`` directory. Assuming there's a file
 called ``sidebar.twig`` in that directory, you can use it easily:

cookbook/validation/severity.rst

@@ -38,17 +38,17 @@ Use the ``payload`` option to configure the error level for each constraint:
         class User
         {
             /**
-             * @Assert\NotBlank(payload = {severity = "error"})
+             * @Assert\NotBlank(payload = {"severity" = "error"})
              */
             protected $username;
 
             /**
-             * @Assert\NotBlank(payload = {severity = "error"})
+             * @Assert\NotBlank(payload = {"severity" = "error"})
              */
             protected $password;
 
             /**
-             * @Assert\Iban(payload = {severity = "warning"})
+             * @Assert\Iban(payload = {"severity" = "warning"})
              */
             protected $bankAccountNumber;
         }