diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
index 4331d8117a7..a30ba7ef450 100644
--- a/reference/configuration/assetic.rst
+++ b/reference/configuration/assetic.rst
@@ -4,119 +4,8 @@
 AsseticBundle Configuration ("assetic")
 =======================================
 
-.. include:: /assetic/_standard_edition_warning.rst.inc
+.. caution::
 
-Full Default Configuration
---------------------------
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        assetic:
-            debug:                '%kernel.debug%'
-            use_controller:
-                enabled:              '%kernel.debug%'
-                profiler:             false
-            read_from:            '%assetic.read_from%'
-            write_to:             '%kernel.project_dir%/web'
-            java:                 /usr/bin/java
-            node:                 /usr/bin/node
-            ruby:                 /usr/bin/ruby
-            sass:                 /usr/bin/sass
-            # An key-value pair of any number of named elements
-            variables:
-                some_name:                 []
-            bundles:
-
-                # Defaults (all currently registered bundles):
-                - FrameworkBundle
-                - SecurityBundle
-                - TwigBundle
-                - MonologBundle
-                - SwiftmailerBundle
-                - DoctrineBundle
-                - AsseticBundle
-                - ...
-            assets:
-                # An array of named assets (e.g. some_asset, some_other_asset)
-                some_asset:
-                    inputs:               []
-                    filters:              []
-                    options:
-                        # A key-value array of options and values
-                        some_option_name: []
-            filters:
-
-                # An array of named filters (e.g. some_filter, some_other_filter)
-                some_filter:                 []
-            workers:
-                # see https://github.com/symfony/AsseticBundle/pull/119
-                # Cache can also be busted via the framework.assets.version
-                # setting - see the "framework" configuration section
-                cache_busting:
-                    enabled:              false
-            twig:
-                functions:
-                    # An array of named functions (e.g. some_function, some_other_function)
-                    some_function:                 []
-
-    .. code-block:: xml
-
-        <!-- app/config/config.xml -->
-        <?xml version="1.0" encoding="UTF-8"?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:assetic="http://symfony.com/schema/dic/assetic"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services
-                http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/assetic
-                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
-
-            <assetic:config
-                debug="%kernel.debug%"
-                use-controller="%kernel.debug%"
-                read-from="%assetic.read_from%"
-                write-to="%kernel.project_dir%/web"
-                java="/usr/bin/java"
-                node="/usr/bin/node"
-                sass="/usr/bin/sass">
-
-                <!-- Defaults (all currently registered bundles) -->
-                <assetic:bundle>FrameworkBundle</assetic:bundle>
-                <assetic:bundle>SecurityBundle</assetic:bundle>
-                <assetic:bundle>TwigBundle</assetic:bundle>
-                <assetic:bundle>MonologBundle</assetic:bundle>
-                <assetic:bundle>SwiftmailerBundle</assetic:bundle>
-                <assetic:bundle>DoctrineBundle</assetic:bundle>
-                <assetic:bundle>AsseticBundle</assetic:bundle>
-                <assetic:bundle>...</assetic:bundle>
-
-                <assetic:asset>
-                    <!-- prototype -->
-                    <assetic:name>
-                        <assetic:input />
-
-                        <assetic:filter />
-
-                        <assetic:option>
-                            <!-- prototype -->
-                            <assetic:name />
-                        </assetic:option>
-                    </assetic:name>
-                </assetic:asset>
-
-                <assetic:filter>
-                    <!-- prototype -->
-                    <assetic:name />
-                </assetic:filter>
-
-                <assetic:twig>
-                    <assetic:functions>
-                        <!-- prototype -->
-                        <assetic:name />
-                    </assetic:functions>
-                </assetic:twig>
-            </assetic:config>
-        </container>
+    Assetic is no longer recommended to manage web assets in Symfony
+    applications. Instead, use :doc:`Webpack Encore </frontend>`, which bridges
+    Symfony applications with modern JavaScript tools used to manage web assets.
diff --git a/reference/configuration/debug.rst b/reference/configuration/debug.rst
index b9185488a68..3eb822cd62a 100644
--- a/reference/configuration/debug.rst
+++ b/reference/configuration/debug.rst
@@ -64,13 +64,13 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/debug.yaml
         debug:
            dump_destination: php://stderr
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/debug.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/debug"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -84,7 +84,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/debug.php
         $container->loadFromExtension('debug', array(
            'dump_destination' => 'php://stderr',
         ));
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
index d7e32a282a4..5c5ea0c5b48 100644
--- a/reference/configuration/doctrine.rst
+++ b/reference/configuration/doctrine.rst
@@ -12,7 +12,7 @@ Full Default Configuration
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/doctrine.yaml
         doctrine:
             dbal:
                 default_connection:   default
@@ -20,9 +20,9 @@ Full Default Configuration
                     # A collection of custom types
                     # Example
                     some_custom_type:
-                        class:                Acme\HelloBundle\MyCustomType
+                        class:                App\DBAL\MyCustomType
                         commented:            true
-                
+
 
                 connections:
                     # A collection of different named connections (e.g. default, conn2, etc)
@@ -75,11 +75,11 @@ Full Default Configuration
                         mapping_types:
                             # an array of mapping types
                             name:                 []
-                            
+
                         # If defined, only the tables whose names match this regular expression are managed
                         # by the schema tool (in this example, any table name not starting with `wp_`)
                         #schema_filter:               '/^(?!wp_)/'
-                        
+
                         slaves:
 
                             # a collection of named slave connections (e.g. slave1, slave2)
@@ -163,17 +163,17 @@ Full Default Configuration
                             # a collection of string functions
                             string_functions:
                                 # example
-                                # test_string: Acme\HelloBundle\DQL\StringFunction
+                                # test_string: App\DQL\StringFunction
 
                             # a collection of numeric functions
                             numeric_functions:
                                 # example
-                                # test_numeric: Acme\HelloBundle\DQL\NumericFunction
+                                # test_numeric: App\DQL\NumericFunction
 
                             # a collection of datetime functions
                             datetime_functions:
                                 # example
-                                # test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
+                                # test_datetime: App\DQL\DatetimeFunction
 
                         # Register SQL Filters in the entity manager
                         filters:
@@ -184,7 +184,7 @@ Full Default Configuration
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/doctrine.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -204,14 +204,14 @@ Full Default Configuration
                         user="user"
                         password="secret"
                         driver="pdo_mysql"
-                        driver-class="MyNamespace\MyDriverImpl"
+                        driver-class="App\DBAL\MyDatabaseDriver"
                         path="%kernel.project_dir%/var/data/data.sqlite"
                         memory="true"
                         unix-socket="/tmp/mysql.sock"
-                        wrapper-class="MyDoctrineDbalConnectionWrapper"
+                        wrapper-class="App\DBAL\MyConnectionWrapper"
                         charset="UTF8"
                         logging="%kernel.debug%"
-                        platform-service="MyOwnDatabasePlatformService"
+                        platform-service="App\DBAL\MyDatabasePlatformService"
                         server-version="5.6"
                         keep-slave="false"
                     >
@@ -219,7 +219,7 @@ Full Default Configuration
                         <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
                     </doctrine:connection>
                     <doctrine:connection name="conn1" />
-                    <doctrine:type name="custom">Acme\HelloBundle\MyCustomType</doctrine:type>
+                    <doctrine:type name="custom">App\DBAL\MyCustomType</doctrine:type>
                 </doctrine:dbal>
 
                 <doctrine:orm
@@ -247,15 +247,15 @@ Full Default Configuration
 
                         <doctrine:dql>
                             <doctrine:string-function name="test_string">
-                                Acme\HelloBundle\DQL\StringFunction
+                                App\DQL\StringFunction
                             </doctrine:string-function>
 
                             <doctrine:numeric-function name="test_numeric">
-                                Acme\HelloBundle\DQL\NumericFunction
+                                App\DQL\NumericFunction
                             </doctrine:numeric-function>
 
                             <doctrine:datetime-function name="test_datetime">
-                                Acme\HelloBundle\DQL\DatetimeFunction
+                                App\DQL\DatetimeFunction
                             </doctrine:datetime-function>
                         </doctrine:dql>
                     </doctrine:entity-manager>
@@ -301,7 +301,7 @@ The following block shows all possible configuration keys:
                 password:             secret
                 driver:               pdo_mysql
                 # the DBAL driverClass option
-                driver_class:         MyNamespace\MyDriverImpl
+                driver_class:         App\DBAL\MyDatabaseDriver
                 # the DBAL driverOptions option
                 options:
                     foo: bar
@@ -309,15 +309,15 @@ The following block shows all possible configuration keys:
                 memory:               true
                 unix_socket:          /tmp/mysql.sock
                 # the DBAL wrapperClass option
-                wrapper_class:        MyDoctrineDbalConnectionWrapper
+                wrapper_class:        App\DBAL\MyConnectionWrapper
                 charset:              UTF8
                 logging:              '%kernel.debug%'
-                platform_service:     MyOwnDatabasePlatformService
+                platform_service:     App\DBAL\MyDatabasePlatformService
                 server_version:       5.6
                 mapping_types:
                     enum: string
                 types:
-                    custom: Acme\HelloBundle\MyCustomType
+                    custom: App\DBAL\MyCustomType
 
     .. code-block:: xml
 
@@ -339,19 +339,19 @@ The following block shows all possible configuration keys:
                     user="user"
                     password="secret"
                     driver="pdo_mysql"
-                    driver-class="MyNamespace\MyDriverImpl"
+                    driver-class="App\DBAL\MyDatabaseDriver"
                     path="%kernel.project_dir%/var/data/data.sqlite"
                     memory="true"
                     unix-socket="/tmp/mysql.sock"
-                    wrapper-class="MyDoctrineDbalConnectionWrapper"
+                    wrapper-class="App\DBAL\MyConnectionWrapper"
                     charset="UTF8"
                     logging="%kernel.debug%"
-                    platform-service="MyOwnDatabasePlatformService"
+                    platform-service="App\DBAL\MyDatabasePlatformService"
                     server-version="5.6">
 
                     <doctrine:option key="foo">bar</doctrine:option>
                     <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
-                    <doctrine:type name="custom">Acme\HelloBundle\MyCustomType</doctrine:type>
+                    <doctrine:type name="custom">App\DBAL\MyCustomType</doctrine:type>
                 </doctrine:dbal>
             </doctrine:config>
         </container>
@@ -480,7 +480,7 @@ The following example shows an overview of the caching configurations:
             # the 'service' type requires to define the 'id' option too
             query_cache_driver:
                 type: service
-                id: my_doctrine_common_cache_service
+                id: App\ORM\MyCacheService
 
 Mapping Configuration
 ~~~~~~~~~~~~~~~~~~~~~
@@ -492,42 +492,35 @@ you can control. The following configuration options exist for a mapping:
 type
 ....
 
-One of ``annotation``, ``xml``, ``yml``, ``php`` or ``staticphp``. This
-specifies which type of metadata type your mapping uses.
+One of ``annotation`` (the default value), ``xml``, ``yml``, ``php`` or
+``staticphp``. This specifies which type of metadata type your mapping uses.
 
 dir
 ...
 
-Path to the mapping or entity files (depending on the driver). If this path
-is relative it is assumed to be relative to the bundle root. This only works
-if the name of your mapping is a bundle name. If you want to use this option
-to specify absolute paths you should prefix the path with the kernel parameters
-that exist in the DIC (for example ``%kernel.project_dir%``).
+Absolute path to the mapping or entity files (depending on the driver). The
+default value is ``%kernel.project_dir%/src/Entity/``.
 
 prefix
 ......
 
