Remove the old voter article

symfony · Jun 27, 2015 · 0c9c0f9 · 0c9c0f9
1 parent 9c169c7
commit 0c9c0f9
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 407 deletions.
diff --git a/book/security.rst b/book/security.rst
@@ -929,10 +929,10 @@ other users. Also, as the admin user, you yourself want to be able to edit
 
 To accomplish this you have 2 options:
 
-* :doc:`Voters </cookbook/security/voters_data_permission>` allow you to
-  use business logic (e.g. the user can edit this post because they were
-  the creator) to determine access. You'll probably want this option - it's
-  flexible enough to solve the above situation.
+* :doc:`Voters </cookbook/security/voters` allow you to use business logic
+  (e.g. the user can edit this post because they were the creator) to determine
+  access. You'll probably want this option - it's flexible enough to solve the
+  above situation.
 
 * :doc:`ACLs </cookbook/security/acl>` allow you to create a database structure
   where you can assign *any* arbitrary user *any* access (e.g. EDIT, VIEW)
@@ -1281,7 +1281,7 @@ Learn More from the Cookbook
 
 * :doc:`Forcing HTTP/HTTPS </cookbook/security/force_https>`
 * :doc:`Impersonating a User </cookbook/security/impersonating_user>`
-* :doc:`/cookbook/security/voters_data_permission`
+* :doc:`/cookbook/security/voters`
 * :doc:`Access Control Lists (ACLs) </cookbook/security/acl>`
 * :doc:`/cookbook/security/remember_me`
 * :doc:`/cookbook/security/multiple_user_providers`

diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -151,7 +151,6 @@
   * :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`

diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst
@@ -14,7 +14,7 @@ the ACL system comes in.
     Using ACL's isn't trivial, and for simpler use cases, it may be overkill.
     If your permission logic could be described by just writing some code (e.g.
     to check if a Blog is owned by the current User), then consider using
-    :doc:`voters </cookbook/security/voters_data_permission>`. A voter is passed the object
+    :doc:`voters </cookbook/security/voters`. A voter is passed the object
     being voted on, which you can use to make complex decisions and effectively
     implement your own ACL. Enforcing authorization (e.g. the ``isGranted``
     part) will look similar to what you see in this entry, but your voter

diff --git a/cookbook/security/index.rst b/cookbook/security/index.rst
@@ -9,7 +9,6 @@ Security
     remember_me
     impersonating_user
     voters
-    voters_data_permission
     acl
     acl_advanced
     force_https

diff --git a/cookbook/security/voter_interface.rst.inc b/cookbook/security/voter_interface.rst.inc