Moved new cookbook articles to the topics

wouterj · wouterj · commit c210d5fb493d · 2016-07-13T14:15:34.000+02:00
diff --git a/assetic.rst b/assetic.rst
@@ -1,7 +1,7 @@
 Assetic
 =======
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 .. toctree::
     :maxdepth: 1
diff --git a/assetic/_standard_edition_warning.rst.inc b/assetic/_standard_edition_warning.rst.inc
@@ -1,5 +1,5 @@
 .. caution::
 
     Starting from Symfony 2.8, Assetic is no longer included by default in the
-    Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
+    Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
     to learn how to install and enable Assetic in your Symfony application.
diff --git a/assetic/apply_to_option.rst b/assetic/apply_to_option.rst
@@ -4,7 +4,7 @@
 How to Apply an Assetic Filter to a specific File Extension
 ===========================================================
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 Assetic filters can be applied to individual files, groups of files or even,
 as you'll see here, files that have a specific extension. To show you how
diff --git a/assetic/jpeg_optimize.rst b/assetic/jpeg_optimize.rst
@@ -4,7 +4,7 @@
 How to Use Assetic for Image Optimization with Twig Functions
 =============================================================
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 Among its many filters, Assetic has four filters which can be used for on-the-fly
 image optimization. This allows you to get the benefits of smaller file sizes
diff --git a/assetic/php.rst b/assetic/php.rst
@@ -4,7 +4,7 @@
 Combining, Compiling and Minimizing Web Assets with PHP Libraries
 =================================================================
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 The official Symfony Best Practices recommend to use Assetic to
 :doc:`manage web assets </best_practices/web-assets>`, unless you are
diff --git a/assetic/uglifyjs.rst b/assetic/uglifyjs.rst
@@ -4,7 +4,7 @@
 How to Minify CSS/JS Files (Using UglifyJS and UglifyCSS)
 =========================================================
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 `UglifyJS`_ is a JavaScript parser/compressor/beautifier toolkit. It can be used
 to combine and minify JavaScript assets so that they require less HTTP requests
diff --git a/assetic/yuicompressor.rst b/assetic/yuicompressor.rst
@@ -10,7 +10,7 @@ How to Minify JavaScripts and Stylesheets with YUI Compressor
     **strongly advised to avoid using YUI utilities** unless strictly necessary.
     Read :doc:`/assetic/uglifyjs` for a modern and up-to-date alternative.
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 Yahoo! provides an excellent utility for minifying JavaScripts and stylesheets
 so they travel over the wire faster, the `YUI Compressor`_. Thanks to Assetic,
diff --git a/best_practices/web-assets.rst b/best_practices/web-assets.rst
@@ -35,7 +35,7 @@ much more concise:
 Using Assetic
 -------------
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 These days, you probably can't simply create static CSS and JavaScript files
 and include them in your template. Instead, you'll probably want to combine
diff --git a/bundles/override.rst b/bundles/override.rst
@@ -114,7 +114,7 @@ and registering it as a service, and tagging it with ``form.type`` (you *could*
 do this in earlier version).
 
 Instead, you should use a "form type extension" to modify the existing form type.
-For more information, see :doc:`/cookbook/form/create_form_type_extension`.
+For more information, see :doc:`/form/create_form_type_extension`.
 
 .. _override-validation:
 
diff --git a/components/index.rst b/components/index.rst
@@ -0,0 +1,9 @@
+The Components
+==============
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+    
+    using_components
+    *
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
diff --git a/redirection_map b/redirection_map
@@ -96,6 +96,7 @@
 /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/override_dir_structure /configuration/override_dir_structure
 /cookbook/configuration/using_parameters_in_dic /configuration/using_parameters_in_dic
 /cookbook/configuration/web_server_configuration /configuration/web_server_configuration
@@ -191,18 +192,23 @@
 /cookbook/security/force_https /security/force_https
 /cookbook/security/form_login /security/form_login
 /cookbook/security/form_login_setup /security/form_login_setup
+/cookbook/security/guard-authentication /security/guard_authentication
 /cookbook/security/host_restriction /security/host_restriction
 /cookbook/security/impersonating_user /security/impersonating_user
+/cookbook/security/ldap /security/ldap
+/cookbook/security/multiple_guard_authenticators /security/multiple_guard_authenticators
 /cookbook/security/multiple_user_providers /security/multiple_user_providers
 /cookbook/security/named_encoders /security/named_encoders
 /cookbook/security/pre_authenticated /security/pre_authenticated
 /cookbook/security/remember_me /security/remember_me
 /cookbook/security/securing_services /security/securing_services
 /cookbook/security/target_path /security/target_path
+/cookbook/security/user_checkers /security/user_checkers
 /cookbook/security/voters /security/voters
 /cookbook/serializer /serializer
 /cookbook/service_container/compiler_passes /service_container/compiler_passes
 /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/limit_metadata_writes /session/limit_metadata_writes
 /cookbook/session/locale_sticky_session /session/locale_sticky_session
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
@@ -4,7 +4,7 @@
 AsseticBundle Configuration ("assetic")
 =======================================
 
