From 889ab074d54bda643899cdfc2ded58625524465e Mon Sep 17 00:00:00 2001
From: yliu <yliu@apache.org>
Date: Wed, 21 Jan 2015 02:06:18 +0800
Subject: [PATCH] HDFS-7641. Update archival storage user doc for list/set/get
 block storage policies. (yliu)

---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   |  3 +++
 .../src/site/apt/ArchivalStorage.apt.vm       | 22 +++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 932fee8c75..964e2789a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -741,6 +741,9 @@ Release 2.7.0 - UNRELEASED
 
     HDFS-7637. Fix the check condition for reserved path. (Yi Liu via jing9)
 
+    HDFS-7641. Update archival storage user doc for list/set/get block storage
+    policies. (yliu)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ArchivalStorage.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ArchivalStorage.apt.vm
index 69674c74ae..5336ea3fa4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ArchivalStorage.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ArchivalStorage.apt.vm
@@ -189,7 +189,7 @@ hdfs mover [-p <files/dirs> | -f <local file name>]
   * Command:
 
 +------------------------------------------+
-hdfs storagepolicies
+hdfs storagepolicies -listPolicies
 +------------------------------------------+
 
   * Arguments: none.
@@ -201,16 +201,16 @@ hdfs storagepolicies
   * Command:
 
 +------------------------------------------+
-hdfs dfsadmin -setStoragePolicy <path> <policyName>
+hdfs storagepolicies -setStoragePolicy -path <path> -policy <policy>
 +------------------------------------------+
 
   * Arguments:
 
-*----------------------+-----------------------------------------------------+
-| <<<\<path\>>>>       | The path referring to either a directory or a file. |
-*----------------------+-----------------------------------------------------+
-| <<<\<policyName\>>>> | The name of the storage policy.                     |
-*----------------------+-----------------------------------------------------+
+*--------------------------+-----------------------------------------------------+
+| <<<-path \<path\>>>>     | The path referring to either a directory or a file. |
+*--------------------------+-----------------------------------------------------+
+| <<<-policy \<policy\>>>> | The name of the storage policy.                     |
+*--------------------------+-----------------------------------------------------+
 
   []
 
@@ -221,13 +221,13 @@ hdfs dfsadmin -setStoragePolicy <path> <policyName>
   * Command:
 
 +------------------------------------------+
-hdfs dfsadmin -getStoragePolicy <path>
+hdfs storagepolicies -getStoragePolicy -path <path>
 +------------------------------------------+
 
   * Arguments:
 
-*----------------------+-----------------------------------------------------+
-| <<<\<path\>>>>       | The path referring to either a directory or a file. |
-*----------------------+-----------------------------------------------------+
+*----------------------------+-----------------------------------------------------+
+| <<<-path \<path\>>>>       | The path referring to either a directory or a file. |
+*----------------------------+-----------------------------------------------------+
 
   []