Merge branch '3.2'

* 3.2:
  [#6937] A few small tweaks!
  Porting #6937 back to 2.7
  Remove yourself word in acl doc page
  %kernel.root_dir%/app/data/data.sqlite -> %kernel.root_dir%/data/data.sqlite
  Fix sample sqlite database path in doctrine config
  Fix sample sqlite database path in doctrine config
  Fixed code example wrong prepend() method declaration

Author: weaverryan

performance.rst

@@ -64,9 +64,6 @@ higher limit with the `opcache.max_accelerated_files`_ configuration option:
     ; php.ini
     opcache.max_accelerated_files = 20000
 
-.. index::
-   single: Performance; Autoloader
-
 Configure the PHP realpath Cache
 --------------------------------
 
@@ -86,6 +83,9 @@ value too using the ``realpath_cache_ttl`` option:
     realpath_cache_size=4096K
     realpath_cache_ttl=600
 
+.. index::
+   single: Performance; Autoloader
+
 Use Composer's Class Map Functionality
 --------------------------------------
 
@@ -105,7 +105,7 @@ in ``vendor/composer/autoload_classmap.php``.
 The class map can be generated from the command line, and might become part of
 your deploy process:
 
-.. code-block:: terminal
+.. code-block:: bash
 
     $ composer dump-autoload --optimize --no-dev --classmap-authoritative
 

reference/configuration/doctrine.rst

@@ -203,7 +203,7 @@ Full Default Configuration
                         password="secret"
                         driver="pdo_mysql"
                         driver-class="MyNamespace\MyDriverImpl"
-                        path="%kernel.data_dir%/data.sqlite"
+                        path="%kernel.root_dir%/../var/data/data.sqlite"
                         memory="true"
                         unix-socket="/tmp/mysql.sock"
                         wrapper-class="MyDoctrineDbalConnectionWrapper"
@@ -395,7 +395,7 @@ The following block shows all possible configuration keys:
                 # the DBAL driverOptions option
                 options:
                     foo: bar
-                path:                 '%kernel.data_dir%/data.sqlite'
+                path:                 '%kernel.root_dir%/data/data.sqlite'
                 memory:               true
                 unix_socket:          /tmp/mysql.sock
                 # the DBAL wrapperClass option
@@ -431,7 +431,7 @@ The following block shows all possible configuration keys:
                     password="secret"
                     driver="pdo_mysql"
                     driver-class="MyNamespace\MyDriverImpl"
-                    path="%kernel.data_dir%/data.sqlite"
+                    path="%kernel.root_dir%/../var/data/data.sqlite"
                     memory="true"
                     unix-socket="/tmp/mysql.sock"
                     wrapper-class="MyDoctrineDbalConnectionWrapper"

security/acl.rst

@@ -22,7 +22,7 @@ the ACL system comes in.
 
 Imagine you are designing a blog system where your users can comment on your
 posts. Now, you want a user to be able to edit their own comments, but not those
-of other users; besides, you yourself want to be able to edit all comments. In
+of other users; besides, you want to be able to edit all comments. In
 this scenario, ``Comment`` would be the domain object that you want to
 restrict access to. You could take several approaches to accomplish this using
 Symfony, two basic approaches are (non-exhaustive):