Преглед изворни кода

Merge pull request #3466 from cezar77/patch-1

Corrected small grammar errors and typos
Oskar Stark пре 9 година
родитељ
комит
92a6fd85a0
1 измењених фајлова са 8 додато и 8 уклоњено
  1. 8 8
      Resources/doc/reference/security.rst

+ 8 - 8
Resources/doc/reference/security.rst

@@ -32,7 +32,7 @@ The install process is available on the dedicated
 Security handlers
 Security handlers
 -----------------
 -----------------
 
 
-The security part is managed by a ``SecurityHandler``, the bundle comes with 3 handlers
+The security part is managed by a ``SecurityHandler``, the bundle comes with 3 handlers:
 
 
 - ``sonata.admin.security.handler.role``: ROLES to handle permissions
 - ``sonata.admin.security.handler.role``: ROLES to handle permissions
 - ``sonata.admin.security.handler.acl``: ACL and ROLES to handle permissions
 - ``sonata.admin.security.handler.acl``: ACL and ROLES to handle permissions
@@ -101,7 +101,7 @@ Configuration
 
 
 First, activate the role security handler as described above.
 First, activate the role security handler as described above.
 
 
-Each time an user tries to do an action in the admin, Sonata checks if he is
+Each time a user tries to do an action in the admin, Sonata checks if he is
 either a super admin (``ROLE_SUPER_ADMIN``) **or** has the permission.
 either a super admin (``ROLE_SUPER_ADMIN``) **or** has the permission.
 
 
 The permissions are:
 The permissions are:
@@ -118,7 +118,7 @@ service), Sonata will check if the user has the ``ROLE_SONATA_ADMIN_DEMO_FOO_EDI
 
 
 The role name will be based on the name of your admin service. For instance, `acme.blog.post.admin` will become `ROLE_ACME_BLOG_POST_ADMIN_{ACTION}`.
 The role name will be based on the name of your admin service. For instance, `acme.blog.post.admin` will become `ROLE_ACME_BLOG_POST_ADMIN_{ACTION}`.
 
 
-So our ``security.yml`` file may look to something like this:
+So our ``security.yml`` file may look something like this:
 
 
 .. configuration-block::
 .. configuration-block::
 
 
@@ -297,7 +297,7 @@ The following configuration for the SonataUserBundle defines:
 - the login form for authentication
 - the login form for authentication
 - the access control: resources with related required roles, the important
 - the access control: resources with related required roles, the important
   part is the admin configuration
   part is the admin configuration
-- the ``acl`` option to enable the ACL.
+- the ``acl`` option to enable the ACL
 - the ``AdminPermissionMap`` defines the permissions of the Admin class
 - the ``AdminPermissionMap`` defines the permissions of the Admin class
 
 
 .. configuration-block::
 .. configuration-block::
@@ -443,10 +443,10 @@ Owner:
 Vocabulary used for Access Control Lists:
 Vocabulary used for Access Control Lists:
 
 
 - **Role:** a user role;
 - **Role:** a user role;
-- **ACL:** a list of access rules, the Admin uses 2 types:
+- **ACL:** a list of access rules, the Admin uses 2 types;
 - **Admin ACL:** created from the Security information of the Admin class
 - **Admin ACL:** created from the Security information of the Admin class
   for  each admin and shares the Access Control Entries that specify what
   for  each admin and shares the Access Control Entries that specify what
-  the  user can do (permissions) with the admin
+  the  user can do (permissions) with the admin;
 - **Object ACL:** also created from the security information of the ``Admin``
 - **Object ACL:** also created from the security information of the ``Admin``
   class however created for each object, it uses 2 scopes:
   class however created for each object, it uses 2 scopes:
 
 
@@ -482,9 +482,9 @@ In the application the security context is asked if access is granted for a role
 or a permission (``admin.isGranted``):
 or a permission (``admin.isGranted``):
 
 
 - **Token:** a token identifies a user between requests;
 - **Token:** a token identifies a user between requests;
-- **Voter:** sort of judge that returns if access is granted of denied, if the
+- **Voter:** sort of judge that returns whether access is granted or denied, if the
   voter should not vote for a case, it returns abstain;
   voter should not vote for a case, it returns abstain;
-- **AccessDecisionManager:** decides if access is granted or denied according
+- **AccessDecisionManager:** decides whether access is granted or denied according
   a specific strategy. It grants access if at least one (affirmative strategy),
   a specific strategy. It grants access if at least one (affirmative strategy),
   all (unanimous strategy) or more then half (consensus strategy) of the
   all (unanimous strategy) or more then half (consensus strategy) of the
   counted votes granted access;
   counted votes granted access;