From a4cfaca9ed5f5f2d02705016ef3735470d7aa43a Mon Sep 17 00:00:00 2001
From: Suresh Srinivas
Date: Tue, 25 Sep 2012 20:11:14 +0000
Subject: [PATCH] HADOOP-8791. Merge change 1390109 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390110 13f79535-47bb-0310-9956-ffa450edef68
---
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/documentation/content/xdocs/file_system_shell.xml | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 114f5d22492..09e0c77453b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -35,6 +35,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8833. fs -text should make sure to call inputstream.seek(0)
before using input stream. (tomwhite and harsh)
+ HADOOP-8791. Fix rm command documentation to indicte it deletes
+ files and not directories. (Jing Zhao via suresh)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
index 6206a968a72..69a3ac292dc 100644
--- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
+++ b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
@@ -418,15 +418,15 @@
Usage: hdfs dfs -rm [-skipTrash] URI [URI …]
- Delete files specified as args. Only deletes non empty directory and files. If the -skipTrash
option
+ Delete files specified as args. Only deletes files. If the -skipTrash
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.
+ Use -rm -r or rmr for recursive deletes.
Example:
-
-
hdfs dfs -rm hdfs://nn.example.com/file /user/hadoop/emptydir
+ hdfs dfs -rm hdfs://nn.example.com/file
Exit Code:
@@ -442,7 +442,7 @@
Usage: hdfs dfs -rmr [-skipTrash] URI [URI …]
- Recursive version of delete. If the -skipTrash
option
+
Recursive version of delete. The rmr command recursively deletes the directory and any content under it. If the -skipTrash
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.
Example: