Merge branch '3.1'

* 3.1: (52 commits)
  this sounds just a little bit more natural
  Update dynamic_form_modification.rst
  Remove colloquialism "hold on"
  fixing reference to deprecated class
  removing use statement for consistency with other places in this doc
  fix FlattenException namespace
  Tweaks thanks to close review from Javier and @snoek09!
  Remove AcmeDemoBundle references
  Fix reference to output object
  Subject-verb agreement
  fixed missing level in namespace
  Fix tense and sentence length
  Fix typo in external_parameters.rst
  line break
  Removing the alias stuff - not required after symfony/symfony#17074
  Fixed the main index page redirections
  Fixed the redirection for "upgrade" articles
  Added all the missing "index pages" redirections
  Fixed a Console article redirection
  Fixed the redirection of the previous "performance" book chapter
  ...

Author: weaverryan

.platform.app.yaml

@@ -52,4 +52,4 @@ dependencies:
 hooks:
     build: |
       pip install git+https://github.com/fabpot/sphinx-php.git
-      make html
+      make -C _build html

_build/Makefile

@@ -5,12 +5,12 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = .
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -c $(BUILDDIR) -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ../
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 

_build/redirection_map

@@ -1,3 +1,5 @@
+/book/index /index
+/cookbook/index /index
 /book/stable_api /contributing/code/bc
 /book/internals /reference/events
 /cookbook/console/sending_emails /cookbook/console/request_context
@@ -73,56 +75,63 @@
 /book/from_flat_php_to_symfony2 /introduction/from_flat_php_to_symfony2
 /book/configuration /configuration
 /book/propel /propel/propel
-/book/performance /performance/performance
+/book/performance /performance
 /cookbook/assetic/apply_to_option /assetic/apply_to_option
 /cookbook/assetic/asset_management /assetic/asset_management
+/cookbook/assetic/index /assetic
 /cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
 /cookbook/assetic/php /assetic/php
 /cookbook/assetic/uglifyjs /assetic/uglifyjs
 /cookbook/assetic/yuicompressor /assetic/yuicompressor
 /cookbook/bundles/best_practices /bundles/best_practices
 /cookbook/bundles/configuration /bundles/configuration
 /cookbook/bundles/extension /bundles/extension
+/cookbook/bundles/index /bundles
 /cookbook/bundles/inheritance /bundles/inheritance
 /cookbook/bundles/installation /bundles/installation
 /cookbook/bundles/override /bundles/override
 /cookbook/bundles/prepend_extension /bundles/prepend_extension
 /cookbook/bundles/remove /bundles/remove
-/cookbook/cache/form_csrf_caching /cache/form_csrf_caching
-/cookbook/cache/varnish /cache/varnish
+/cookbook/cache/form_csrf_caching /http_cache/form_csrf_caching
+/cookbook/cache/varnish /http_cache/varnish
 /cookbook/composer /setup/composer
 /cookbook/configuration/apache_router /configuration/apache_router
 /cookbook/configuration/configuration_organization /configuration/configuration_organization
 /cookbook/configuration/environments /configuration/environments
 /cookbook/configuration/external_parameters /configuration/external_parameters
 /cookbook/configuration/front_controllers_and_kernel /configuration/front_controllers_and_kernel
 /cookbook/configuration/micro-kernel-trait /configuration/micro_kernel_trait
+/cookbook/configuration/index /configuration
 /cookbook/configuration/override_dir_structure /configuration/override_dir_structure
 /cookbook/configuration/using_parameters_in_dic /configuration/using_parameters_in_dic
 /cookbook/configuration/web_server_configuration /setup/web_server_configuration
 /cookbook/console/command_in_controller /console/command_in_controller
 /cookbook/console/commands_as_services /console/commands_as_services
-/cookbook/console/console_command /console/console_command
+/cookbook/console/console_command /console
+/cookbook/console/index /console
 /cookbook/console/logging /console/logging
 /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/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/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/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/mongodb_session_storage /doctrine/mongodb_session_storage
 /cookbook/doctrine/multiple_entity_managers /doctrine/multiple_entity_managers
@@ -134,11 +143,13 @@
 /cookbook/email/dev_environment /email/dev_environment
 /cookbook/email/email /email
 /cookbook/email/gmail /email/gmail
+/cookbook/email/index /email
 /cookbook/email/spool /email/spool
 /cookbook/email/testing /email/testing
 /cookbook/event_dispatcher/before_after_filters /event_dispatcher/before_after_filters
 /cookbook/event_dispatcher/class_extension /event_dispatcher/class_extension
 /cookbook/event_dispatcher/event_listener /event_dispatcher
+/cookbook/event_dispatcher/index /event_dispatcher
 /cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
 /cookbook/expressions /expressions/expressions
 /cookbook/form/create_custom_field_type /form/create_custom_field_type
@@ -148,32 +159,39 @@
 /cookbook/form/dynamic_form_modification /form/dynamic_form_modification
 /cookbook/form/form_collections /form/form_collections
 /cookbook/form/form_customization /form/form_customization
