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

svn commit: r1739054 - in /incubator/slider/site/trunk/content: design/registry/ design/specification/ developing/ docs/ docs/api/ docs/configuration/revision-1/ docs/slider_specs/

Author: stevel
Date: Thu Apr 14 11:13:12 2016
New Revision: 1739054

URL: http://svn.apache.org/viewvc?rev=1739054&view=rev
Log:
Use Apache Hadoop as first reference to Hadoop in each md file

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

Modified: incubator/slider/site/trunk/content/design/registry/a_YARN_service_registry.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/design/registry/a_YARN_service_registry.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/design/registry/a_YARN_service_registry.md (original)
+++ incubator/slider/site/trunk/content/design/registry/a_YARN_service_registry.md Thu Apr 14 11:13:12 2016
@@ -23,9 +23,9 @@
 
 This document looks at the needs and options of a service registry.
 
-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.
+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.
 
-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)
+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)
 
 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.
 

Modified: incubator/slider/site/trunk/content/design/registry/index.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/design/registry/index.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/design/registry/index.md (original)
+++ incubator/slider/site/trunk/content/design/registry/index.md Thu Apr 14 11:13:12 2016
@@ -26,7 +26,7 @@ the YARN Resource Manager, security in a
 
 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.
 
 ## Introduction

Modified: incubator/slider/site/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.md (original)
+++ incubator/slider/site/trunk/content/design/registry/the_YARN_application_registration_and_binding_problem.md Thu Apr 14 11:13:12 2016
@@ -35,7 +35,7 @@ or predicted. (Alternatively: if they ar
 The rate of this depends on cluster and application stability; the longer
  lived the application, the more common it is.
 
-Existing Hadoop client apps have a configuration problem of their own:
+Existing Apache Hadoop client apps have a configuration problem of their own:
 how are the settings in files such as `yarn-site.xml`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: incubator/slider/site/trunk/content/design/specification/index.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/design/specification/index.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/design/specification/index.md (original)
+++ incubator/slider/site/trunk/content/design/specification/index.md Thu Apr 14 11:13:12 2016
@@ -31,7 +31,7 @@ Specifying the behavior has also helped
 where clarification and more tests were needed.
  
 The specification depends on ongoing work in [HADOOP-9361](https://issues.apache.org/jira/browse/HADOOP-9361): 
-to define the Hadoop Filesytem APIs --This specification uses [the same notation](https://github.com/steveloughran/hadoop-trunk/blob/stevel/HADOOP-9361-filesystem-contract/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/notation.md)
+to define the Apache Hadoop Filesytem APIs --This specification uses [the same notation](https://github.com/steveloughran/hadoop-trunk/blob/stevel/HADOOP-9361-filesystem-contract/hadoop-common-project/hadoop-common/src/site/markdown/filesystem/notation.md)
 
  
 1. [Model: YARN And Slider](slider-model.html)

Modified: incubator/slider/site/trunk/content/design/specification/slider-model.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/design/specification/slider-model.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/design/specification/slider-model.md (original)
+++ incubator/slider/site/trunk/content/design/specification/slider-model.md Thu Apr 14 11:13:12 2016
@@ -21,7 +21,7 @@ This is the model of Slider and YARN for
 
 ## File System
 
-A File System `HDFS` represents a Hadoop FileSystem -either HDFS or another File
+A File System `HDFS` 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 `FS` or with the generic `FileSystem` type.

Modified: incubator/slider/site/trunk/content/developing/building.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/building.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/building.md (original)
+++ incubator/slider/site/trunk/content/developing/building.md Thu Apr 14 11:13:12 2016
@@ -30,15 +30,15 @@ work, remote network access is often a p
 
 ### Java 
 
-Slider is built on Java 6 or later.
+Slider is built on Java 7 or later.
 
 ### Python
 
-Slider requires python 2.6
+Slider requires python 2.7+
 
 ### Maven
 
-You will need a version of Maven 3.0+, set up with enough memory
+You will need a version of Apache Maven 3.0+, set up with enough memory
 
     MAVEN_OPTS=-Xms256m -Xmx512m -Djava.awt.headless=true
 
@@ -63,9 +63,9 @@ Download the source tarball for the rele
 `git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git -b develop`
 
 ### Build, install and run unit tests
-    
+
      mvn clean install
-     
+
 Slider code base includes unit tests and functional tests. 
 By default functional tests are not run as these tests are developed to be run
 against live hadoop clusters and require some manual setup. 
@@ -84,10 +84,10 @@ be useful when debugging deep into the h
 ----------------
 
 
-## Building a compatible Hadoop version
+## Building a compatible version of Apache Hadoop
 
 
-Slider is built against Hadoop 2 -you can download and install
+Slider is built against Apache Hadoop -you can download and install
 a copy from the [Apache Hadoop Web Site](http://hadoop.apache.org).
 
 

Modified: incubator/slider/site/trunk/content/developing/demo.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/demo.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/demo.md (original)
+++ incubator/slider/site/trunk/content/developing/demo.md Thu Apr 14 11:13:12 2016
@@ -31,7 +31,7 @@ It does not cover
 
 Before starting the demo you need
 
-1. A Hadoop 2.6+ cluster, one node or greater
+1. An Apache Hadoop Hadoop 2.6+ cluster, one node or greater
 1. A local installation of the slider client (unzipped into a directory is sufficient)
 1. A `slider-client.xml` file containing the binding information for the Hadoop cluster
 

Modified: incubator/slider/site/trunk/content/developing/functional_tests.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/functional_tests.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/functional_tests.md (original)
+++ incubator/slider/site/trunk/content/developing/functional_tests.md Thu Apr 14 11:13:12 2016
@@ -385,7 +385,7 @@ of containers. Edit the `slider.test.yar
 
 1. 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)
 

Modified: incubator/slider/site/trunk/content/developing/releasing.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/releasing.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/releasing.md (original)
+++ incubator/slider/site/trunk/content/developing/releasing.md Thu Apr 14 11:13:12 2016
@@ -112,9 +112,9 @@ included passwords or other test run det
 tree.
 
 The `slider-funtest` 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 [testing](/developing/testing.html) to
-create HBase and Accumulo clusters in the YARN cluster.
+create Apache HBase and Apache Accumulo clusters in the YARN cluster.
 
 
 *Make sure that the integration tests are passing (and not being skipped) before

Modified: incubator/slider/site/trunk/content/developing/releasing_process_v1.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/releasing_process_v1.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/releasing_process_v1.md (original)
+++ incubator/slider/site/trunk/content/developing/releasing_process_v1.md Thu Apr 14 11:13:12 2016
@@ -57,7 +57,7 @@ included passwords or other test run det
 tree.
 
 The `slider-funtest` 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 [testing](/developing/testing.html) to
 create HBase and Accumulo clusters in the YARN cluster.
 

Modified: incubator/slider/site/trunk/content/developing/style.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/style.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/style.md (original)
+++ incubator/slider/site/trunk/content/developing/style.md Thu Apr 14 11:13:12 2016
@@ -15,7 +15,7 @@
 # Slider Code Style Rules
 
 
-The [Hadoop Guidelines|https://wiki.apache.org/hadoop/CodeReviewChecklist] apply to the slider code
+The [Apache Hadoop Guidelines|https://wiki.apache.org/hadoop/CodeReviewChecklist] apply to the slider code
 with some minor changes
 
 ### All
@@ -54,4 +54,3 @@ Obscure bits of Groovy to avoid
 * Versions of artifacts (and template dependency definitions) MUST go into the root `slider/pom.xml`; individual modules MUST then repeat the dependency declaration, *excluding version and exclusion details*. This is to keep versions consistent across the project.
 
 
- 
\ No newline at end of file

Modified: incubator/slider/site/trunk/content/developing/testing.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/testing.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/testing.md (original)
+++ incubator/slider/site/trunk/content/developing/testing.md Thu Apr 14 11:13:12 2016
@@ -25,6 +25,6 @@
 ## Standalone Tests
 
 Slider core contains a suite of tests that are designed to run on the local machine,
-using Hadoop's `MiniDFSCluster` and `MiniYARNCluster` classes to create small,
+using Apache Hadoop's `MiniDFSCluster` and `MiniYARNCluster` 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.

Modified: incubator/slider/site/trunk/content/developing/windows.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/windows.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/windows.md (original)
+++ incubator/slider/site/trunk/content/developing/windows.md Thu Apr 14 11:13:12 2016
@@ -57,7 +57,7 @@ is "private", then edit the firewall to
 1. Java 7+
 1. Python 2.7
 1. OpenSSL
-1. Everything Hadoop's `BUILDING.TXT` needs. This includes the cygwin tools, protoc,
+1. Everything Apache Hadoop's `BUILDING.TXT` needs. This includes the cygwin tools, protoc,
 python and more. If you cannot build Hadoop from the `Windows SDK Command Prompt`
 then don't proceed.
 1. JEdit is a good text editor for developing and editing simple files.
@@ -208,4 +208,4 @@ Verify that the binaries are there
      hadoop checknative -a
           
 This should report the hadoop binaries, even if it warns about missing
-compression libraries
\ No newline at end of file
+compression libraries

Modified: incubator/slider/site/trunk/content/docs/api/index.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/api/index.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/api/index.md (original)
+++ incubator/slider/site/trunk/content/docs/api/index.md Thu Apr 14 11:13:12 2016
@@ -14,7 +14,7 @@
   
 # Slider REST APIs
 
+Slider has a REST API to query the state of the application.
 
 * [REST API v1](slider_REST_v1.html): Implemented in Slider 0.60
-* [REST API v2](slider_REST_api_v2.html): V2 API
- 
\ No newline at end of file
+* [REST API v2](slider_REST_api_v2.html): V2 API, Slider 0.80+

Modified: incubator/slider/site/trunk/content/docs/api/slider_REST_api_v2.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/api/slider_REST_api_v2.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/api/slider_REST_api_v2.md (original)
+++ incubator/slider/site/trunk/content/docs/api/slider_REST_api_v2.md Thu Apr 14 11:13:12 2016
@@ -29,7 +29,7 @@ This document represents the third itera
 
 # Introduction and Background
 
-Slider 0.60 uses Hadoop IPC for communications between the Slider client and the per-instance application master,
+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 [Slider v1 REST API](slider_REST_v1.html)
 
 Were Slider to support a read/write REST API, it would be possible to:
@@ -594,4 +594,4 @@ Any new liveness probes will supplement
 The statistics will cover the collected statistics on a component type, as well
 as aggregate statistics on an application instance.
 
-When an Application Master is restarted, all statistics will be lost.
\ No newline at end of file
+When an Application Master is restarted, all statistics will be lost.

Modified: incubator/slider/site/trunk/content/docs/client-configuration.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/client-configuration.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/client-configuration.md (original)
+++ incubator/slider/site/trunk/content/docs/client-configuration.md Thu Apr 14 11:13:12 2016
@@ -24,7 +24,7 @@ This document covers how the client appl
 The client application can be configured
 
 1. On the command line, which can set client options and JVM system properties.
-2. With Hadoop-style configuration options in the file `slider-client.xml`
+2. With Apache Hadoop XML configuration options in the file `slider-client.xml`
  in the configuration directory`conf/` dir
 2. Or, if the environment variable `SLIDER_CONF_DIR` is set, in the
  file `$SLIDER_CONF_DIR/slider-client.xml`

Modified: incubator/slider/site/trunk/content/docs/configuration/revision-1/redesign.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/configuration/revision-1/redesign.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/configuration/revision-1/redesign.md (original)
+++ incubator/slider/site/trunk/content/docs/configuration/revision-1/redesign.md Thu Apr 14 11:13:12 2016
@@ -39,7 +39,7 @@ was queried, marshalled over the network
 
 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.
 
 Having moved to Protocol Buffers as the IPC wire format, with a web view

Modified: incubator/slider/site/trunk/content/docs/configuration/revision-1/specification.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/configuration/revision-1/specification.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/configuration/revision-1/specification.md (original)
+++ incubator/slider/site/trunk/content/docs/configuration/revision-1/specification.md Thu Apr 14 11:13:12 2016
@@ -329,7 +329,7 @@ Here are some standard values
       
 *  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.
+  of Apache Hadoop built for HDP-2.
   
         "status.application.build.info" : "Slider Core-0.13.0-SNAPSHOT Built against commit# 1a94ee4aa1 on Java 1.7.0_45 by stevel",
         "status.hadoop.build.info" : "2.3.0",
@@ -510,4 +510,4 @@ Client configuration file retrieval is b
 status operation merely lists files that are available;
 
 
-### Aggregate Example
\ No newline at end of file
+### Aggregate Example

Modified: incubator/slider/site/trunk/content/docs/examples.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/examples.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/examples.md (original)
+++ incubator/slider/site/trunk/content/docs/examples.md Thu Apr 14 11:13:12 2016
@@ -25,7 +25,7 @@ To use the HBase application package ref
  
 ### Setting up a YARN cluster
  
-For simple local demos, a Hadoop pseudo-distributed cluster will suffice -if on a VM then
+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.
 
 # The examples below all assume there is a cluster node called 'master', which

Modified: incubator/slider/site/trunk/content/docs/getting_started.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/getting_started.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/getting_started.md (original)
+++ incubator/slider/site/trunk/content/docs/getting_started.md Thu Apr 14 11:13:12 2016
@@ -46,7 +46,7 @@ The following provides the steps require
 
 The Slider deployment has the following minimum system requirements:
 
-* Hadoop 2.6+
+* Apache Hadoop Hadoop 2.6+
 
 * Required Services: HDFS, YARN and ZooKeeper
 

Modified: incubator/slider/site/trunk/content/docs/manpage.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/manpage.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/manpage.md (original)
+++ incubator/slider/site/trunk/content/docs/manpage.md Thu Apr 14 11:13:12 2016
@@ -697,7 +697,7 @@ Examples
 ### `version`
 
 The command `slider version` 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.
 
 Note that this is the client-side Hadoop version, not that running on the server, though

Modified: incubator/slider/site/trunk/content/docs/placement.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/placement.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/placement.md (original)
+++ incubator/slider/site/trunk/content/docs/placement.md Thu Apr 14 11:13:12 2016
@@ -38,7 +38,7 @@ the cluster. For details on the implemen
 
 A Slider Application Instance consists of the Application Master —Slider's code— and
 the components requested in the `resources.json` 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.
 

Modified: incubator/slider/site/trunk/content/docs/security.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/security.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/security.md (original)
+++ incubator/slider/site/trunk/content/docs/security.md Thu Apr 14 11:13:12 2016
@@ -18,7 +18,7 @@
 # Apache Slider Security
 
 This document discusses the design, implementation and use of Slider
-to deploy secure applications on a secure Hadoop cluster.
+to deploy secure applications on a secure Apache Hadoop cluster.
 
 ### Important:
  
@@ -27,7 +27,6 @@ command line tools or how Hadoop uses de
 round a cluster. These are prerequisites &em;though some links to useful pages are
 listed at the bottom. 
 
-
 ## Concepts
 
 Slider runs in secure clusters, but with restrictions

Modified: incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md Thu Apr 14 11:13:12 2016
@@ -31,7 +31,7 @@ The fields to describe an application is
 
 * **type**: the type of the application. "YARN-APP" identifies an application definition suitable for YARN.
 
-* **minHadoopVersion**: the minimum version of hadoop on which the app can run
+* **minHadoopVersion**: the minimum version of Apache Hadoop on which the app can run
 
 * **components**: the list of component that the application is comprised of
 

Modified: incubator/slider/site/trunk/content/docs/slider_specs/application_needs.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/application_needs.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/application_needs.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/application_needs.md Thu Apr 14 11:13:12 2016
@@ -55,7 +55,7 @@ container requests this will no longer b
 
 * Be trusted. YARN does not run code in a sandbox.
 
-* If it talks to HDFS or other parts of Hadoop, be built against/ship with
+* 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.
 
 * Store persistent data in HDFS (directly or indirectly) with the exact storage location

Modified: incubator/slider/site/trunk/content/docs/slider_specs/application_pkg_upgrade.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/application_pkg_upgrade.md?rev=1739054&r1=1739053&r2=1739054&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/application_pkg_upgrade.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/application_pkg_upgrade.md Thu Apr 14 11:13:12 2016
@@ -48,7 +48,7 @@ Does not affect running Slider apps at a
 #### Slider Application Master upgrade/downgrade of running applications
 
 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.