You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bu...@apache.org on 2016/04/14 13:13:29 UTC

svn commit: r985647 - in /websites/staging/slider/trunk/content: ./ design/registry/ design/specification/ developing/ docs/ docs/api/ docs/configuration/revision-1/ docs/slider_specs/

Author: buildbot
Date: Thu Apr 14 11:13:28 2016
New Revision: 985647

Log:
Staging update by buildbot for slider

Modified:
    websites/staging/slider/trunk/content/   (props changed)
    websites/staging/slider/trunk/content/design/registry/a_YARN_service_registry.html
    websites/staging/slider/trunk/content/design/registry/index.html
    websites/staging/slider/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.html
    websites/staging/slider/trunk/content/design/specification/index.html
    websites/staging/slider/trunk/content/design/specification/slider-model.html
    websites/staging/slider/trunk/content/developing/building.html
    websites/staging/slider/trunk/content/developing/demo.html
    websites/staging/slider/trunk/content/developing/functional_tests.html
    websites/staging/slider/trunk/content/developing/releasing.html
    websites/staging/slider/trunk/content/developing/releasing_process_v1.html
    websites/staging/slider/trunk/content/developing/style.html
    websites/staging/slider/trunk/content/developing/testing.html
    websites/staging/slider/trunk/content/developing/windows.html
    websites/staging/slider/trunk/content/docs/api/index.html
    websites/staging/slider/trunk/content/docs/api/slider_REST_api_v2.html
    websites/staging/slider/trunk/content/docs/client-configuration.html
    websites/staging/slider/trunk/content/docs/configuration/revision-1/redesign.html
    websites/staging/slider/trunk/content/docs/configuration/revision-1/specification.html
    websites/staging/slider/trunk/content/docs/examples.html
    websites/staging/slider/trunk/content/docs/getting_started.html
    websites/staging/slider/trunk/content/docs/manpage.html
    websites/staging/slider/trunk/content/docs/placement.html
    websites/staging/slider/trunk/content/docs/security.html
    websites/staging/slider/trunk/content/docs/slider_specs/application_definition.html
    websites/staging/slider/trunk/content/docs/slider_specs/application_needs.html
    websites/staging/slider/trunk/content/docs/slider_specs/application_pkg_upgrade.html

Propchange: websites/staging/slider/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 14 11:13:28 2016
@@ -1 +1 @@
-1738291
+1739054

Modified: websites/staging/slider/trunk/content/design/registry/a_YARN_service_registry.html
==============================================================================
--- websites/staging/slider/trunk/content/design/registry/a_YARN_service_registry.html (original)
+++ websites/staging/slider/trunk/content/design/registry/a_YARN_service_registry.html Thu Apr 14 11:13:28 2016
@@ -201,8 +201,8 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="april-2014">April 2014<a class="headerlink" href="#april-2014" title="Permanent link">&para;</a></h2>
 <h1 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h1>
 <p>This document looks at the needs and options of a service registry.</p>
-<p>The core issue is that as the location(s) of a dynamically deployed application are unknown, the standard Hadoop and Java configuration model of some form of text files containing hostnames, ports and URLS no longer works. You cannot define up-front where a service will be.</p>
-<p>Some Hadoop applications -HBase and Accumulo -have solved this with custom ZK bindings. This works for the specific clients, but requires hbase and accumulo client JARs in order to be able to work with the content. (or a re-implementation with knowledge of the non-standard contents of the ZK nodes)</p>
+<p>The core issue is that as the location(s) of a dynamically deployed application are unknown, the standard Apache Hadoop and Java configuration model of some form of text files containing hostnames, ports and URLS no longer works. You cannot define up-front where a service will be.</p>
+<p>Some applications -Apache HBase and Apache Accumulo -have solved this with custom ZK bindings. This works for the specific clients, but requires hbase and accumulo client JARs in order to be able to work with the content. (or a re-implementation with knowledge of the non-standard contents of the ZK nodes)</p>
 <p>Other YARN applications will need to publish their bindings - this includes, but is not limited to- Slider deployed applications. Again, these applications can use their own registration and binding model, which would again require custom clients to locate the registry information and parse the contents.</p>
 <p>YARN provides some minimal publishing of AM remote endpoints: a URL to what is assumed to be a Web UI (not a REST API), and an IPC port. The URL is displayed in the YARN UI -in which case it is accessed via a proxy which (currently) only support HTTP GET operations. The YARN API call to list all applications can be used to locate a named instance of an application by (user, application-type, name), and then obtain the raw URL and IPC endpoints. This enumeration process is an O(apps) operation on the YARN RM and only provides access to those two endpoints. Even with the RAW URL, REST operations have proven "troublesome", due to a web filter which redirects all direct requests to the proxy -unless it comes from the same host as the proxy.</p>
 <p>Hadoop client applications tend to retrieve all their configuration information from files in the local filesystem, hadoop-site.xml, hdfs-site.xml, hbase-site.xml, etc. This requires the configuration files to be present on all systems. Tools such as Ambari can keep the files in the server up to date -assuming a low rate of change- ---but these tools do nothing for the client applications themselves. It is up to the cluster clients to (somehow) retrieve these files, and to keep their copies up to date. <em>This is a problem that exists with today's applications</em>. </p>

Modified: websites/staging/slider/trunk/content/design/registry/index.html
==============================================================================
--- websites/staging/slider/trunk/content/design/registry/index.html (original)
+++ websites/staging/slider/trunk/content/design/registry/index.html Thu Apr 14 11:13:28 2016
@@ -204,7 +204,7 @@ service registry built into Apache Hadoo
 the YARN Resource Manager, security in a secure cluster, and other features.</p>
 <p>This registry , the "YARN-913" was implemented and tested by the Slider team, 
 so we are confident that it works for Slider as well as other applications. 
-Indeed, for the Hadoop 2.6 release, Slider was the functional test suite for
+Indeed, for the Apache Hadoop 2.6 release, Slider was the functional test suite for
 the registry.</p>
 <h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h2>
 <p>The service registry is a core part of the Slider Architecture -it is how

Modified: websites/staging/slider/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.html
==============================================================================
--- websites/staging/slider/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.html (original)
+++ websites/staging/slider/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.html Thu Apr 14 11:13:28 2016
@@ -216,7 +216,7 @@ or predicted. (Alternatively: if they ar
 <p>1: As components fail and get re-instantiated, their location may change. 
 The rate of this depends on cluster and application stability; the longer
  lived the application, the more common it is.</p>
-<p>Existing Hadoop client apps have a configuration problem of their own:
+<p>Existing Apache Hadoop client apps have a configuration problem of their own:
 how are the settings in files such as <code>yarn-site.xml</code>picked up by today's
 applications? This is an issue which has historically been out of scope
 for Hadoop clusters -but if we are looking at registration and binding

Modified: websites/staging/slider/trunk/content/design/specification/index.html
==============================================================================
--- websites/staging/slider/trunk/content/design/specification/index.html (original)
+++ websites/staging/slider/trunk/content/design/specification/index.html Thu Apr 14 11:13:28 2016
@@ -209,7 +209,7 @@ expected to result in failures, as well
 <p>Specifying the behavior has also helped identify areas where there was ambiguity,
 where clarification and more tests were needed.</p>
 <p>The specification depends on ongoing work in <a href="https://issues.apache.org/jira/browse/HADOOP-9361">HADOOP-9361</a>: 
-to define the Hadoop Filesytem APIs --This specification uses <a href="https://github.com/steveloughran/hadoop-trunk/blob/stevel/HADOOP-9361-filesystem-contract/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/notation.md">the same notation</a></p>
+to define the Apache Hadoop Filesytem APIs --This specification uses <a href="https://github.com/steveloughran/hadoop-trunk/blob/stevel/HADOOP-9361-filesystem-contract/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/notation.md">the same notation</a></p>
 <ol>
 <li><a href="slider-model.html">Model: YARN And Slider</a></li>
 <li><a href="cli-actions.html">CLI actions</a></li>

Modified: websites/staging/slider/trunk/content/design/specification/slider-model.html
==============================================================================
--- websites/staging/slider/trunk/content/design/specification/slider-model.html (original)
+++ websites/staging/slider/trunk/content/design/specification/slider-model.html Thu Apr 14 11:13:28 2016
@@ -200,7 +200,7 @@ h2:hover > .headerlink, h3:hover > .head
 <h1 id="formal-apache-slider-model">Formal Apache Slider Model<a class="headerlink" href="#formal-apache-slider-model" title="Permanent link">&para;</a></h1>
 <p>This is the model of Slider and YARN for the rest of the specification.</p>
 <h2 id="file-system">File System<a class="headerlink" href="#file-system" title="Permanent link">&para;</a></h2>
-<p>A File System <code>HDFS</code> represents a Hadoop FileSystem -either HDFS or another File
+<p>A File System <code>HDFS</code> represents a Apache Hadoop Compatible FileSystem -either HDFS or another File
 System which spans the cluster. There are also other filesystems that
 can act as sources of data that is then copied into HDFS. These will be marked
 as <code>FS</code> or with the generic <code>FileSystem</code> type.</p>

Modified: websites/staging/slider/trunk/content/developing/building.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/building.html (original)
+++ websites/staging/slider/trunk/content/developing/building.html Thu Apr 14 11:13:28 2016
@@ -205,11 +205,11 @@ h2:hover > .headerlink, h3:hover > .head
 of the local host working. Tests will fail without this. For maven builds to
 work, remote network access is often a pre-requisite.</p>
 <h3 id="java">Java<a class="headerlink" href="#java" title="Permanent link">&para;</a></h3>
-<p>Slider is built on Java 6 or later.</p>
+<p>Slider is built on Java 7 or later.</p>
 <h3 id="python">Python<a class="headerlink" href="#python" title="Permanent link">&para;</a></h3>
-<p>Slider requires python 2.6</p>
+<p>Slider requires python 2.7+</p>
 <h3 id="maven">Maven<a class="headerlink" href="#maven" title="Permanent link">&para;</a></h3>
-<p>You will need a version of Maven 3.0+, set up with enough memory</p>
+<p>You will need a version of Apache Maven 3.0+, set up with enough memory</p>
 <div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="p">=</span><span class="o">-</span><span class="n">Xms256m</span> <span class="o">-</span><span class="n">Xmx512m</span> <span class="o">-</span><span class="n">Djava</span><span class="p">.</span><span class="n">awt</span><span class="p">.</span><span class="n">headless</span><span class="p">=</span><span class="n">true</span>
 </pre></div>
 
@@ -245,8 +245,8 @@ You can run them based as described at <
 The build instructions below are optional and are proven to
 be useful when debugging deep into the hadoop code base.</em></strong></p>
 <hr />
-<h2 id="building-a-compatible-hadoop-version">Building a compatible Hadoop version<a class="headerlink" href="#building-a-compatible-hadoop-version" title="Permanent link">&para;</a></h2>
-<p>Slider is built against Hadoop 2 -you can download and install
+<h2 id="building-a-compatible-version-of-apache-hadoop">Building a compatible version of Apache Hadoop<a class="headerlink" href="#building-a-compatible-version-of-apache-hadoop" title="Permanent link">&para;</a></h2>
+<p>Slider is built against Apache Hadoop -you can download and install
 a copy from the <a href="http://hadoop.apache.org">Apache Hadoop Web Site</a>.</p>
 <p>During development, its convenient (but not mandatory)
 to have a local version of Hadoop -so that we can find and fix bugs/add features in

Modified: websites/staging/slider/trunk/content/developing/demo.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/demo.html (original)
+++ websites/staging/slider/trunk/content/developing/demo.html Thu Apr 14 11:13:28 2016
@@ -209,7 +209,7 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="preparation">Preparation<a class="headerlink" href="#preparation" title="Permanent link">&para;</a></h2>
 <p>Before starting the demo you need</p>
 <ol>
-<li>A Hadoop 2.6+ cluster, one node or greater</li>
+<li>An Apache Hadoop Hadoop 2.6+ cluster, one node or greater</li>
 <li>A local installation of the slider client (unzipped into a directory is sufficient)</li>
 <li>A <code>slider-client.xml</code> file containing the binding information for the Hadoop cluster</li>
 </ol>

Modified: websites/staging/slider/trunk/content/developing/functional_tests.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/functional_tests.html (original)
+++ websites/staging/slider/trunk/content/developing/functional_tests.html Thu Apr 14 11:13:28 2016
@@ -551,7 +551,7 @@ of containers. Edit the <code>slider.tes
 <li>
 <p>If you are testing in a local VM and stops responding, it'll have been
 swapped out to RAM. Rebooting can help, but for a long term fix go through
-all the Hadoop configurations (HDFS, YARN, Zookeeper) and set their heaps to
+all the Apache Hadoop configurations (HDFS, YARN, Zookeeper) and set their heaps to
 smaller numbers, like 256M each. Also: turn off unused services (hcat, oozie,
 webHDFS)</p>
 </li>

Modified: websites/staging/slider/trunk/content/developing/releasing.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/releasing.html (original)
+++ websites/staging/slider/trunk/content/developing/releasing.html Thu Apr 14 11:13:28 2016
@@ -274,9 +274,9 @@ modified version of your own, and that y
 included passwords or other test run details into the build resource
 tree.</p>
 <p>The <code>slider-funtest</code> functional test package is used to run functional
-tests against a running Hadoop YARN cluster. It needs to be configured
+tests against a running Apache Hadoop YARN cluster. It needs to be configured
 according to the instructions in <a href="/developing/testing.html">testing</a> to
-create HBase and Accumulo clusters in the YARN cluster.</p>
+create Apache HBase and Apache Accumulo clusters in the YARN cluster.</p>
 <p><em>Make sure that the integration tests are passing (and not being skipped) before
 starting to make a release</em></p>
 <div class="codehilite"><pre>mvn clean test integration-test -Dslider.conf.dir=<span class="cp">${</span><span class="n">your</span><span class="o">-</span><span class="n">config</span><span class="o">-</span><span class="nb">dir</span><span class="cp">}</span>

Modified: websites/staging/slider/trunk/content/developing/releasing_process_v1.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/releasing_process_v1.html (original)
+++ websites/staging/slider/trunk/content/developing/releasing_process_v1.html Thu Apr 14 11:13:28 2016
@@ -226,7 +226,7 @@ modified version of your own, and that y
 included passwords or other test run details into the build resource
 tree.</p>
 <p>The <code>slider-funtest</code> functional test package is used to run functional
-tests against a running Hadoop YARN cluster. It needs to be configured
+tests against a running Apache Hadoop YARN cluster. It needs to be configured
 according to the instructions in <a href="/developing/testing.html">testing</a> to
 create HBase and Accumulo clusters in the YARN cluster.</p>
 <p><em>Make sure that the integration tests are passing (and not being skipped) before

Modified: websites/staging/slider/trunk/content/developing/style.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/style.html (original)
+++ websites/staging/slider/trunk/content/developing/style.html Thu Apr 14 11:13:28 2016
@@ -195,7 +195,7 @@ h2:hover > .headerlink, h3:hover > .head
 -->
 
 <h1 id="slider-code-style-rules">Slider Code Style Rules<a class="headerlink" href="#slider-code-style-rules" title="Permanent link">&para;</a></h1>
-<p>The [Hadoop Guidelines|https://wiki.apache.org/hadoop/CodeReviewChecklist] apply to the slider code
+<p>The [Apache Hadoop Guidelines|https://wiki.apache.org/hadoop/CodeReviewChecklist] apply to the slider code
 with some minor changes</p>
 <h3 id="all">All<a class="headerlink" href="#all" title="Permanent link">&para;</a></h3>
 <ul>

Modified: websites/staging/slider/trunk/content/developing/testing.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/testing.html (original)
+++ websites/staging/slider/trunk/content/developing/testing.html Thu Apr 14 11:13:28 2016
@@ -207,7 +207,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 <h2 id="standalone-tests">Standalone Tests<a class="headerlink" href="#standalone-tests" title="Permanent link">&para;</a></h2>
 <p>Slider core contains a suite of tests that are designed to run on the local machine,
-using Hadoop's <code>MiniDFSCluster</code> and <code>MiniYARNCluster</code> classes to create small,
+using Apache Hadoop's <code>MiniDFSCluster</code> and <code>MiniYARNCluster</code> classes to create small,
 one-node test clusters. All the YARN/HDFS code runs in the JUnit process; the
 AM and spawned processes run independently.</p>
   </div>

Modified: websites/staging/slider/trunk/content/developing/windows.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/windows.html (original)
+++ websites/staging/slider/trunk/content/developing/windows.html Thu Apr 14 11:13:28 2016
@@ -233,7 +233,7 @@ is "private", then edit the firewall to
 <li>Java 7+</li>
 <li>Python 2.7</li>
 <li>OpenSSL</li>
-<li>Everything Hadoop's <code>BUILDING.TXT</code> needs. This includes the cygwin tools, protoc,
+<li>Everything Apache Hadoop's <code>BUILDING.TXT</code> needs. This includes the cygwin tools, protoc,
 python and more. If you cannot build Hadoop from the <code>Windows SDK Command Prompt</code>
 then don't proceed.</li>
 <li>JEdit is a good text editor for developing and editing simple files.</li>

Modified: websites/staging/slider/trunk/content/docs/api/index.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/api/index.html (original)
+++ websites/staging/slider/trunk/content/docs/api/index.html Thu Apr 14 11:13:28 2016
@@ -195,9 +195,10 @@ h2:hover > .headerlink, h3:hover > .head
 -->
 
 <h1 id="slider-rest-apis">Slider REST APIs<a class="headerlink" href="#slider-rest-apis" title="Permanent link">&para;</a></h1>
+<p>Slider has a REST API to query the state of the application.</p>
 <ul>
 <li><a href="slider_REST_v1.html">REST API v1</a>: Implemented in Slider 0.60</li>
-<li><a href="slider_REST_api_v2.html">REST API v2</a>: V2 API</li>
+<li><a href="slider_REST_api_v2.html">REST API v2</a>: V2 API, Slider 0.80+</li>
 </ul>
   </div>
 

Modified: websites/staging/slider/trunk/content/docs/api/slider_REST_api_v2.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/api/slider_REST_api_v2.html (original)
+++ websites/staging/slider/trunk/content/docs/api/slider_REST_api_v2.html Thu Apr 14 11:13:28 2016
@@ -209,7 +209,7 @@ h2:hover > .headerlink, h3:hover > .head
 <li>Created: January 2014</li>
 </ol>
 <h1 id="introduction-and-background">Introduction and Background<a class="headerlink" href="#introduction-and-background" title="Permanent link">&para;</a></h1>
-<p>Slider 0.60 uses Hadoop IPC for communications between the Slider client and the per-instance application master,
+<p>Slider 0.60 uses Apache Hadoop IPC for communications between the Slider client and the per-instance application master,
 with a READ-only JSON view of the cluster, as documented in the <a href="slider_REST_v1.html">Slider v1 REST API</a></p>
 <p>Were Slider to support a read/write REST API, it would be possible to:</p>
 <ol>

Modified: websites/staging/slider/trunk/content/docs/client-configuration.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/client-configuration.html (original)
+++ websites/staging/slider/trunk/content/docs/client-configuration.html Thu Apr 14 11:13:28 2016
@@ -203,7 +203,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The client application can be configured</p>
 <ol>
 <li>On the command line, which can set client options and JVM system properties.</li>
-<li>With Hadoop-style configuration options in the file <code>slider-client.xml</code>
+<li>With Apache Hadoop XML configuration options in the file <code>slider-client.xml</code>
  in the configuration directory<code>conf/</code> dir</li>
 <li>Or, if the environment variable <code>SLIDER_CONF_DIR</code> is set, in the
  file <code>$SLIDER_CONF_DIR/slider-client.xml</code></li>

Modified: websites/staging/slider/trunk/content/docs/configuration/revision-1/redesign.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/configuration/revision-1/redesign.html (original)
+++ websites/staging/slider/trunk/content/docs/configuration/revision-1/redesign.html Thu Apr 14 11:13:28 2016
@@ -215,7 +215,7 @@ was queried, marshalled over the network
 </ol>
 <p>Initially the dynamic status included a complete history of all containers
 -this soon highlit some restrictions on the maximum size of a JSON-formatted
-string in Hadoop's "classic" RPC: 32K, after which the string was silently
+string in Apache Hadoop's "classic" RPC: 32K, after which the string was silently
 truncated. Accordingly, this history was dropped.</p>
 <p>Having moved to Protocol Buffers as the IPC wire format, with a web view
 alongside, this history could be reconsidered.</p>

Modified: websites/staging/slider/trunk/content/docs/configuration/revision-1/specification.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/configuration/revision-1/specification.html (original)
+++ websites/staging/slider/trunk/content/docs/configuration/revision-1/specification.html Thu Apr 14 11:13:28 2016
@@ -480,7 +480,7 @@ information about the running applicatio
 <li>
 <p>information about the application and hadoop versions in use. Here
   the application was built using Hadoop 2.3.0, but is running against the version
-  of Hadoop built for HDP-2.</p>
+  of Apache Hadoop built for HDP-2.</p>
 <div class="codehilite"><pre>&quot;<span class="n">status</span><span class="p">.</span><span class="n">application</span><span class="p">.</span><span class="n">build</span><span class="p">.</span><span class="n">info</span>&quot; <span class="p">:</span> &quot;<span class="n">Slider</span> <span class="n">Core</span><span class="o">-</span>0<span class="p">.</span>13<span class="p">.</span>0<span class="o">-</span><span class="n">SNAPSHOT</span> <span class="n">Built</span> <span class="n">against</span> <span class="n">commit</span># 1<span class="n">a94ee4aa1</span> <span class="n">on</span> <span class="n">Java</span> 1<span class="p">.</span>7<span class="p">.</span>0<span class="n">_45</span> <span class="n">by</span> <span class="n">stevel</span>&quot;<span class="p">,</span>
 &quot;<span class="n">status</span><span class="p">.</span><span class="n">hadoop</span><span class="p">.</span><span class="n">build</span><span class="p">.</span><span class="n">info</span>&quot; <span class="p">:</span> &quot;2<span class="p">.</span>3<span class="p">.</span>0&quot;<span class="p">,</span>
 &quot;<span class="n">status</span><span class="p">.</span><span class="n">hadoop</span><span class="p">.</span><span class="n">deployed</span><span class="p">.</span><span class="n">info</span>&quot; <span class="p">:</span> &quot;<span class="n">bigwheel</span><span class="o">-</span><span class="n">m16</span><span class="o">-</span>2<span class="p">.</span>2<span class="p">.</span>0 <span class="p">@</span>704<span class="n">f1e463ebc4fb89353011407e965</span>&quot;

Modified: websites/staging/slider/trunk/content/docs/examples.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/examples.html (original)
+++ websites/staging/slider/trunk/content/docs/examples.html Thu Apr 14 11:13:28 2016
@@ -202,7 +202,7 @@ h2:hover > .headerlink, h3:hover > .head
 To use the HBase application package refer to <a href="/docs/getting_started.html">Getting Started</a>.</p>
 <h2 id="setup">Setup<a class="headerlink" href="#setup" title="Permanent link">&para;</a></h2>
 <h3 id="setting-up-a-yarn-cluster">Setting up a YARN cluster<a class="headerlink" href="#setting-up-a-yarn-cluster" title="Permanent link">&para;</a></h3>
-<p>For simple local demos, a Hadoop pseudo-distributed cluster will suffice -if on a VM then
+<p>For simple local demos, a pseudo-distributed Apache Hadoop cluster will suffice -if on a VM then
 its configuration should be changed to use a public (machine public) IP.</p>
 <h1 id="the-examples-below-all-assume-there-is-a-cluster-node-called-master-which">The examples below all assume there is a cluster node called 'master', which<a class="headerlink" href="#the-examples-below-all-assume-there-is-a-cluster-node-called-master-which" title="Permanent link">&para;</a></h1>
 <p>hosts the HDFS NameNode and the YARN Resource Manager</p>

Modified: websites/staging/slider/trunk/content/docs/getting_started.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/getting_started.html (original)
+++ websites/staging/slider/trunk/content/docs/getting_started.html Thu Apr 14 11:13:28 2016
@@ -231,7 +231,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The Slider deployment has the following minimum system requirements:</p>
 <ul>
 <li>
-<p>Hadoop 2.6+</p>
+<p>Apache Hadoop Hadoop 2.6+</p>
 </li>
 <li>
 <p>Required Services: HDFS, YARN and ZooKeeper</p>

Modified: websites/staging/slider/trunk/content/docs/manpage.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/manpage.html (original)
+++ websites/staging/slider/trunk/content/docs/manpage.html Thu Apr 14 11:13:28 2016
@@ -763,7 +763,7 @@ the request: this will appear in the app
 
 <h3 id="version"><code>version</code><a class="headerlink" href="#version" title="Permanent link">&para;</a></h3>
 <p>The command <code>slider version</code> prints out information about the compiled
-Slider application, the version of Hadoop against which it was built -and
+Slider application, the version of Apache Hadoop against which it was built -and
 the version of Hadoop that is currently on its classpath.</p>
 <p>Note that this is the client-side Hadoop version, not that running on the server, though
 that can be obtained in the status operation</p>

Modified: websites/staging/slider/trunk/content/docs/placement.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/placement.html (original)
+++ websites/staging/slider/trunk/content/docs/placement.html Thu Apr 14 11:13:28 2016
@@ -215,7 +215,7 @@ the cluster. For details on the implemen
 <h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h2>
 <p>A Slider Application Instance consists of the Application Master —Slider's code— and
 the components requested in the <code>resources.json</code> file. For each component,
-Slider requests a new YARN Container, which is then allocated in the Hadoop cluster
+Slider requests a new YARN Container, which is then allocated in the Apache Hadoop cluster
 by YARN. The Slider application starts the component within the container,
 and monitors its lifecycle.</p>
 <p>The choice of where a container is created is something in which YARN and

Modified: websites/staging/slider/trunk/content/docs/security.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/security.html (original)
+++ websites/staging/slider/trunk/content/docs/security.html Thu Apr 14 11:13:28 2016
@@ -199,7 +199,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 <h1 id="apache-slider-security">Apache Slider Security<a class="headerlink" href="#apache-slider-security" title="Permanent link">&para;</a></h1>
 <p>This document discusses the design, implementation and use of Slider
-to deploy secure applications on a secure Hadoop cluster.</p>
+to deploy secure applications on a secure Apache Hadoop cluster.</p>
 <h3 id="important">Important:<a class="headerlink" href="#important" title="Permanent link">&para;</a></h3>
 <p>This document does not cover Kerberos, how to secure a Hadoop cluster, Kerberos
 command line tools or how Hadoop uses delegation tokens to delegate permissions

Modified: websites/staging/slider/trunk/content/docs/slider_specs/application_definition.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/slider_specs/application_definition.html (original)
+++ websites/staging/slider/trunk/content/docs/slider_specs/application_definition.html Thu Apr 14 11:13:28 2016
@@ -213,7 +213,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p><strong>type</strong>: the type of the application. "YARN-APP" identifies an application definition suitable for YARN.</p>
 </li>
 <li>
-<p><strong>minHadoopVersion</strong>: the minimum version of hadoop on which the app can run</p>
+<p><strong>minHadoopVersion</strong>: the minimum version of Apache Hadoop on which the app can run</p>
 </li>
 <li>
 <p><strong>components</strong>: the list of component that the application is comprised of</p>

Modified: websites/staging/slider/trunk/content/docs/slider_specs/application_needs.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/slider_specs/application_needs.html (original)
+++ websites/staging/slider/trunk/content/docs/slider_specs/application_needs.html Thu Apr 14 11:13:28 2016
@@ -242,7 +242,7 @@ container requests this will no longer b
 <p>Be trusted. YARN does not run code in a sandbox.</p>
 </li>
 <li>
-<p>If it talks to HDFS or other parts of Hadoop, be built against/ship with
+<p>If it talks to HDFS or other parts of Apache Hadoop, be built against/ship with
 libaries compatible with the version of Hadoop running on the cluster.</p>
 </li>
 <li>

Modified: websites/staging/slider/trunk/content/docs/slider_specs/application_pkg_upgrade.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/slider_specs/application_pkg_upgrade.html (original)
+++ websites/staging/slider/trunk/content/docs/slider_specs/application_pkg_upgrade.html Thu Apr 14 11:13:28 2016
@@ -219,7 +219,7 @@ Automated application package upgrade wi
 <p>Does not affect running Slider apps at all. New version of client can co-exist with older versions of client.</p>
 <h4 id="slider-application-master-upgradedowngrade-of-running-applications">Slider Application Master upgrade/downgrade of running applications<a class="headerlink" href="#slider-application-master-upgradedowngrade-of-running-applications" title="Permanent link">&para;</a></h4>
 <p>Applications started prior to the start of YARN core upgrade/downgrade, will continue to run with the 
-older versions of Slider core and Hadoop libraries. There is no support for rolling upgrade of Slider AM.
+older versions of Apache Slider core and Apache Hadoop libraries. There is no support for rolling upgrade of Slider AM.
 To upgrade running Slider AMs, the application needs to be stopped and restarted with the new version
 of the client.</p>
 <h4 id="applications-deployed-by-slider-binaries-and-configurations-upgradedowngrade">Applications deployed by Slider (binaries and configurations) upgrade/downgrade<a class="headerlink" href="#applications-deployed-by-slider-binaries-and-configurations-upgradedowngrade" title="Permanent link">&para;</a></h4>