+/cookbook/form/index /forms
 /cookbook/form/inherit_data_option /form/inherit_data_option
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
 /cookbook/frontend/bower /frontend/bower
+/cookbook/frontend/index /frontend
 /cookbook/install/unstable_versions /setup/unstable_versions
 /cookbook/install/bundles /setup/bundles
+/cookbook/install/index /setup
 /cookbook/install/upgrade_major /setup/upgrade_major
 /cookbook/install/upgrade_minor /setup/upgrade_minor
 /cookbook/install/upgrade_patch /setup/upgrade_patch
 /cookbook/logging/channels_handlers /logging/channels_handlers
+/cookbook/logging/index /logging
 /cookbook/logging/monolog /logging
 /cookbook/logging/monolog_console /logging/monolog_console
 /cookbook/logging/monolog_email /logging/monolog_email
 /cookbook/logging/monolog_regex_based_excludes /logging/monolog_regex_based_excludes
 /cookbook/profiler/data_collector /profiler/data_collector
+/cookbook/profiler/index /profiler
 /cookbook/profiler/matchers /profiler/matchers
 /cookbook/profiler/profiling_data /profiler/profiling_data
 /cookbook/profiler/storage /profiler/storage
-/cookbook/psr7 /psr/psr7
+/cookbook/psr7 /request/psr7
+/cookbook/request/index /request
 /cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
 /cookbook/request/mime_type /request/mime_type
 /cookbook/routing/conditions /routing/conditions
 /cookbook/routing/custom_route_loader /routing/custom_route_loader
 /cookbook/routing/debug /routing/debug
 /cookbook/routing/external_resources /routing/external_resources
 /cookbook/routing/extra_information /routing/extra_information
+/cookbook/routing/index /routing
 /cookbook/routing/method_parameters /routing/requirements
 /cookbook/routing/optional_placeholders /routing/optional_placeholders
 /cookbook/routing/redirect_in_config /routing/redirect_in_config
@@ -201,6 +219,7 @@
 /cookbook/security/impersonating_user /security/impersonating_user
 /cookbook/security/ldap /security/ldap
 /cookbook/security/multiple_guard_authenticators /security/multiple_guard_authenticators
+/cookbook/security/index /security
 /cookbook/security/multiple_user_providers /security/multiple_user_providers
 /cookbook/security/named_encoders /security/named_encoders
 /cookbook/security/pre_authenticated /security/pre_authenticated
@@ -211,16 +230,19 @@
 /cookbook/security/voters /security/voters
 /cookbook/serializer /serializer
 /cookbook/service_container/compiler_passes /service_container/compiler_passes
+/cookbook/service_container/index /service_container
 /cookbook/service_container/scopes /service_container/scopes
 /cookbook/service_container/shared /service_container/shared
 /cookbook/session/avoid_session_start /session/avoid_session_start
+/cookbook/session/index /session
 /cookbook/session/limit_metadata_writes /session/limit_metadata_writes
 /cookbook/session/locale_sticky_session /session/locale_sticky_session
 /cookbook/session/php_bridge /session/php_bridge
 /cookbook/session/proxy_examples /session/proxy_examples
 /cookbook/session/sessions_directory /session/sessions_directory
 /cookbook/symfony1 /introduction/symfony1
 /cookbook/templating/global_variables /templating/global_variables
+/cookbook/templating/index /templating
 /cookbook/templating/namespaced_paths /templating/namespaced_paths
 /cookbook/templating/PHP /templating/PHP
 /cookbook/templating/render_without_controller /templating/render_without_controller
@@ -229,19 +251,25 @@
 /cookbook/testing/database /testing/database
 /cookbook/testing/doctrine /testing/doctrine
 /cookbook/testing/http_authentication /testing/http_authentication
+/cookbook/testing/index /testing
 /cookbook/testing/insulating_clients /testing/insulating_clients
 /cookbook/testing/profiling /testing/profiling
 /cookbook/testing/simulating_authentication /testing/simulating_authentication
 /cookbook/upgrade/bundles /upgrade/patch_version
-/cookbook/upgrade/major_version /upgrade/minor_version
-/cookbook/upgrade/minor_version /upgrade/major_version
+/cookbook/upgrade/index /setup/upgrade_major
+/cookbook/upgrade/major_version /setup/upgrade_minor
+/cookbook/upgrade/minor_version /setup/upgrade_major
 /cookbook/upgrade/patch_version /upgrade/bundles
 /cookbook/validation/custom_constraint /validation/custom_constraint
 /cookbook/validation/group_service_resolver /validation/group_service_resolver
+/cookbook/validation/index /validation
 /cookbook/validation/severity /validation/severity
 /cookbook/web_server/built_in /setup/built_in_web_server
-/cookbook/web_services/php_soap_extension /web_services/php_soap_extension
+/cookbook/web_server/index /setup/built_in_web_server
+/cookbook/web_services/index /controller/soap_web_service
+/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
 /components/asset/index /components/asset
