You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bo...@apache.org on 2012/10/01 18:47:10 UTC
svn commit: r1392437 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt
src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
Author: bobby
Date: Mon Oct 1 16:47:09 2012
New Revision: 1392437
URL: http://svn.apache.org/viewvc?rev=1392437&view=rev
Log:
svn merge -c 1390109 FIXES: HADOOP-8791. Fix rm command documentation to indicte it deletes files and not directories. Contributed by Jing Zhao.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1392437&r1=1392436&r2=1392437&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Oct 1 16:47:09 2012
@@ -16,6 +16,9 @@ Release 0.23.5 - UNRELEASED
(default behavior in some bash setups (esp. Ubuntu))
(Chiristopher Berner and Andy Isaacson via harsh)
+ HADOOP-8791. Fix rm command documentation to indicte it deletes
+ files and not directories. (Jing Zhao via suresh)
+
Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml?rev=1392437&r1=1392436&r2=1392437&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml Mon Oct 1 16:47:09 2012
@@ -418,15 +418,15 @@
<code>Usage: hdfs dfs -rm [-skipTrash] URI [URI …] </code>
</p>
<p>
- Delete files specified as args. Only deletes non empty directory and files. If the <code>-skipTrash</code> option
+ Delete files specified as args. Only deletes files. If the <code>-skipTrash</code> option
is specified, the trash, if enabled, will be bypassed and the specified file(s) deleted immediately. This can be
useful when it is necessary to delete files from an over-quota directory.
- Refer to rmr for recursive deletes.<br/>
+ Use -rm -r or rmr for recursive deletes.<br/>
Example:
</p>
<ul>
<li>
- <code> hdfs dfs -rm hdfs://nn.example.com/file /user/hadoop/emptydir </code>
+ <code> hdfs dfs -rm hdfs://nn.example.com/file </code>
</li>
</ul>
<p>Exit Code:</p>
@@ -442,7 +442,7 @@
<p>
<code>Usage: hdfs dfs -rmr [-skipTrash] URI [URI …]</code>
</p>
- <p>Recursive version of delete. If the <code>-skipTrash</code> option
+ <p>Recursive version of delete. The rmr command recursively deletes the directory and any content under it. If the <code>-skipTrash</code> option
is specified, the trash, if enabled, will be bypassed and the specified file(s) deleted immediately. This can be
useful when it is necessary to delete files from an over-quota directory.<br/>
Example: