HADOOP-10602. Merging change r1598337 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 17:33:10 +00:00 · 2014-05-29 17:33:10 +00:00 · 7895ecccac
parent 99c0324937
commit 7895ecccac
24 changed files with 3 additions and 57 deletions
--- a/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
+++ b/hadoop-common-project/hadoop-auth/src/site/apt/BuildingIt.apt.vm
@ -18,8 +18,6 @@

 Hadoop Auth, Java HTTP SPNEGO ${project.version} - Building It

-  \[ {{{./index.html}Go Back}} \]
-
 * Requirements

  * Java 6+
@ -70,6 +68,3 @@ $ mvn package -Pdocs

  The generated documentation is available at
  <<<hadoop-auth/target/site/>>>.
-
-  \[ {{{./index.html}Go Back}} \]
-
--- a/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
+++ b/hadoop-common-project/hadoop-auth/src/site/apt/Configuration.apt.vm
@ -20,8 +20,6 @@
 Hadoop Auth, Java HTTP SPNEGO ${project.version} - Server Side
 Configuration

-  \[ {{{./index.html}Go Back}} \]
-
 * Server Side Configuration Setup

  The AuthenticationFilter filter is Hadoop Auth's server side component.
@ -241,5 +239,3 @@ Configuration
    ...
 </web-app>
 +---+
-
-  \[ {{{./index.html}Go Back}} \]
--- a/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
+++ b/hadoop-common-project/hadoop-auth/src/site/apt/Examples.apt.vm
@ -18,8 +18,6 @@

 Hadoop Auth, Java HTTP SPNEGO ${project.version} - Examples

-  \[ {{{./index.html}Go Back}} \]
-
 * Accessing a Hadoop Auth protected URL Using a browser

  <<IMPORTANT:>> The browser must support HTTP Kerberos SPNEGO. For example,
@ -133,5 +131,3 @@ You are: user[tucu] principal[tucu@LOCALHOST]
 ....

 +---+
-
-  \[ {{{./index.html}Go Back}} \]
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -156,6 +156,9 @@ Release 2.5.0 - UNRELEASED
    HADOOP-10625. Trim configuration names when putting/getting them
    to properties. (Wangda Tan via xgong)

+    HADOOP-10489. Documentation has broken "Go Back" hyperlinks.
+    (Akira AJISAKA via cnauroth)
+
 Release 2.4.1 - UNRELEASED

  INCOMPATIBLE CHANGES
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm
@ -18,8 +18,6 @@

 Hadoop HDFS over HTTP ${project.version} - Server Setup

-  \[ {{{./index.html}Go Back}} \]
-
  This page explains how to quickly setup HttpFS with Pseudo authentication
  against a Hadoop cluster with Pseudo authentication.

@ -159,5 +157,3 @@ $ keytool -genkey -alias tomcat -keyalg RSA
  <<<swebhdfs://>>> scheme. Make sure the JVM is picking up the truststore
  containing the public key of the SSL certificate if using a self-signed
  certificate.
-
-  \[ {{{./index.html}Go Back}} \]
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/UsingHttpTools.apt.vm
@ -18,8 +18,6 @@

 Hadoop HDFS over HTTP ${project.version} - Using HTTP Tools

-  \[ {{{./index.html}Go Back}} \]
-
 * Security

  Out of the box HttpFS supports both pseudo authentication and Kerberos HTTP
@ -87,5 +85,3 @@ $ curl --negotiate -u foo -c ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v
 +---+
 $ curl -b ~/.httpfsauth "http://<HTTPFS_HOST>:14000/webhdfs/v1?op=liststatus"
 +---+
-
-  \[ {{{./index.html}Go Back}} \]
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/CentralizedCacheManagement.apt.vm
@ -18,8 +18,6 @@

 Centralized Cache Management in HDFS

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=2|toDepth=4}

 * {Overview}
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm
@ -19,8 +19,6 @@

 HDFS NFS Gateway

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * {Overview}
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ViewFs.apt.vm
@ -18,8 +18,6 @@

 ViewFs Guide

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * {Introduction}
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/DistributedCacheDeploy.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/DistributedCacheDeploy.apt.vm
@ -18,8 +18,6 @@

 Hadoop MapReduce Next Generation - Distributed Cache Deploy

-  \[ {{{./index.html}Go Back}} \]
-
 * Introduction

  The MapReduce application framework has rudimentary support for deploying a
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/EncryptedShuffle.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/EncryptedShuffle.apt.vm
@ -18,8 +18,6 @@

 Hadoop MapReduce Next Generation - Encrypted Shuffle

-  \[ {{{./index.html}Go Back}} \]
-
 * {Introduction}

  The Encrypted Shuffle capability allows encryption of the MapReduce shuffle
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/MapReduce_Compatibility_Hadoop1_Hadoop2.apt.vm
@ -18,8 +18,6 @@

 Apache Hadoop MapReduce - Migrating from Apache Hadoop 1.x to Apache Hadoop 2.x 

-  \[ {{{../../hadoop-yarn/hadoop-yarn-site/index.html}Go Back}} \]
-
 * {Introduction}

  This document provides information for users to migrate their Apache Hadoop 
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/PluggableShuffleAndPluggableSort.apt.vm
@ -18,8 +18,6 @@

 Hadoop MapReduce Next Generation - Pluggable Shuffle and Pluggable Sort

-  \[ {{{./index.html}Go Back}} \]
-
 * Introduction

  The pluggable shuffle and pluggable sort capabilities allow replacing the 
--- a/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
+++ b/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
@ -18,8 +18,6 @@

 Yarn Scheduler Load Simulator (SLS)

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm
@ -18,8 +18,6 @@

 Hadoop MapReduce Next Generation - Capacity Scheduler

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * {Purpose} 
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
@ -18,8 +18,6 @@

 Hadoop MapReduce Next Generation - Fair Scheduler

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * {Purpose} 
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManager.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManager.apt.vm
@ -18,8 +18,6 @@

 NodeManager Overview.

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0|toDepth=2}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm
@ -18,8 +18,6 @@

 NodeManager REST API's.

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0|toDepth=2}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerHA.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerHA.apt.vm
@ -18,8 +18,6 @@

 ResourceManager High Availability

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * Introduction
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
@ -18,8 +18,6 @@

 ResourceManager REST API's.

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0|toDepth=2}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
@ -18,8 +18,6 @@

 YARN Timeline Server

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0|toDepth=3}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm
@ -18,8 +18,6 @@

 Hadoop YARN - Introduction to the web services REST API's.

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * Overview
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WritingYarnApplications.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WritingYarnApplications.apt.vm
@ -19,8 +19,6 @@

 Hadoop MapReduce Next Generation - Writing YARN Applications

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * Purpose 
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
@ -18,8 +18,6 @@

 Yarn Commands

-  \[ {{{./index.html}Go Back}} \]
-
 %{toc|section=1|fromDepth=0}

 * Overview