Correct many-to-many to many-to-one

_build/redirection_map

@@ -77,14 +77,15 @@
 /book/configuration /configuration
 /book/propel /propel/propel
 /book/performance /performance
+/bundles/installation /bundles
 /cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
 /cookbook/assetic/asset_management /frontend/assetic/asset_management
-/cookbook/assetic/index /frontend/assetic
+/cookbook/assetic/index /frontend/assetic/index
 /cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
 /cookbook/assetic/php /frontend/assetic/php
 /cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
 /cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
-/assetic /frontend/assetic
+/assetic /frontend/assetic/index
 /assetic/apply_to_option /frontend/assetic/apply_to_option
 /assetic/asset_management /frontend/assetic/asset_management
 /assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
@@ -96,10 +97,11 @@
 /cookbook/bundles/extension /bundles/extension
 /cookbook/bundles/index /bundles
 /cookbook/bundles/inheritance /bundles/inheritance
-/cookbook/bundles/installation /bundles/installation
+/cookbook/bundles/installation /bundles
 /cookbook/bundles/override /bundles/override
 /cookbook/bundles/prepend_extension /bundles/prepend_extension
-/cookbook/bundles/remove /bundles/remove
+/cookbook/bundles/remove /bundles
+/bundles/remove /bundles
 /cookbook/cache/form_csrf_caching /http_cache/form_csrf_caching
 /cookbook/cache/varnish /http_cache/varnish
 /cookbook/composer /setup/composer
@@ -120,37 +122,42 @@
 /cookbook/console/logging /console
 /cookbook/console/request_context /console/request_context
 /cookbook/console/style /console/style
-/cookbook/console/usage /console/usage
-/cookbook/controller/csrf_token_validation /controller/csrf_token_validation
+/cookbook/console/usage /console
+/console/usage /console
+/cookbook/controller/csrf_token_validation /security/csrf
 /cookbook/controller/error_pages /controller/error_pages
 /cookbook/controller/forwarding /controller/forwarding
 /cookbook/controller/index /controller
 /cookbook/controller/service /controller/service
 /cookbook/controller/upload_file /controller/upload_file
-/cookbook/debugging /debug/debugging
+/cookbook/debugging /
+/debug/debugging /
 /cookbook/deployment/azure-website /cookbook/azure-website
 /cookbook/deployment/fortrabbit /deployment/fortrabbit
 /cookbook/deployment/heroku /deployment/heroku
 /cookbook/deployment/index /deployment
 /cookbook/deployment/platformsh /deployment/platformsh
 /cookbook/deployment/tools /deployment/tools
 /cookbook/doctrine/common_extensions /doctrine/common_extensions
-/cookbook/doctrine/console /doctrine/console
+/cookbook/doctrine/console /doctrine
 /cookbook/doctrine/custom_dql_functions /doctrine/custom_dql_functions
 /cookbook/doctrine/dbal /doctrine/dbal
 /cookbook/doctrine/event_listeners_subscribers /doctrine/event_listeners_subscribers
 /cookbook/doctrine/index /doctrine
-/cookbook/doctrine/mapping_model_classes /doctrine/mapping_model_classes
+/cookbook/doctrine/mapping_model_classes /doctrine
+/doctrine/mapping_model_classes /doctrine
 /cookbook/doctrine/mongodb_session_storage /doctrine/mongodb_session_storage
 /cookbook/doctrine/multiple_entity_managers /doctrine/multiple_entity_managers
 /cookbook/doctrine/pdo_session_storage /doctrine/pdo_session_storage
 /cookbook/doctrine/registration_form /doctrine/registration_form
 /cookbook/doctrine/resolve_target_entity /doctrine/resolve_target_entity
 /cookbook/doctrine/reverse_engineering /doctrine/reverse_engineering
-/cookbook/email/cloud /email/cloud
+/doctrine/repository /doctrine
+/doctrine/console /doctrine
+/cookbook/email/cloud /email
 /cookbook/email/dev_environment /email/dev_environment
 /cookbook/email/email /email
-/cookbook/email/gmail /email/gmail
+/cookbook/email/gmail /email
 /cookbook/email/index /email
 /cookbook/email/spool /email/spool
 /cookbook/email/testing /email/testing
@@ -214,7 +221,7 @@
 /cookbook/security/acl /security/acl
 /cookbook/security/acl_advanced /security/acl_advanced
 /cookbook/security/api_key_authentication /security/api_key_authentication
-/cookbook/security/csrf_in_login_form /security/csrf_in_login_form
+/cookbook/security/csrf_in_login_form /security/csrf
 /cookbook/security/custom_authentication_provider /security/custom_authentication_provider
 /cookbook/security/custom_password_authenticator /security/custom_password_authenticator
 /cookbook/security/custom_provider /security/custom_provider
@@ -280,18 +287,28 @@
 /cookbook/web_services/php_soap_extension /controller/soap_web_service
 /cookbook/workflow/homestead /setup/homestead
 /cookbook/workflow/index /setup
