minor #5367 Split Security into Authentication & Authorization (iltar)

weaverryan · weaverryan · commit ce0dc17d15ac · 2015-07-07T18:40:32.000-04:00
This PR was merged into the 2.3 branch. Discussion ---------- Split Security into Authentication & Authorization | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | ~ I have divided the security part into Authentication and Authorization. This is done visually only, structure wise they are still together. There's still an issue regarding the sorting, it will be a lot clearer if the lists are re-sorted but I will do this in another PR once this is done. I think I've update all the index pages that mention this, but if I missed something, I can add that. Commits ------- 825f447 Changed Authorization and Authentication to use subsections 2e2068a Split Security into Authentication & Authorization
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -149,27 +149,30 @@
   * :doc:`/cookbook/routing/redirect_trailing_slash`
   * :doc:`/cookbook/routing/extra_information`
 
-* :doc:`/cookbook/security/index`
+* :doc:`Authentication </cookbook/security/index>`
 
   * :doc:`/cookbook/security/form_login_setup`
   * :doc:`/cookbook/security/entity_provider`
   * :doc:`/cookbook/security/remember_me`
   * :doc:`/cookbook/security/impersonating_user`
-  * :doc:`/cookbook/security/voters`
-  * :doc:`/cookbook/security/voters_data_permission`
-  * :doc:`/cookbook/security/acl`
-  * :doc:`/cookbook/security/acl_advanced`
-  * :doc:`/cookbook/security/force_https`
   * :doc:`/cookbook/security/form_login`
-  * :doc:`/cookbook/security/securing_services`
   * :doc:`/cookbook/security/custom_provider`
   * :doc:`/cookbook/security/custom_authentication_provider`
   * :doc:`/cookbook/security/pre_authenticated`
   * :doc:`/cookbook/security/target_path`
   * :doc:`/cookbook/security/csrf_in_login_form`
-  * :doc:`/cookbook/security/access_control`
   * :doc:`/cookbook/security/multiple_user_providers`
 
+* :doc:`Authorization </cookbook/security/index>`
+
+  * :doc:`/cookbook/security/voters`
+  * :doc:`/cookbook/security/voters_data_permission`
+  * :doc:`/cookbook/security/acl`
+  * :doc:`/cookbook/security/acl_advanced`
+  * :doc:`/cookbook/security/force_https`
+  * :doc:`/cookbook/security/securing_services`
+  * :doc:`/cookbook/security/access_control`
+
 * **Serializer**
 
   * :doc:`/cookbook/serializer`
diff --git a/cookbook/security/index.rst b/cookbook/security/index.rst
@@ -1,24 +1,35 @@
 Security
 ========
 
+Authentication
+--------------
+
 .. toctree::
     :maxdepth: 2
 
     form_login_setup
     entity_provider
     remember_me
     impersonating_user
-    voters
-    voters_data_permission
-    acl
-    acl_advanced
-    force_https
     form_login
-    securing_services
     custom_provider
     custom_authentication_provider
     pre_authenticated
     target_path
     csrf_in_login_form
-    access_control
     multiple_user_providers
+
+Authorization
+-------------
+
+.. toctree::
+    :maxdepth: 2
+
+    voters
+    voters_data_permission
+    acl
+    acl_advanced
+    force_https
+    securing_services
+    access_control
+