-A common namespace prefix that all entities of this mapping share. This
-prefix should never conflict with prefixes of other defined mappings otherwise
-some of your entities cannot be found by Doctrine. This option defaults
-to the bundle namespace + ``Entity``, for example for an application bundle
-called AcmeHelloBundle prefix would be ``Acme\HelloBundle\Entity``.
+A common namespace prefix that all entities of this mapping share. This prefix
+should never conflict with prefixes of other defined mappings otherwise some of
+your entities cannot be found by Doctrine. This option defaults to
+``App\Entity`` because it's recommended to store the entities in ``src/Entity/``.
 
 alias
 .....
 
 Doctrine offers a way to alias entity namespaces to simpler, shorter names
-to be used in DQL queries or for Repository access. When using a bundle
-the alias defaults to the bundle name.
+to be used in DQL queries or for Repository access. It's default value is ``App``.
 
 is_bundle
 .........
 
-This option is a derived value from ``dir`` and by default is set to ``true``
-if dir is relative proved by a ``file_exists()`` check that returns ``false``.
-It is ``false`` if the existence check returns ``true``. In this case an
-absolute path was specified and the metadata files are most likely in a
-directory outside of a bundle.
+This option is ``false`` by default and it's considered a legacy option. It was
+only useful in previous Symfony versions, when it was recommended to use bundles
+to organize the application code.
 
 Custom Mapping Entities in a Bundle
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -593,9 +586,7 @@ directory instead:
 Mapping Entities Outside of a Bundle
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can also create new mappings, for example outside of the Symfony folder.
-
-For example, the following looks for entity classes in the ``App\Entity``
+For example, the following looks for entity classes in the ``Entity``
 namespace in the ``src/Entity`` directory and gives them an ``App`` alias
 (so you can say things like ``App:Post``):
 
@@ -662,7 +653,7 @@ If the ``type`` on the bundle configuration isn't set, the DoctrineBundle
 will try to detect the correct mapping configuration format for the bundle.
 
 DoctrineBundle will look for files matching ``*.orm.[FORMAT]`` (e.g.
-``Post.orm.yml``) in the configured ``dir`` of your mapping (if you're mapping
+``Post.orm.yaml``) in the configured ``dir`` of your mapping (if you're mapping
 a bundle, then ``dir`` is relative to the bundle's directory).
 
 The bundle looks for (in this order) XML, YAML and PHP files.
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index 374edd23263..58602365003 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -180,7 +180,7 @@ named ``kernel.http_method_override``.
     To fix this, invoke the ``enableHttpMethodParameterOverride()`` method
     before creating the ``Request`` object::
 
-        // web/app.php
+        // public/index.php
 
         // ...
         $kernel = new AppCache($kernel);
@@ -220,13 +220,13 @@ doubling them to prevent Symfony from interpreting them as container parameters)
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             ide: 'myide://open?url=file://%%f&line=%%l'
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -240,7 +240,7 @@ doubling them to prevent Symfony from interpreting them as container parameters)
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'ide' => 'myide://open?url=file://%%f&line=%%l',
         ));
@@ -283,7 +283,7 @@ test
 If this configuration setting is present (and not ``false``), then the services
 related to testing your application (e.g. ``test.client``) are loaded. This
 setting should be present in your ``test`` environment (usually via
-``app/config/config_test.yml``).
+``config/packages/test/framework.yaml``).
 
 .. seealso::
 
@@ -334,13 +334,13 @@ respond and the user will receive a 400 response.
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             trusted_hosts:  ['example.com', 'example.org']
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -358,7 +358,7 @@ respond and the user will receive a 400 response.
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'trusted_hosts' => array('example.com', 'example.org'),
         ));
@@ -369,7 +369,7 @@ which make it easier to respond to any subdomain.
 In addition, you can also set the trusted hosts in the front controller
 using the ``Request::setTrustedHosts()`` method::
 
-    // web/app.php
+    // public/index.php
     Request::setTrustedHosts(array('^(.+\.)?example.com$', '^(.+\.)?example.org$'));
 
 The default value for this option is an empty array, meaning that the application
@@ -450,13 +450,13 @@ You can also set ``esi`` to ``true`` to enable it:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             esi: true
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -472,7 +472,7 @@ You can also set ``esi`` to ``true`` to enable it:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'esi' => true,
         ));
@@ -592,7 +592,7 @@ To configure a ``jsonp`` format:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             request:
                 formats:
@@ -600,7 +600,7 @@ To configure a ``jsonp`` format:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
 
         <container xmlns="http://symfony.com/schema/dic/services"
