diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 5c7db3fe58..140e97ca13 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -51,6 +51,9 @@ Release 2.1.1-beta - UNRELEASED
     YARN-1093. Corrections to Fair Scheduler documentation (Wing Yew Poon via
     Sandy Ryza)
 
+    YARN-942. In Fair Scheduler documentation, inconsistency on which
+    properties have prefix (Akira Ajisaka via Sandy Ryza)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
index 37b63e5962..5d8083423f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
@@ -159,7 +159,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler
     * If assignmultiple is true, the maximum amount of containers that can be
       assigned in one heartbeat. Defaults to -1, which sets no limit.
 
- * <<<locality.threshold.node>>>
+ * <<<yarn.scheduler.fair.locality.threshold.node>>>
 
     * For applications that request containers on particular nodes, the number of
       scheduling opportunities since the last container assignment to wait before
@@ -168,7 +168,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler
       opportunities to pass up. The default value of -1.0 means don't pass up any
       scheduling opportunities.
 
- * <<<locality.threshold.rack>>>
+ * <<<yarn.scheduler.fair.locality.threshold.rack>>>
 
     * For applications that request containers on particular racks, the number of
       scheduling opportunities since the last container assignment to wait before