From 0341c655193880b8e55b422987ce1aa6924df04b Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Fri, 26 Sep 2014 14:57:20 -0700
Subject: [PATCH] HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm
 (Kenji Kikushima via aw)

---
 hadoop-common-project/hadoop-common/CHANGES.txt               | 3 +++
 .../hadoop-common/src/site/apt/FileSystemShell.apt.vm         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d08b1879665..1719e046ee8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -541,6 +541,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11048. user/custom LogManager fails to load if the client
     classloader is enabled (Sangjin Lee via jlowe)
 
+    HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm
+    (Kenji Kikushima via aw)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
index 9317c661d12..abc46430d96 100644
--- a/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
+++ b/hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
@@ -370,7 +370,7 @@ mkdir
 
 moveFromLocal
 
-   Usage: <<<dfs -moveFromLocal <localsrc> <dst> >>>
+   Usage: <<<hdfs dfs -moveFromLocal <localsrc> <dst> >>>
 
    Similar to put command, except that the source localsrc is deleted after
    it's copied.
@@ -617,7 +617,7 @@ touchz
 
    Example:
 
-     * <<<hadoop -touchz pathname>>>
+     * <<<hdfs dfs -touchz pathname>>>
 
    Exit Code:
    Returns 0 on success and -1 on error.