MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c543084 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c543084 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c543084 Branch: refs/heads/YARN-1051 Commit: 6c543084238992351a4ab677eae23695763dc1d4 Parents: f614cb7 Author: Allen Wittenauer <[email protected]> Authored: Thu Sep 25 11:31:48 2014 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Thu Sep 25 11:31:48 2014 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../src/site/markdown/DistCp.md.vm | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c543084/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1ac32aa..d53e748 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -375,6 +375,8 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) + MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c543084/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm index 3e8de4f..447e515 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm @@ -119,13 +119,13 @@ $H3 Basic Usage $H3 Update and Overwrite `-update` is used to copy files from source that don't exist at the target - or differ than the target version. `-overwrite` overwrites target-files that + or differ from the target version. `-overwrite` overwrites target-files that exist at the target. - Update and Overwrite options warrant special attention, since their handling - of source-paths varies from the defaults in a very subtle manner. Consider a - copy from `/source/first/` and `/source/second/` to `/target/`, where the - source paths have the following contents: + The Update and Overwrite options warrant special attention since their + handling of source-paths varies from the defaults in a very subtle manner. + Consider a copy from `/source/first/` and `/source/second/` to `/target/`, + where the source paths have the following contents: hdfs://nn1:8020/source/first/1 hdfs://nn1:8020/source/first/2
