diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md
index aa137c0c6e..3e3db9140e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md
@@ -167,20 +167,56 @@ Configuration
Example:
-```
+Below example covers single mapping separately. In case of multiple mappings with comma separated values, evaluation would be from left to right, and the first valid mapping will be used. Below example order has been documented based on actual order of execution at runtime in case of multiple mappings.
+```
- yarn.scheduler.capacity.queue-mappings
- u:user1:queue1,g:group1:queue2,u:%user:%user,u:user2:%primary_group,u:user3:%secondary_group,u:%user:%primary_group.%user,u:%user:%secondary_group.%user
-
- Here, is mapped to , is mapped to ,
- maps users to queues with the same name as user, is mapped
- to queue name same as , maps users to queue with the
- same name as user but parent queue name should be same as
- of the user, maps users to queue with the same name as user but parent
- queue name should be same as any of the user
- respectively. The mappings will be evaluated from left to
- right, and the first valid mapping will be used.
-
+ yarn.scheduler.capacity.queue-mappings
+ u:%user:%primary_group.%user
+ Maps users to queue with the same name as user but
+ parent queue name should be same as primary group of the user
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:%user:%secondary_group.%user
+ Maps users to queue with the same name as user but
+ parent queue name should be same as any secondary group of the user
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:%user:%user
+ Maps users to queues with the same name as user
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:user2:%primary_group
+ user2 is mapped to queue name same as primary group
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:user3:%secondary_group
+ user3 is mapped to queue name same as secondary group
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:user1:queue1
+ user1 is mapped to queue1
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ g:group1:queue2
+ group1 is mapped to queue2
+
+ ...
+
+ yarn.scheduler.capacity.queue-mappings
+ u:user1:queue1,u:user2:queue2
+ Here, is mapped to , is mapped to respectively