diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 86bf2431e8f..e36b937334d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -106,6 +106,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2414. RM web UI: app page will crash if app is failed before any
     attempt has been created (Wangda Tan via jlowe)
 
+    YARN-2870. Updated the command to run the timeline server in the document.
+    (Masatake Iwasaki via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
index 92c73770996..6c8203ce743 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
@@ -209,13 +209,13 @@ YARN Timeline Server
   start the Timeline server/history service with the following command:
 
 +---+
-  $ yarn historyserver
+  $ yarn timelineserver
 +---+
 
   Or users can start the Timeline server / history service as a daemon:
 
 +---+
-  $ yarn-daemon.sh start historyserver
+  $ yarn-daemon.sh start timelineserver
 +---+
 
 * Accessing generic-data via command-line