@@ -622,7 +622,7 @@ To configure a ``jsonp`` format:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'request' => array(
                 'formats' => array(
@@ -824,14 +824,14 @@ setting the value to ``null``:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             session:
                 save_path: ~
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -847,7 +847,7 @@ setting the value to ``null``:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'session' => array(
                 'save_path' => null,
@@ -883,7 +883,7 @@ This option allows you to define a base path to be used for assets:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             # ...
             assets:
@@ -891,7 +891,7 @@ This option allows you to define a base path to be used for assets:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -907,7 +907,7 @@ This option allows you to define a base path to be used for assets:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             // ...
             'assets' => array(
@@ -931,7 +931,7 @@ collection each time it generates an asset's path:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             # ...
             assets:
@@ -940,7 +940,7 @@ collection each time it generates an asset's path:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -956,7 +956,7 @@ collection each time it generates an asset's path:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             // ...
             'assets' => array(
@@ -975,7 +975,7 @@ You can group assets into packages, to specify different base URLs for them:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             # ...
             assets:
@@ -985,7 +985,7 @@ You can group assets into packages, to specify different base URLs for them:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1005,7 +1005,7 @@ You can group assets into packages, to specify different base URLs for them:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             // ...
             'assets' => array(
@@ -1070,7 +1070,7 @@ Now, activate the ``version`` option:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             # ...
             assets:
@@ -1078,7 +1078,7 @@ Now, activate the ``version`` option:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1094,7 +1094,7 @@ Now, activate the ``version`` option:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             // ...
             'assets' => array(
@@ -1175,7 +1175,7 @@ individually for each asset package:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
        framework:
             assets:
                 # this strategy is applied to every asset (including packages)
@@ -1193,7 +1193,7 @@ individually for each asset package:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1221,7 +1221,7 @@ individually for each asset package:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'assets' => array(
                 'version_strategy' => 'app.asset.my_versioning_strategy',
@@ -1273,7 +1273,7 @@ package:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
        framework:
             assets:
                 # this manifest is applied to every asset (including packages)
@@ -1288,7 +1288,7 @@ package:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1313,7 +1313,7 @@ package:
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'assets' => array(
                 // this manifest is applied to every asset (including packages)
@@ -1371,23 +1371,23 @@ A list of all resources for form theming in PHP. This setting is not required
 if you're using the Twig format for your templates, in that case refer to
 :ref:`the form article <forms-theming-twig>`.
 
-Assume you have custom global form themes in
-``src/WebsiteBundle/Resources/views/Form``, you can configure this like:
+Assume you have custom global form themes in ``templates/form_themes/``, you can
+configure this like:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             templating:
                 form:
                     resources:
-                        - 'WebsiteBundle:Form'
+                        - 'form_themes'
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -1397,28 +1397,22 @@ Assume you have custom global form themes in
                 http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-
                 <framework:templating>
-
                     <framework:form>
-
-                        <framework:resource>WebsiteBundle:Form</framework:resource>
-
+                        <framework:resource>form_themes</framework:resource>
                     </framework:form>
-
                 </framework:templating>
-
             </framework:config>
         </container>
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'templating' => array(
                 'form' => array(
                     'resources' => array(
-                        'WebsiteBundle:Form'
+                        'form_themes'
                     ),
                 ),
             ),
diff --git a/reference/configuration/kernel.rst b/reference/configuration/kernel.rst
index 63d4ee42af6..3a1adc0c594 100644
--- a/reference/configuration/kernel.rst
+++ b/reference/configuration/kernel.rst
@@ -1,11 +1,11 @@
 .. index::
     single: Configuration reference; Kernel class
 
-Configuring in the Kernel (e.g. AppKernel)
-==========================================
+Configuring in the Kernel
+=========================
 
-Some configuration can be done on the kernel class itself (usually called
-``app/AppKernel.php``). You can do this by overriding specific methods in
+Some configuration can be done on the kernel class itself (located by default at
+``src/Kernel.php``). You can do this by overriding specific methods in
 the parent :class:`Symfony\\Component\\HttpKernel\\Kernel` class.
 
 Configuration
@@ -26,10 +26,11 @@ This returns the charset that is used in the application. To change it,
 override the :method:`Symfony\\Component\\HttpKernel\\Kernel::getCharset`
 method and return another charset, for instance::
 
-    // app/AppKernel.php
-
+    // src/Kernel.php
+    use Symfony\Component\HttpKernel\Kernel as BaseKernel;
     // ...
-    class AppKernel extends Kernel
+
+    class Kernel extends BaseKernel
     {
         public function getCharset()
         {
@@ -40,18 +41,17 @@ method and return another charset, for instance::
 Kernel Name
 ~~~~~~~~~~~
 
-**type**: ``string`` **default**: ``app`` (i.e. the directory name holding
+**type**: ``string`` **default**: ``src`` (i.e. the directory name holding
 the kernel class)
 
 To change this setting, override the :method:`Symfony\\Component\\HttpKernel\\Kernel::getName`
 method. Alternatively, move your kernel into a different directory. For
-example, if you moved the kernel into a ``foo`` directory (instead of ``app``),
+example, if you moved the kernel into a ``foo/`` directory (instead of ``src/``),
 the kernel name will be ``foo``.
 
 The name of the kernel isn't usually directly important - it's used in the
-generation of cache files. If you have an application with multiple kernels,
-the easiest way to make each have a unique name is to duplicate the ``app``
-directory and rename it to something else (e.g. ``foo``).
+generation of cache files - and you probably will only change it when
+:doc:`using applications with multiple kernels </configuration/multiple_kernels>`.
 
 Project Directory
 ~~~~~~~~~~~~~~~~~
@@ -65,10 +65,11 @@ If for some reason the ``composer.json`` file is not stored at the root of your
 project, you can override the :method:`Symfony\\Component\\HttpKernel\\Kernel::getProjectDir`
 method to return the right project directory::
 
-    // app/AppKernel.php
-
+    // src/Kernel.php
+    use Symfony\Component\HttpKernel\Kernel as BaseKernel;
     // ...
-    class AppKernel extends Kernel
+
+    class Kernel extends BaseKernel
     {
         // ...
 
diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
index a067d95bc10..c2db56b574d 100644
--- a/reference/configuration/monolog.rst
+++ b/reference/configuration/monolog.rst
@@ -14,7 +14,7 @@ Full Default Configuration
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/monolog.yaml
         monolog:
             handlers:
 
@@ -77,7 +77,7 @@ Full Default Configuration
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/monolog.xml -->
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:monolog="http://symfony.com/schema/dic/monolog"
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index b533460fd94..e4ceb9b31c8 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -17,7 +17,7 @@ Each part will be explained in the next section.
 
     .. code-block:: yaml
 
-        # app/config/security.yml
+        # config/packages/security.yaml
         security:
             access_denied_url:    ~ # Example: /foo/error403
 
@@ -33,15 +33,15 @@ Each part will be explained in the next section.
 
             encoders:
                 # Examples:
-                Acme\DemoBundle\Entity\User1: sha512
-                Acme\DemoBundle\Entity\User2:
+                App\Entity\User1: sha512
+                App\Entity\User2:
                     algorithm:           sha512
                     encode_as_base64:    true
                     iterations:          5000
 
                 # PBKDF2 encoder
                 # see the note about PBKDF2 below for details on security and speed
-                Acme\Your\Class\Name:
+                App\Entity\User3:
                     algorithm:            pbkdf2
                     hash_algorithm:       sha512
                     encode_as_base64:     true
@@ -49,18 +49,18 @@ Each part will be explained in the next section.
                     key_length:           40
 
                 # Example options/values for what a custom encoder might look like
-                Acme\DemoBundle\Entity\User3:
-                    id:                   my.encoder.id
+                App\Entity\User4:
+                    id:                   App\Security\MyPasswordEncoder
 
                 # BCrypt encoder
                 # see the note about bcrypt below for details on specific dependencies
-                Acme\DemoBundle\Entity\User4:
+                App\Entity\User5:
                     algorithm:            bcrypt
                     cost:                 13
 
                 # Plaintext encoder
                 # it does not do any encoding
-                Acme\DemoBundle\Entity\User5:
+                App\Entity\User6:
                     algorithm:            plaintext
                     ignore_case:          false
 
@@ -78,7 +78,7 @@ Each part will be explained in the next section.
 
                 my_entity_provider:
                     entity:
-                        class:              SecurityBundle:User
+                        class:              App\Entity\User7
                         property:           username
                         # name of a non-default entity manager
                         manager_name:       ~
@@ -489,7 +489,7 @@ providers (``form_login_ldap`` or ``http_basic_ldap``).
 
     .. code-block:: yaml
 
-        # app/config/security.yml
+        # config/packages/security.yaml
         security:
             # ...
 
@@ -529,7 +529,7 @@ Using the BCrypt Password Encoder
 
     .. code-block:: yaml
 
-        # app/config/security.yml
+        # config/packages/security.yaml
         security:
             # ...
 
@@ -616,7 +616,7 @@ multiple firewalls, the "context" could actually be shared:
 
     .. code-block:: yaml
 
-        # app/config/security.yml
+        # config/packages/security.yaml
         security:
             # ...
 
@@ -630,7 +630,7 @@ multiple firewalls, the "context" could actually be shared:
 
     .. code-block:: xml
 
-        <!-- app/config/security.xml -->
+        <!-- config/packages/security.xml -->
         <?xml version="1.0" charset="UTF-8" ?>
         <srv:container xmlns="http://symfony.com/schema/dic/security"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -650,7 +650,7 @@ multiple firewalls, the "context" could actually be shared:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'somename' => array(
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
index 2bf47c40859..a1b06c2af80 100644
--- a/reference/configuration/swiftmailer.rst
+++ b/reference/configuration/swiftmailer.rst
@@ -193,10 +193,11 @@ delivery_addresses
 
     In previous versions, this option was called ``delivery_address``.
 
-If set, all email messages will be sent to these addresses instead of being
-sent to their actual recipients. This is often useful when developing. For
-example, by setting this in the ``config_dev.yml`` file, you can guarantee
-that all emails sent during development go to one or more some specific accounts.
+If set, all email messages will be sent to these addresses instead of being sent
+to their actual recipients. This is often useful when developing. For example,
+by setting this in the ``config/packages/dev/swiftmailer.yaml`` file, you can
+guarantee that all emails sent during development go to one or more some
+specific accounts.
 
 This uses ``Swift_Plugins_RedirectingPlugin``. Original recipients are available
 on the ``X-Swift-To``, ``X-Swift-Cc`` and ``X-Swift-Bcc`` headers.
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
index c5c2a0acf54..5f132fcdbc7 100644
--- a/reference/configuration/twig.rst
+++ b/reference/configuration/twig.rst
@@ -8,7 +8,7 @@ TwigBundle Configuration ("twig")
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/twig.yaml
         twig:
             exception_controller:  twig.controller.exception:showAction
 
@@ -70,7 +70,7 @@ TwigBundle Configuration ("twig")
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/twig.xml -->
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -106,7 +106,7 @@ TwigBundle Configuration ("twig")
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/twig.php
         $container->loadFromExtension('twig', array(
             'form_themes' => array(
                 'form_div_layout.html.twig', // Default
@@ -365,7 +365,7 @@ The values of the ``paths`` option are defined as ``key: value`` pairs where the
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/twig.yaml
         twig:
             # ...
             paths:
@@ -373,7 +373,7 @@ The values of the ``paths`` option are defined as ``key: value`` pairs where the
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/twig.xml -->
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:twig="http://symfony.com/schema/dic/twig"
@@ -389,7 +389,7 @@ The values of the ``paths`` option are defined as ``key: value`` pairs where the
 
     .. code-block:: php
 
-        // app/config/config.php
+        // config/packages/twig.php
         $container->loadFromExtension('twig', array(
             // ...
             'paths' => array(
@@ -409,7 +409,7 @@ for that directory:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/twig.yaml
         twig:
             # ...
             paths:
@@ -417,7 +417,7 @@ for that directory:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/twig.xml -->
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:twig="http://symfony.com/schema/dic/twig"
@@ -433,7 +433,7 @@ for that directory:
 
     .. code-block:: php
 
-        # app/config/config.php
+        # config/packages/twig.php
         $container->loadFromExtension('twig', array(
             // ...
             'paths' => array(
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
index 2943b476cb6..0c1dfe492d0 100644
--- a/reference/configuration/web_profiler.rst
+++ b/reference/configuration/web_profiler.rst
@@ -58,7 +58,7 @@ Full Default Configuration
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/dev/web_profiler.yaml
         web_profiler:
             toolbar:              false
             intercept_redirects:  false
@@ -66,7 +66,7 @@ Full Default Configuration
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/packages/dev/web_profiler.xml -->
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst
index 1b1fc3020ab..7680218a9d8 100644
--- a/reference/constraints/All.rst
+++ b/reference/constraints/All.rst
@@ -43,7 +43,7 @@ entry in that array:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\User:
             properties:
                 favoriteColors:
diff --git a/reference/constraints/Bic.rst b/reference/constraints/Bic.rst
index 8d9a7f46433..9d394c32760 100644
--- a/reference/constraints/Bic.rst
+++ b/reference/constraints/Bic.rst
@@ -41,7 +41,7 @@ will contain a Business Identifier Code (BIC).
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Transaction:
             properties:
                 businessIdentifierCode:
diff --git a/reference/constraints/Blank.rst b/reference/constraints/Blank.rst
index c32fa1b8e84..c5523681d80 100644
--- a/reference/constraints/Blank.rst
+++ b/reference/constraints/Blank.rst
@@ -50,7 +50,7 @@ of an ``Author`` class were blank, you could do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
diff --git a/reference/constraints/Callback.rst b/reference/constraints/Callback.rst
index a070c77223f..9f5a1858541 100644
--- a/reference/constraints/Callback.rst
+++ b/reference/constraints/Callback.rst
@@ -54,7 +54,7 @@ Configuration
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             constraints:
                 - Callback: validate
@@ -177,7 +177,7 @@ You can then use the following configuration to invoke this validator:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             constraints:
                 - Callback: [Acme\Validator, validate]
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
index 9e9e846e180..d5bdce7f7ef 100644
--- a/reference/constraints/CardScheme.rst
+++ b/reference/constraints/CardScheme.rst
@@ -45,7 +45,7 @@ on an object that will contain a credit card number.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Transaction:
             properties:
                 cardNumber:
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
index 777b174fb80..5e41f71abae 100644
--- a/reference/constraints/Choice.rst
+++ b/reference/constraints/Choice.rst
@@ -59,7 +59,7 @@ If your valid choice list is simple, you can pass them in directly via the
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 city:
@@ -166,7 +166,7 @@ constraint.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 genre:
@@ -231,7 +231,7 @@ you can pass the class name and the method as an array.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 genre:
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
index 102d73ab229..8fd7db0d099 100644
--- a/reference/constraints/Collection.rst
+++ b/reference/constraints/Collection.rst
@@ -87,7 +87,7 @@ following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 profileData:
@@ -212,7 +212,7 @@ you can do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 profile_data:
diff --git a/reference/constraints/Count.rst b/reference/constraints/Count.rst
index a6b2b150829..e28ebed4329 100644
--- a/reference/constraints/Count.rst
+++ b/reference/constraints/Count.rst
@@ -49,7 +49,7 @@ you might add the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Participant:
             properties:
                 emails:
diff --git a/reference/constraints/Country.rst b/reference/constraints/Country.rst
index 900dc2b3c76..fc0fcbaffcf 100644
--- a/reference/constraints/Country.rst
+++ b/reference/constraints/Country.rst
@@ -36,7 +36,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\User:
             properties:
                 country:
diff --git a/reference/constraints/Currency.rst b/reference/constraints/Currency.rst
index cfbe089a0b2..8f033b20b72 100644
--- a/reference/constraints/Currency.rst
+++ b/reference/constraints/Currency.rst
@@ -39,7 +39,7 @@ a valid currency, you could do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 currency:
diff --git a/reference/constraints/Date.rst b/reference/constraints/Date.rst
index 04df3a5e543..a84231100bd 100644
--- a/reference/constraints/Date.rst
+++ b/reference/constraints/Date.rst
@@ -38,7 +38,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 birthday:
diff --git a/reference/constraints/DateTime.rst b/reference/constraints/DateTime.rst
index 9313ae2873a..436150715f7 100644
--- a/reference/constraints/DateTime.rst
+++ b/reference/constraints/DateTime.rst
@@ -39,7 +39,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 createdAt:
diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst
index 1d1ecfa8183..66a08e5e960 100644
--- a/reference/constraints/Email.rst
+++ b/reference/constraints/Email.rst
@@ -43,7 +43,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 email:
diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst
index 04b061b8ead..ada57f58e4b 100644
--- a/reference/constraints/EqualTo.rst
+++ b/reference/constraints/EqualTo.rst
@@ -55,7 +55,7 @@ and that the ``age`` is ``20``, you could do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 firstName:
diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
index 078760c0961..12e4f8b85a5 100644
--- a/reference/constraints/Expression.rst
+++ b/reference/constraints/Expression.rst
@@ -62,7 +62,7 @@ One way to accomplish this is with the Expression constraint:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Model\BlogPost:
             constraints:
                 - Expression:
@@ -143,7 +143,7 @@ more about the expression language syntax, see
 
         .. code-block:: yaml
 
-            # src/Resources/config/validation.yml
+            # src/Resources/config/validation.yaml
             App\Model\BlogPost:
                 properties:
                     isTechnicalPost:
diff --git a/reference/constraints/File.rst b/reference/constraints/File.rst
index c31a4a35ceb..0fab6eccea1 100644
--- a/reference/constraints/File.rst
+++ b/reference/constraints/File.rst
@@ -92,7 +92,7 @@ below a certain file size and a valid PDF, add the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioFile:
diff --git a/reference/constraints/GreaterThan.rst b/reference/constraints/GreaterThan.rst
index 92f52fca5e5..14b466f4280 100644
--- a/reference/constraints/GreaterThan.rst
+++ b/reference/constraints/GreaterThan.rst
@@ -54,7 +54,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 siblings:
@@ -131,7 +131,7 @@ that a date must at least be the next day:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
@@ -190,7 +190,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
@@ -250,7 +250,7 @@ current time:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
diff --git a/reference/constraints/GreaterThanOrEqual.rst b/reference/constraints/GreaterThanOrEqual.rst
index cc7bd52a24e..a1672b79d71 100644
--- a/reference/constraints/GreaterThanOrEqual.rst
+++ b/reference/constraints/GreaterThanOrEqual.rst
@@ -52,7 +52,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 siblings:
@@ -129,7 +129,7 @@ that a date must at least be the current day:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
@@ -188,7 +188,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
@@ -248,7 +248,7 @@ current time:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
diff --git a/reference/constraints/Iban.rst b/reference/constraints/Iban.rst
index 543e938d3d6..4c0a184abb0 100644
--- a/reference/constraints/Iban.rst
+++ b/reference/constraints/Iban.rst
@@ -44,7 +44,7 @@ will contain an International Bank Account Number.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Transaction:
             properties:
                 bankAccountNumber:
diff --git a/reference/constraints/IdenticalTo.rst b/reference/constraints/IdenticalTo.rst
index b1f7d9db85d..436f5ce2a1c 100644
--- a/reference/constraints/IdenticalTo.rst
+++ b/reference/constraints/IdenticalTo.rst
@@ -58,7 +58,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 age:
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
index 5fe3c57c3a2..2fbae8e32ea 100644
--- a/reference/constraints/Image.rst
+++ b/reference/constraints/Image.rst
@@ -100,7 +100,7 @@ that it is between a certain size, add the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 headshot:
@@ -180,7 +180,7 @@ following code:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 headshot:
diff --git a/reference/constraints/Ip.rst b/reference/constraints/Ip.rst
index 1dfd168f4ed..ffd2057cdf3 100644
--- a/reference/constraints/Ip.rst
+++ b/reference/constraints/Ip.rst
@@ -39,7 +39,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 ipAddress:
diff --git a/reference/constraints/IsFalse.rst b/reference/constraints/IsFalse.rst
index bc8c83d0737..482b8c3aaaa 100644
--- a/reference/constraints/IsFalse.rst
+++ b/reference/constraints/IsFalse.rst
@@ -62,7 +62,7 @@ method returns **false**:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             getters:
                 stateInvalid:
diff --git a/reference/constraints/IsNull.rst b/reference/constraints/IsNull.rst
index 6fb0de0a26b..510570cf283 100644
--- a/reference/constraints/IsNull.rst
+++ b/reference/constraints/IsNull.rst
@@ -43,7 +43,7 @@ of an ``Author`` class exactly equal to ``null``, you could do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
diff --git a/reference/constraints/IsTrue.rst b/reference/constraints/IsTrue.rst
index 39ecf99727b..7e9cc2c71e8 100644
--- a/reference/constraints/IsTrue.rst
+++ b/reference/constraints/IsTrue.rst
@@ -65,7 +65,7 @@ Then you can constrain this method with ``IsTrue``.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             getters:
                 tokenValid:
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
index 1f92c7abc5b..fef6349cbda 100644
--- a/reference/constraints/Isbn.rst
+++ b/reference/constraints/Isbn.rst
@@ -47,7 +47,7 @@ on an object that will contain an ISBN.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Book:
             properties:
                 isbn:
diff --git a/reference/constraints/Issn.rst b/reference/constraints/Issn.rst
index 691ac10128a..2d0346cac15 100644
--- a/reference/constraints/Issn.rst
+++ b/reference/constraints/Issn.rst
@@ -39,7 +39,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Journal:
             properties:
                 issn:
diff --git a/reference/constraints/Language.rst b/reference/constraints/Language.rst
index 4900ac16478..e6a03bfbf4c 100644
--- a/reference/constraints/Language.rst
+++ b/reference/constraints/Language.rst
@@ -37,7 +37,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\User:
             properties:
                 preferredLanguage:
diff --git a/reference/constraints/Length.rst b/reference/constraints/Length.rst
index 1502cd6a9be..c962e31e0cd 100644
--- a/reference/constraints/Length.rst
+++ b/reference/constraints/Length.rst
@@ -55,7 +55,7 @@ and "50", you might add the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Participant:
             properties:
                 firstName:
diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst
index d6a727410e2..2e6bde72296 100644
--- a/reference/constraints/LessThan.rst
+++ b/reference/constraints/LessThan.rst
@@ -54,7 +54,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 siblings:
@@ -131,7 +131,7 @@ that a date must be in the past like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 dateOfBirth:
@@ -190,7 +190,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 dateOfBirth:
@@ -249,7 +249,7 @@ can check that a person must be at least 18 years old like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 dateOfBirth:
diff --git a/reference/constraints/LessThanOrEqual.rst b/reference/constraints/LessThanOrEqual.rst
index d9a834059cb..b8e774f6bab 100644
--- a/reference/constraints/LessThanOrEqual.rst
+++ b/reference/constraints/LessThanOrEqual.rst
@@ -52,7 +52,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 siblings:
@@ -129,7 +129,7 @@ that a date must be today or in the past like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 age:
@@ -188,7 +188,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 age:
@@ -247,7 +247,7 @@ can check that a person must be at least 18 years old like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 age:
diff --git a/reference/constraints/Locale.rst b/reference/constraints/Locale.rst
index 5d9e4142918..7bdc17df986 100644
--- a/reference/constraints/Locale.rst
+++ b/reference/constraints/Locale.rst
@@ -41,7 +41,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\User:
             properties:
                 locale:
diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst
index 591c04e2288..0d35acd6587 100644
--- a/reference/constraints/Luhn.rst
+++ b/reference/constraints/Luhn.rst
@@ -41,7 +41,7 @@ will contain a credit card number.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Transaction:
             properties:
                 cardNumber:
diff --git a/reference/constraints/NotBlank.rst b/reference/constraints/NotBlank.rst
index 7b79a52dc62..52d4946034d 100644
--- a/reference/constraints/NotBlank.rst
+++ b/reference/constraints/NotBlank.rst
@@ -47,7 +47,7 @@ class were not blank, you could do the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst
index 13f9bd9c963..16074193fba 100644
--- a/reference/constraints/NotEqualTo.rst
+++ b/reference/constraints/NotEqualTo.rst
@@ -57,7 +57,7 @@ the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 firstName:
diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst
index 198c3e80826..e0dfa0fb320 100644
--- a/reference/constraints/NotIdenticalTo.rst
+++ b/reference/constraints/NotIdenticalTo.rst
@@ -58,7 +58,7 @@ The following constraints ensure that:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Person:
             properties:
                 firstName:
diff --git a/reference/constraints/NotNull.rst b/reference/constraints/NotNull.rst
index fcca2d41284..fd26c1966f0 100644
--- a/reference/constraints/NotNull.rst
+++ b/reference/constraints/NotNull.rst
@@ -41,7 +41,7 @@ class were not strictly equal to ``null``, you would:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst
index 6e3ce710240..bfb7ea657c0 100644
--- a/reference/constraints/Range.rst
+++ b/reference/constraints/Range.rst
@@ -48,7 +48,7 @@ you might add the following:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Participant:
             properties:
                 height:
@@ -129,7 +129,7 @@ date must lie within the current year like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Event:
             properties:
                 startDate:
@@ -199,7 +199,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Event:
             properties:
                 startDate:
@@ -269,7 +269,7 @@ can check that a delivery date starts within the next five hours like this:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Order:
             properties:
                 deliveryDate:
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
index 8caddc15f91..7a5d331151f 100644
--- a/reference/constraints/Regex.rst
+++ b/reference/constraints/Regex.rst
@@ -44,7 +44,7 @@ more word characters at the beginning of your string:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 description:
@@ -113,7 +113,7 @@ it a custom message:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
@@ -213,7 +213,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 name:
diff --git a/reference/constraints/Time.rst b/reference/constraints/Time.rst
index e1684450d05..189b836490b 100644
--- a/reference/constraints/Time.rst
+++ b/reference/constraints/Time.rst
@@ -41,7 +41,7 @@ of the day when the event starts:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Event:
             properties:
                 startsAt:
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
index 1daf276c5f8..ace2b53918d 100644
--- a/reference/constraints/Type.rst
+++ b/reference/constraints/Type.rst
@@ -50,7 +50,7 @@ This will check if ``firstName`` is of type ``string`` and that ``age`` is an
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 firstName:
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
index b56025be2aa..713917cf9b2 100644
--- a/reference/constraints/UniqueEntity.rst
+++ b/reference/constraints/UniqueEntity.rst
@@ -25,10 +25,9 @@ using an email address that already exists in the system.
 Basic Usage
 -----------
 
-Suppose you have an AppBundle bundle with a ``User`` entity that has
-an ``email`` field. You can use the ``UniqueEntity`` constraint to guarantee
-that the ``email`` field remains unique between all of the constraints in
-your user table:
+Suppose you have a ``User`` entity that has an ``email`` field. You can use the
+``UniqueEntity`` constraint to guarantee that the ``email`` field remains unique
+between all of the constraints in your user table:
 
 .. configuration-block::
 
@@ -62,7 +61,7 @@ your user table:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             constraints:
                 - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity: email
@@ -216,7 +215,7 @@ Consider this example:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Service:
             constraints:
                 - Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity:
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
index 9e78ea4c1c1..c9f8d22c50d 100644
--- a/reference/constraints/Url.rst
+++ b/reference/constraints/Url.rst
@@ -39,7 +39,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioUrl:
@@ -107,7 +107,7 @@ This message is shown if the URL is invalid.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioUrl:
@@ -179,7 +179,7 @@ the ``ftp://`` type URLs to be valid, redefine the ``protocols`` array, listing
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioUrl:
@@ -256,7 +256,7 @@ option to ``true``:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioUrl:
@@ -329,7 +329,7 @@ DNS check failed.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 bioUrl:
diff --git a/reference/constraints/UserPassword.rst b/reference/constraints/UserPassword.rst
index 0354997d0f9..3f59742aa13 100644
--- a/reference/constraints/UserPassword.rst
+++ b/reference/constraints/UserPassword.rst
@@ -50,7 +50,7 @@ the user's current password:
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Form\Model\ChangePassword:
             properties:
                 oldPassword:
diff --git a/reference/constraints/Uuid.rst b/reference/constraints/Uuid.rst
index fb496d8440c..5f6eef5debc 100644
--- a/reference/constraints/Uuid.rst
+++ b/reference/constraints/Uuid.rst
@@ -26,7 +26,7 @@ Basic Usage
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\File:
             properties:
                 identifier:
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
index 2f5b3d7a7ac..ec6bd0b4884 100644
--- a/reference/constraints/Valid.rst
+++ b/reference/constraints/Valid.rst
@@ -92,7 +92,7 @@ stores an ``Address`` instance in the ``$address`` property.
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Address:
             properties:
                 street:
@@ -208,7 +208,7 @@ an invalid address. To prevent that, add the ``Valid`` constraint to the
 
     .. code-block:: yaml
 
-        # src/Resources/config/validation.yml
+        # src/Resources/config/validation.yaml
         App\Entity\Author:
             properties:
                 address:
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
index b979da368f9..d234f9777d7 100644
--- a/reference/dic_tags.rst
+++ b/reference/dic_tags.rst
@@ -513,7 +513,7 @@ is generated dynamically.
 To register your own cache warmer, first create a service that implements
 the :class:`Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface` interface::
 
-    // src/Acme/MainBundle/Cache/MyCustomWarmer.php
+    // src/Cache/MyCustomWarmer.php
     namespace App\Cache;
 
     use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
index 4be56046084..6945ee1b4e3 100644
--- a/reference/forms/types/entity.rst
+++ b/reference/forms/types/entity.rst
@@ -173,7 +173,7 @@ more details, see the main :ref:`choice_label <reference-form-choice-label>` doc
         // ...
 
         $builder->add('genre', EntityType::class, array(
-           'class' => 'MyBundle:Genre',
+           'class' => 'App\Entity\Genre',
            'choice_label' => 'translations[en].name',
         ));
 
diff --git a/reference/map.rst.inc b/reference/map.rst.inc
index 8339192ab96..cfc67ca0832 100644
--- a/reference/map.rst.inc
+++ b/reference/map.rst.inc
@@ -1,7 +1,7 @@
 * **Configuration Options**
 
   Ever wondered what configuration options you have available to you in
-  files such as ``app/config/config.yml``? In this section, all the available
+  ``config/packages/*.yaml`` files? In this section, all the available
   configuration is broken down by the key (e.g. ``framework``) that defines
   each possible section of your Symfony configuration.