-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc
 
 Full Default Configuration
 --------------------------
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -428,7 +428,7 @@ There are several options for connecting against an LDAP server,
 using the ``form_login_ldap`` and ``http_basic_ldap`` authentication
 providers or the ``ldap`` user provider.
 
-For even more details, see :doc:`/cookbook/security/ldap`.
+For even more details, see :doc:`/security/ldap`.
 
 Authentication
 ~~~~~~~~~~~~~~
diff --git a/security.rst b/security.rst
@@ -1414,7 +1414,9 @@ Authentication (Identifying/Logging in the User)
     :maxdepth: 1
 
     security/form_login_setup
+    security/ldap
     security/entity_provider
+    security/guard_authentication
     security/remember_me
     security/impersonating_user
     security/form_login
@@ -1427,8 +1429,10 @@ Authentication (Identifying/Logging in the User)
     security/csrf_in_login_form
     security/named_encoders
     security/multiple_user_providers
+    security/multiple_guard_authenticators
     security/firewall_restriction
     security/host_restriction
+    security/user_checkers
 
 Authorization (Denying Access)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst
@@ -6,7 +6,7 @@ How to Authenticate Users with API Keys
 
 .. tip::
 
-    Check out :doc:`/cookbook/security/guard-authentication` for a simpler and more
+    Check out :doc:`/security/guard_authentication` for a simpler and more
     flexible way to accomplish custom authentication tasks like this.
 
 Nowadays, it's quite usual to authenticate the user via an API key (when developing
diff --git a/security/custom_authentication_provider.rst b/security/custom_authentication_provider.rst
@@ -10,7 +10,7 @@ How to Create a custom Authentication Provider
     you through that process. But depending on your needs, you may be able
     to solve your problem in a simpler, or via a community bundle:
 
-    * :doc:`/cookbook/security/guard-authentication`
+    * :doc:`/security/guard_authentication`
     * :doc:`/security/custom_password_authenticator`
     * :doc:`/security/api_key_authentication`
     * To authenticate via OAuth using a third-party service such as Google, Facebook
diff --git a/security/custom_password_authenticator.rst b/security/custom_password_authenticator.rst
@@ -6,7 +6,7 @@ How to Create a Custom Form Password Authenticator
 
 .. tip::
 
-    Check out :doc:`/cookbook/security/guard-authentication` for a simpler and more
+    Check out :doc:`/security/guard_authentication` for a simpler and more
     flexible way to accomplish custom authentication tasks like this.
 
 Imagine you want to allow access to your website only between 2pm and 4pm
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -15,7 +15,7 @@ Create a User and a User Provider
 ---------------------------------
 
 No matter how you authenticate, you need to create a User class that implements ``UserInterface``
-and configure a :doc:`user provider </cookbook/security/custom_provider>`. In this
+and configure a :doc:`user provider </security/custom_provider>`. In this
 example, users are stored in the database via Doctrine, and each user has an ``apiKey``
 property they use to access their account via the API::
 
@@ -134,8 +134,8 @@ Next, make sure you've configured a "user provider" for the user:
 
 That's it! Need more information about this step, see:
 
-* :doc:`/cookbook/security/entity_provider`
-* :doc:`/cookbook/security/custom_provider`
+* :doc:`/security/entity_provider`
+* :doc:`/security/custom_provider`
 
 Step 1) Create the Authenticator Class
 --------------------------------------
diff --git a/security/ldap.rst b/security/ldap.rst
diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst
diff --git a/security/user_checkers.rst b/security/user_checkers.rst
diff --git a/service_container.rst b/service_container.rst
@@ -145,7 +145,7 @@ As a bonus, the ``Mailer`` service is only created once and the same
 instance is returned each time you ask for the service. This is almost always
 the behavior you'll need (it's more flexible and powerful), but you'll learn
 later how you can configure a service that has multiple instances in the
-":doc:`/cookbook/service_container/shared`" cookbook article.
+":doc:`/service_container/shared`" cookbook article.
 
 .. note::
 
diff --git a/service_container/scopes.rst b/service_container/scopes.rst
@@ -12,7 +12,7 @@ How to Work with Scopes
     Use the ``request_stack`` service (introduced in Symfony 2.4) instead of
     the ``request`` service/scope and use the ``shared`` setting (introduced in
     Symfony 2.8) instead of the ``prototype`` scope
-    (:doc:`read more about shared services </cookbook/service_container/shared>`).
+    (:doc:`read more about shared services </service_container/shared>`).
 
 This article is all about scopes, a somewhat advanced topic related to the
 :doc:`/service_container`. If you've ever gotten an error mentioning
diff --git a/service_container/shared.rst b/service_container/shared.rst
