Merge branch '2.8' into 3.0

Conflicts:
	components/console.rst
	components/dependency_injection/advanced.rst
	components/dependency_injection/parentservices.rst
	controller.rst
	email/email.rst
	event_dispatcher/event_listener.rst
	index.rst
	page_creation.rst
	routing.rst
	routing/method_parameters.rst
	service_container/lazy_services.rst
	setup.rst

Author: wouterj

redirection_map renamed to _build/redirection_map

@@ -7,14 +7,14 @@
 /cookbook/doctrine/mongodb /bundles/DoctrineMongoDBBundle/index
 /cookbook/form/dynamic_form_generation /cookbook/form/dynamic_form_modification
 /cookbook/form/simple_signup_form_with_mongodb /bundles/DoctrineMongoDBBundle/form
-/cookbook/email /cookbook/email/email
+/cookbook/email /email
 /cookbook/gmail /cookbook/email/gmail
 /cookbook/console /components/console
 /cookbook/tools/autoloader /components/class_loader
 /cookbook/tools/finder /components/finder
-/cookbook/service_container/parentservices /components/dependency_injection/parentservices
-/cookbook/service_container/factories /components/dependency_injection/factories
-/cookbook/service_container/tags /components/dependency_injection/tags
+/cookbook/service_container/parentservices /service_container/parent_services
+/cookbook/service_container/factories /service_container/factories
+/cookbook/service_container/tags /service_container/tags
 /reference/configuration/mongodb /bundles/DoctrineMongoDBBundle/config
 /reference/YAML /components/yaml
 /cookbook/console/generating_urls /cookbook/console/sending_emails
@@ -44,7 +44,7 @@
 /cookbook/security/voters_data_permission /cookbook/security/voters
 /cookbook/configuration/pdo_session_storage /cookbook/doctrine/pdo_session_storage
 /cookbook/configuration/mongodb_session_storage /cookbook/doctrine/mongodb_session_storage
-/cookbook/service_container/event_listener /cookbook/event_dispatcher/event_listener
+/cookbook/service_container/event_listener /event_dispatcher
 /create_framework/http-foundation /create_framework/http_foundation
 /create_framework/front-controller /create_framework/front_controller
 /create_framework/http-kernel-controller-resolver /create_framework/http_kernel_controller_resolver
@@ -132,13 +132,13 @@
 /cookbook/doctrine/reverse_engineering /doctrine/reverse_engineering
 /cookbook/email/cloud /email/cloud
 /cookbook/email/dev_environment /email/dev_environment
-/cookbook/email/email /email/email
+/cookbook/email/email /email
 /cookbook/email/gmail /email/gmail
 /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/event_listener
+/cookbook/event_dispatcher/event_listener /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
@@ -152,7 +152,11 @@
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
 /cookbook/frontend/bower /frontend/bower
-/cookbook/install/unstable_versions /install/unstable_versions
+/cookbook/install/unstable_versions /setup/unstable_versions
+/cookbook/install/bundles /setup/bundles
+/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/monolog /logging
 /cookbook/logging/monolog_console /logging/monolog_console
@@ -170,7 +174,7 @@
 /cookbook/routing/debug /routing/debug
 /cookbook/routing/external_resources /routing/external_resources
 /cookbook/routing/extra_information /routing/extra_information
-/cookbook/routing/method_parameters /routing/method_parameters
+/cookbook/routing/method_parameters /routing/requirements
 /cookbook/routing/optional_placeholders /routing/optional_placeholders
 /cookbook/routing/redirect_in_config /routing/redirect_in_config
 /cookbook/routing/redirect_trailing_slash /routing/redirect_trailing_slash
@@ -253,8 +257,17 @@
 /components/debug/class_loader /components/debug
 /components/debug/introduction /components/debug
 /components/debug/index /components/debug
+/components/dependency_injection/advanced /service_container/alias_private
+/components/dependency_injection/definitions /service_container/definitions
 /components/dependency_injection/introduction /components/dependency_injection
 /components/dependency_injection/index /components/dependency_injection
+/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/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/introduction /components/event_dispatcher
 /components/expression_language/introduction /components/expression_language
 /components/expression_language/index /components/expression_language
@@ -284,3 +297,4 @@
 /components/var_dumper/index /components/var_dumper
 /components/yaml/introduction /components/yaml
 /components/yaml/index /components/yaml
+/install/bundles /setup/bundles

bundles.rst

@@ -172,4 +172,13 @@ create and validate forms, create translations for your application, write
 tests and much more. Each of these has their own place and role within the
 bundle.
 
+Learn More
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    bundles/*
+
 _`third-party bundles`: http://knpbundles.com