Merge pull request #357 from surajshetty3416/user-permission-docs

Updated permission docs

foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md

@@ -24,12 +24,10 @@ Permissions are applied on a combination of:
 
   * **Document Stages:** Permissions are applied on each stage of the document like on Creation, Saving, Submission, Cancellation and Amendment. A role can be permitted to Print, Email, Import or Export data, access Reports, or define User Permissions.
 
-  * **Apply User Permissions:** This switch decides whether User Permissions should be applied for the role on selected Document Stages.
+  * **User Permissions:** There is a concept of user permission using which a user can be restricted to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields.
-
-	If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields.
 
 	To set, User Permissions go to:
-    > Setup > Permissions > [User Permissions Manager](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
+    > Setup > Permissions > [User Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
 
 ---
 
@@ -47,7 +45,7 @@ Leave Application is a good **example** that encompasses all areas of Permission
 <img class="screenshot" alt="Giving Read, Write and Create Permissions to Employee for Leave Application"  src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
 
    1. **An Employee should only be able to access his/her Leave Application.**
-     Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
+     Hence, User Permissions record should be created for each User Employee combination.
 
 <img class="screenshot" alt="Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager" src="/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png">
 
@@ -57,7 +55,7 @@ Leave Application is a good **example** that encompasses all areas of Permission
 <img class="screenshot" alt="Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
 
    2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
-     Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
+     Leave Approver is given Read and Write access at Level 0. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
 
 <img class="screenshot" alt="Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
 

foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md

@@ -4,7 +4,7 @@
 Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data contained in the document being accessed. This is particularly useful when you want to restrict based on:
 
 1. Allow user to access data belonging to one Company
-1. Allow user to access data related to a specific Customer or Territory
+2. Allow user to access data related to a specific Customer or Territory
 
 ### Creating User Permissions
 
@@ -13,11 +13,21 @@ To create a User Permission, go to Setup > Permission > User Permissions
 When you create a new record you will have to specify
 
 1. The user for which the rule has to be applied
-1. The type of document which will be allowed (for example "Company")
+2. The type of document which will be allowed (for example "Company")
-1. The specific item that you want to allow (the name of the "Company)
+3. The specific item that you want to allow (the name of the "Company)
 
 <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/new-user-permission.png" class="screenshot" alt="Creating a new user permission">
 
+### Advanced control
+
+You can optionally apply user permission only for specific Document Type by setting the Document Type in the Applicable For field under Advanced Control.
+Setting **Applicable For** option will make the current user permission applicable only under the selected Document Type master.
+
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/advanced-control.png" class="screenshot" alt="Creating a new user permission">
+In the above User Permission, user michael.corleone@gadgets.com will be able to access blog posts created by blogger Michael Corleone.
+
+**Note:** If **Applicable For** is not set, User Permission will applicable across all related Document Types.
+
 ### Ignoring User Permissions on Certain Fields
 
 Another way of allowing documents to be seen that have been restricted by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form**