svn merge -c 1084769 from trunk for HADOOP-7193.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1126617 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -432,6 +432,9 @@ Release 0.21.1 - Unreleased
     fs.checkpoint.* with dfs.namenode.checkpoint.* in documentations.
     (Harsh J Chouraria via szetszwo)
 
+    HADOOP-7193. Correct the "fs -touchz" command help message.
+    (Uma Maheswara Rao G via szetszwo)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/fs/FsShell.java

@@ -1486,8 +1486,9 @@ public class FsShell extends Configured implements Tool {
       + "\t\tThe -R flag requests a recursive change of replication level \n"
       + "\t\tfor an entire tree.\n";
 
-    String touchz = "-touchz <path>: Write a timestamp in yyyy-MM-dd HH:mm:ss format\n" +
-      "\t\tin a file at <path>. An error is returned if the file exists with non-zero length\n";
+    String touchz = "-touchz <path>: Creates a file of zero length\n"
+	+ "\t\t at <path> with current time as the timestamp of that <path>.\n"
+	+ "\t\t An error is returned if the file exists with non-zero length\n";
 
     String test = "-test -[ezd] <path>: If file { exists, has zero length, is a directory\n" +
       "\t\tthen return 0, else return 1.\n";