diff --git hadoop-project/src/site/site.xml hadoop-project/src/site/site.xml
index 57cff9a2648..be48ddbac80 100644
--- hadoop-project/src/site/site.xml
+++ hadoop-project/src/site/site.xml
@@ -128,6 +128,7 @@
+
@@ -143,7 +144,6 @@
-
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md
new file mode 100644
index 00000000000..87ef60fad3b
--- /dev/null
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md
@@ -0,0 +1,235 @@
+
+
+Hadoop: YARN Resource Configuration
+===================================
+
+Overview
+--------
+YARN supports an extensible resource model. By default YARN tracks CPU and
+memory for all nodes, applications, and queues, but the resource definition
+can be extended to include arbitrary "countable" resources. A countable
+resource is a resource that is consumed while a container is running, but is
+released afterwards. CPU and memory are both countable resources. Other examples
+include GPU resources and software licenses.
+
+In addition, YARN also supports the use of "resource profiles", which allow a
+user to specify multiple resource requests through a single profile, similar to
+Amazon Web Services Elastic Compute Cluster instance types. For example,
+"large" might mean 8 virtual cores and 16GB RAM.
+
+Configuration
+-------------
+
+The following configuration properties are supported. See below for details.
+
+`yarn-site.xml`
+
+| Configuration Property | Description |
+|:---- |:---- |
+| `yarn.resourcemanager.resource-profiles.enabled` | Indicates whether resource profiles support is enabled. Defaults to `false`. |
+
+`resource-types.xml`
+
+| Configuration Property | Value | Description |
+|:---- |:---- |:---- |
+| `yarn.resource-types` | Comma-separated list of additional resources. May not include `memory`, `memory-mb`, or `vcores` |
+| `yarn.resource-types..units` | Default unit for the specified resource type |
+| `yarn.resource-types..minimum` | The minimum request for the specified resource type |
+| `yarn.resource-types..maximum` | The maximum request for the specified resource type |
+
+`node-resources.xml`
+
+| Configuration Property | Value | Description |
+|:---- |:---- |:---- |
+| `yarn.nodemanager.resource-type.` | The count of the specified resource available from the node manager |
+
+Please note that the `resource-types.xml` and `node-resources.xml` files
+also need to be placed in the same configuration directory as `yarn-site.xml` if
+they are used. Alternatively, the properties may be placed into the
+`yarn-site.xml` file instead.
+
+YARN Resource Model
+-------------------
+
+### Resource Manager
+The resource manager is the final arbiter of what resources in the cluster are
+tracked. The resource manager loads its resource definition from XML
+configuration files. For example, to define a new resource in addition to
+CPU and memory, the following property should be configured:
+
+```xml
+
+
+ yarn.resource-types
+ resource1,resource2
+
+ The resources to be used for scheduling. Use resource-types.xml
+ to specify details about the individual resource types.
+
+
+
+```
+
+A valid resource name must begin with a letter and contain only letters, numbers,
+and any of: '.', '_', or '-'. A valid resource name may also be optionally
+preceded by a name space followed by a slash. A valid name space consists of
+period-separated groups of letters, numbers, and dashes. For example, the
+following are valid resource names:
+
+* myresource
+* my_resource
+* My-Resource01
+* com.acme/myresource
+
+The following are examples of invalid resource names:
+
+* 10myresource
+* my resource
+* com/acme/myresource
+* $NS/myresource
+* -none-/myresource
+
+For each new resource type defined an optional unit property can be added to
+set the default unit for the resource type. Valid values are:
+
+|Unit Name | Meaning |
+|:---- |:---- |
+| p | pico |
+| n | nano |
+| u | micro |
+| m | milli |
+| | default, i.e. no unit |
+| k | kilo |
+| M | mega |
+| G | giga |
+| T | tera |
+| P | peta |
+| Ki | binary kilo, i.e. 1024 |
+| Mi | binary mega, i.e. 1024^2 |
+| Gi | binary giga, i.e. 1024^3 |
+| Ti | binary tera, i.e. 1024^4 |
+| Pi | binary peta, i.e. 1024^5 |
+
+The property must be named `yarn.resource-types..units`. Each defined
+resource may also have optional minimum and maximum properties. The properties
+must be named `yarn.resource-types..minimum` and
+`yarn.resource-types..maximum`.
+
+The `yarn.resource-types` property and any unit, mimimum, or maximum properties
+may be defined in either the usual `yarn-site.xml` file or in a file named
+`resource-types.xml`. For example, the following could appear in either file:
+
+```xml
+
+
+ yarn.resource-types
+ resource1, resource2
+
+
+
+ yarn.resource-types.resource1.units
+ G
+
+
+
+ yarn.resource-types.resource2.minimum
+ 1
+
+
+
+ yarn.resource-types.resource2.maximum
+ 1024
+
+
+```
+
+### Node Manager
+
+Each node manager independently defines the resources that are available from
+that node. The resource definition is done through setting a property for each
+available resource. The property must be named
+`yarn.nodemanager.resource-type.` and may be placed in the usual
+`yarn-site.xml` file or in a file named `noderesources.xml`. The value of the
+property should be the amount of that resource offered by the node. For
+example:
+
+```xml
+
+
+ yarn.nodemanager.resource-type.resource1
+ 5G
+
+
+
+ yarn.nodemanager.resource-type.resource2
+ 2m
+
+
+
+```
+
+Note that the units used for these resources need not match the definition
+held by the resource manager. If the units do not match, the resource
+manager will automatically do a conversion.
+
+Resource Profiles
+-----------------
+Resource profiles provides an easy way for users to request a set of resources
+with a single profile and a means for administrators to regulate how resources
+are consumed.
+
+To configure resource types, the administrator must set
+`yarn.resourcemanager.resource-profiles.enabled` ot `true` in the resource
+manager's `yarn-site.xml` file. This file defines the supported profiles.
+For example:
+
+```json
+{
+ "small": {
+ "memory-mb" : 1024,
+ "vcores" : 1
+ },
+ "default" : {
+ "memory-mb" : 2048,
+ "vcores" : 2
+ },
+ "large" : {
+ "memory-mb": 4096,
+ "vcores" : 4
+ },
+ "compute" : {
+ "memory-mb" : 2048,
+ "vcores" : 2,
+ "gpu" : 1
+ }
+}
+```
+In this example, users have access to four profiles with different resource
+settings. Note that in the `compute` profile, the administrator has configured
+an additional resource as described above.
+
+### Requesting Profiles
+
+The distributed shell is currently the only client that supports resource
+profiles. Using the distributed shell, the user can specify a resource profile
+name which will automatically be translated into an appropriate set of resource
+requests.
+
+For example:
+
+```hadoop job $DISTSHELL -jar $DISTSHELL -shell_command run.sh -container_resource_profile small```
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceProfiles.md hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceProfiles.md
deleted file mode 100644
index d422ab685f8..00000000000
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceProfiles.md
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-Hadoop: YARN Resource Profiles
-==============================
-
-Overview
---------
-Resource profiles support in YARN helps to extend the YARN resource model to a more flexible model which makes it easier to add new countable resourcetypes. This solution also helps the users to submit jobs with ease to specify the resources they need.
-
-Resource model of YARN
------------------------
-Resource Manager will load a new configuration file named `resource-types.xml` to determine the set of resource types for which scheduling is enabled. Sample XML will look like below.
-
-```xml
-
-
- yarn.resource-types
- resource1, resource2
-
-
-
- yarn.resource-types.resource1.units
- G
-
-
-```
-
-Similarly, a new configuration file `node-resources.xml` will also be loaded by Node Manager where the resource capabilities of a node can be specified.
-
-```xml
-
-
- yarn.nodemanager.resource-type.resource1
- 5G
-
-
-
- yarn.nodemanager.resource-type.resource2
- 2m
-
-
-
-```
-
-Node Manager will use these custom resource types and will register it's capability to Resource Manager.
-
-Resource Profiles
------------------
-As per the updated resource model of YARN, specifying and configuring additional resource types for container allocation request will become more cumbersome. With the support of resource profiles, such requests could be placed by using simple profile names which has defined meaning from YARN.
-
-Admin could specify `resource-profiles.json` which indicates various profiles supported.
-
-```json
-{
- "minimum": {
- "memory-mb" : 1024,
- "vcores" : 1
- },
- "default" : {
- "memory-mb" : 2048,
- "vcores" : 2
- },
- "maximum" : {
- "memory-mb": 4096,
- "vcores" : 4
- },
- "http" : {
- "memory-mb" : 2048,
- "vcores" : 2
- }
-}
-```
-This indicates that profile named "minimum", "default", "maximum" and "http" is supported. Clients could easily use this name instead of specifying each resource details.
-
-Configurations
--------------
-
-*In `yarn-site.xml`*
-
-| Configuration Property | Description |
-|:---- |:---- |
-| `yarn.resourcemanager.resource-profiles.enabled` | *(Required)* In the server side it indicates whether resource profiles support is enabled or not. Defaults to `false`. |
-
-Please note that, `resource-types.xml` and `node-resources.xml` file also need to be placed in conf directory if new resources are to be added to YARN.
-
-*In `resource-types.xml`*
-
-| Configuration Property | Value | Description |
-|:---- |:---- |:---- |
-| `yarn.resource-types` | resource1 | Custom resource |
-| `yarn.resource-types.resource1.units` | G | Default unit for resource1 type |
-
-*In `node-resources.xml`*
-
-| Configuration Property | Value | Description |
-|:---- |:---- |:---- |
-| `yarn.nodemanager.resource-type.resource1` | 5G | Resource capability for resource named 'resource1'. |
-
-Use it
---------
-Distributed Shell is supporting this feature and user could specify a resource profile name which YARN is supporting while running a DS application.