-/cookbook/workflow/new_project_git /setup/new_project_git
-/cookbook/workflow/new_project_svn /setup/new_project_svn
+/cookbook/workflow/new_project_git /setup
+/cookbook/workflow/new_project_svn /setup
+/setup/new_project_git /setup
+/setup/new_project_svn /setup
 /components/asset/index /components/asset
 /components/asset/introduction /components/asset
 /components/browser_kit/index /components/browser_kit
 /components/browser_kit/introduction /components/browser_kit
 /components/class_loader/introduction /components/class_loader
 /components/class_loader/index /components/class_loader
+/components/class_loader/cache_class_loader /components/class_loader
+/components/class_loader/class_loader /components/class_loader
+/components/class_loader/class_map_generator /components/class_loader
+/components/class_loader/debug_class_loader /components/class_loader
+/components/class_loader/map_class_loader /components/class_loader
+/components/class_loader/map_class_loader /components/class_loader
+/components/class_loader/psr4_class_loader /components/class_loader
 /components/config/introduction /components/config
 /components/config/index /components/config
 /components/console/helpers/tablehelper /components/console/helpers/table
 /components/console/helpers/progresshelper /components/console/helpers/progressbar
+/components/console/helpers/dialoghelper /components/console/helpers/questionhelper
 /components/console/introduction /components/console
 /components/console/index /components/console
 /components/debug/class_loader /components/debug
@@ -343,20 +360,54 @@
 /components/var_dumper/index /components/var_dumper
 /components/yaml/introduction /components/yaml
 /components/yaml/index /components/yaml
+/console/logging /console
+/controller/csrf_token_validation /security/csrf
 /deployment/tools /deployment
+/form/csrf_protection /security/csrf
 /install/bundles /setup/bundles
+/email/gmail /email
+/email/cloud /email
 /event_dispatcher/class_extension /event_dispatcher
 /form /forms
 /form/use_virtual_forms /form/inherit_data_option
+/frontend/assetic /frontend/assetic/index
+/frontend/assetic/apply_to_option /frontend/assetic/index
+/frontend/assetic/asset_management /frontend/assetic/index
+/frontend/assetic/jpeg_optimize /frontend/assetic/index
+/frontend/assetic/php /frontend/assetic/index
+/frontend/assetic/uglifyjs /frontend/assetic/index
+/frontend/assetic/yuicompressor /frontend/assetic/index
+/reference/configuration/assetic /frontend/assetic/index
 /security/target_path /security
+/security/csrf_in_login_form /security/csrf
 /service_container/service_locators /service_container/service_subscribers_locators
 /service_container/third_party /service_container
 /templating/templating_service /templates
 /testing/simulating_authentication /testing/http_authentication
 /validation/group_service_resolver /form/validation_group_service_resolver
 /request/load_balancer_reverse_proxy /deployment/proxies
+/quick_tour/the_controller /quick_tour/the_big_picture
+/quick_tour/the_view /quick_tour/flex_recipes
 /service_container/service_locators /service_container/service_subscribers_locators
+/templating/overriding /bundles/override
+/security/custom_provider /security/user_provider
+/security/multiple_user_providers /security/user_provider
+/security/custom_password_authenticator /security/guard_authentication
+/security/api_key_authentication /security/guard_authentication
+/security/pre_authenticated /security/auth_providers
+/security/host_restriction /security/firewall_restriction
+/security/acl_advanced /security/acl
+/security/password_encoding /security
 /weblink /web_link
 /components/weblink /components/web_link
 /frontend/encore/installation-no-flex /frontend/encore/installation
+/http_cache/form_csrf_caching /security/csrf
 /console/logging /console
+/reference/forms/twig_reference /form/form_customization
+/form/rendering /form/form_customization
+/profiler/matchers /profiler
+/profiler/profiling_data /profiler
+/profiler/wdt_follow_ajax /profiler
+/security/entity_provider /security/user_provider
+/session/avoid_session_start /session
+/session/sessions_directory /session

_includes/service_container/_my_mailer.rst.inc

@@ -2,32 +2,32 @@
 
     .. code-block:: yaml
 
-        # app/config/services.yml
+        # config/services.yaml
         services:
             app.mailer:
-                class:        AppBundle\Mailer
+                class:        App\Mailer
                 arguments:    [sendmail]
 
     .. code-block:: xml
 
-        <!-- app/config/services.xml -->
+        <!-- config/services.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"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.mailer" class="AppBundle\Mailer">
+                <service id="app.mailer" class="App\Mailer">
                     <argument>sendmail</argument>
                 </service>
             </services>
         </container>
 
     .. code-block:: php
 
-        // app/config/services.php
-        use AppBundle\Mailer;
+        // config/services.php
+        use App\Mailer;
 
         $container->register('app.mailer', Mailer::class)
             ->addArgument('sendmail');