From e21c2ff5f13c40fee79d45d663c9918e2902a6d2 Mon Sep 17 00:00:00 2001
From: Amar Kamat <amarrk@apache.org>
Date: Tue, 22 Nov 2011 09:52:50 +0000
Subject: [PATCH]  MAPREDUCE-3412. Fix 'ant docs'. (amarrk)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204885 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                          | 2 ++
 hadoop-mapreduce-project/build.xml                            | 4 ----
 .../docs/src/documentation/content/xdocs/mapred_tutorial.xml  | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 2ee9c405ea..81d8960376 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -41,6 +41,8 @@ Trunk (unreleased changes)
     (tucu)
 
   BUG FIXES
+    MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
+
     MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null. 
                     (amarrk)
 
diff --git a/hadoop-mapreduce-project/build.xml b/hadoop-mapreduce-project/build.xml
index a8b4618268..9df60e98bb 100644
--- a/hadoop-mapreduce-project/build.xml
+++ b/hadoop-mapreduce-project/build.xml
@@ -932,10 +932,6 @@
     <style basedir="${mapred.src.dir}" destdir="${build.docs}"
            includes="mapred-default.xml" style="conf/configuration.xsl"/>
     <antcall target="changes-to-html"/>
-    <subant target="docs">
-       <property name="build.docs" value="${build.docs}"/>
-       <fileset file="${contrib.dir}/build.xml"/>
-    </subant> 
   </target>
 
   <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers">
diff --git a/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml b/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
index f7800bbec5..3167cbbcd1 100644
--- a/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
+++ b/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
@@ -2060,9 +2060,7 @@
           <p>Hadoop comes configured with a single mandatory queue, called 
           'default'. Queue names are defined in the 
           <code>mapred.queue.names</code> property of the Hadoop site
-          configuration. Some job schedulers, such as the 
-          <a href="capacity_scheduler.html">Capacity Scheduler</a>, 
-          support multiple queues.</p>
+          configuration.</p>
           
           <p>A job defines the queue it needs to be submitted to through the
           <code>mapreduce.job.queuename</code> property.