@@ -264,10 +292,12 @@
 /components/dependency_injection/factories /service_container/factories
 /components/dependency_injection/lazy_services /service_container/lazy_services
 /components/dependency_injection/parameters /service_container/parameters
+/components/dependency_injection/parentservices /service_container/parent_services
 /components/dependency_injection/parent_services /service_container/parent_services
 /components/dependency_injection/synthetic_services /service_container/synthetic_services
 /components/dependency_injection/tags /service_container/tags
 /components/dependency_injection/types /service_container/injection_types
+/components/event_dispatcher/index /components/event_dispatcher
 /components/event_dispatcher/introduction /components/event_dispatcher
 /components/expression_language/introduction /components/expression_language
 /components/expression_language/index /components/expression_language
@@ -277,6 +307,7 @@
 /components/form/introduction /components/form
 /components/form/index /components/form
 /components/form/type_guesser /form/type_guesser
+/components/http_foundation/index /components/http_foundation
 /components/http_foundation/introduction /components/http_foundation
 /components/http_kernel/introduction /components/http_kernel
 /components/http_kernel/index /components/http_kernel

bundles/remove.rst

@@ -1,25 +1,16 @@
 .. index::
-    single: Bundle; Removing AcmeDemoBundle
+    single: Bundle; Removing a bundle
 
-How to Remove the AcmeDemoBundle
-================================
-
-The Symfony Standard Edition comes with a complete demo that lives inside a
-bundle called AcmeDemoBundle. It is a great boilerplate to refer to while
-starting a project, but you'll probably want to eventually remove it.
-
-.. tip::
-
-    This article uses the AcmeDemoBundle as an example, but you can use
-    these steps to remove any bundle.
+How to Remove a Bundle
+======================
 
 1. Unregister the Bundle in the ``AppKernel``
 ---------------------------------------------
 
 To disconnect the bundle from the framework, you should remove the bundle from
-the ``AppKernel::registerBundles()`` method. The bundle is normally found in
-the ``$bundles`` array but the AcmeDemoBundle is only registered in the
-development environment and you can find it inside the if statement below::
+the ``AppKernel::registerBundles()`` method. The bundle will likely be found in
+the ``$bundles`` array declaration or added to it in a later statement if the
+bundle is only registered in the development environment::
 
     // app/AppKernel.php
 
@@ -28,7 +19,9 @@ development environment and you can find it inside the if statement below::
     {
         public function registerBundles()
         {
-            $bundles = array(...);
+            $bundles = array(
+                new Acme\DemoBundle\AcmeDemoBundle(),
+            );
 
             if (in_array($this->getEnvironment(), array('dev', 'test'))) {
                 // comment or remove this line:
@@ -48,8 +41,9 @@ that refers to the bundle.
 2.1 Remove Bundle Routing
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The routing for the AcmeDemoBundle can be found in ``app/config/routing_dev.yml``.
-Remove the ``_acme_demo`` entry at the bottom of this file.
+*Some* bundles require you to import routing configuration. Check for references
+to the bundle in ``app/config/routing.yml`` and ``app/config/routing_dev.yml``.
+If you find any references, remove them completely.
 
 2.2 Remove Bundle Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,18 +54,13 @@ quickly spot bundle configuration by looking for an ``acme_demo`` (or whatever
 the name of the bundle is, e.g. ``fos_user`` for the FOSUserBundle) string in
 the configuration files.
 
-The AcmeDemoBundle doesn't have configuration. However, the bundle is
-used in the configuration for the ``app/config/security.yml`` file. You can
-use it as a boilerplate for your own security, but you **can** also remove
-everything: it doesn't matter to Symfony if you remove it or not.
-
 3. Remove the Bundle from the Filesystem
 ----------------------------------------
 
 Now you have removed every reference to the bundle in your application, you
-should remove the bundle from the filesystem. The bundle is located in the
-``src/Acme/DemoBundle`` directory. You should remove this directory and you
-can remove the ``Acme`` directory as well.
+should remove the bundle from the filesystem. The bundle will be located in
+`src/` for example the ``src/Acme/DemoBundle`` directory. You should remove this
+directory, and any parent directories that are now empty (e.g. ``src/Acme/``).
 
 .. tip::
 
@@ -91,11 +80,6 @@ Remove the assets of the bundle in the web/ directory (e.g.
 4. Remove Integration in other Bundles
 --------------------------------------
 
-.. note::
-
-    This doesn't apply to the AcmeDemoBundle - no other bundles depend
-    on it, so you can skip this step.
-
 Some bundles rely on other bundles, if you remove one of the two, the other
 will probably not work. Be sure that no other bundles, third party or self-made,
 rely on the bundle you are about to remove.

components/http_kernel.rst

@@ -582,7 +582,7 @@ below for more details).
     The listener has several goals:
 
     1) The thrown exception is converted into a
-       :class:`Symfony\\Component\\HttpKernel\\Exception\\FlattenException`
+       :class:`Symfony\\Component\\Debug\\Exception\\FlattenException`
        object, which contains all the information about the request, but which
        can be printed and serialized.