diff --git a/website/source/docs/enterprise/state/collaborating.html.md b/website/source/docs/enterprise/state/collaborating.html.md
index 876524c82..3f01bcfa4 100755
--- a/website/source/docs/enterprise/state/collaborating.html.md
+++ b/website/source/docs/enterprise/state/collaborating.html.md
@@ -1,17 +1,21 @@
---
-title: "Collaborating on Terraform Remote State in Atlas"
+layout: "state"
+page_title: "State: Collaborating"
+sidebar_current: "docs-enterprise-state-collaborating"
+description: |-
+ How to collaborate on states.
---
-# Collaborating on Terraform Remote State in Atlas
+# Collaborating on Terraform Remote State
-Atlas is one of a few options to store [remote state](/help/terraform/state).
+Atlas is one of a few options to store [remote state](/docs/enterprise/state).
Remote state gives you the ability to version and collaborate on Terraform changes. It
stores information about the changes Terraform makes based on configuration.
In order to collaborate safely on remote state, we recommend
-[creating an organization](/help/organizations/create) to manage teams of users.
+[creating an organization](https://atlas.hashicorp.com/help/organizations/create) to manage teams of users.
-Then, following a [remote state push](/help/terraform/state) you can view state versions
-in the changes tab of the [environment](/help/glossary#environment) created under the same name
-as the remote state.
+Then, following a [remote state push](/docs/enterprise/state) you can view state versions
+in the changes tab of the environment created under the same name
+as the remote state.
\ No newline at end of file
diff --git a/website/source/docs/enterprise/state/index.html.md b/website/source/docs/enterprise/state/index.html.md
index 1eb8ee586..90dd81abf 100755
--- a/website/source/docs/enterprise/state/index.html.md
+++ b/website/source/docs/enterprise/state/index.html.md
@@ -1,5 +1,9 @@
---
-title: "About Remote State"
+layout: "state"
+page_title: "About Remote State"
+sidebar_current: "docs-enterprise-state"
+description: |-
+ Terraform stores the state of your managed infrastructure from the last time Terraform was run. This section is about states.
---
# About Remote State
@@ -9,7 +13,7 @@ time Terraform was run. By default this state is stored in a local file
named `terraform.tfstate`, but it can also be stored remotely, which
works better in a team environment.
-Atlas is a remote state provider, allowing you to store, version and
+Terraform Enterprise is a remote state provider, allowing you to store, version and
collaborate on state with Atlas.
Remote state gives you more than just easier version control and safer
diff --git a/website/source/docs/enterprise/state/pushing.html.md b/website/source/docs/enterprise/state/pushing.html.md
index ec9d2ace8..f27e64427 100755
--- a/website/source/docs/enterprise/state/pushing.html.md
+++ b/website/source/docs/enterprise/state/pushing.html.md
@@ -1,15 +1,19 @@
---
-title: "Pushing Terraform Remote State to Atlas"
+layout: "state"
+page_title: "State: Pushing"
+sidebar_current: "docs-enterprise-state-pushing"
+description: |-
+ Pushing remote states.
---
-# Pushing Terraform Remote State to Atlas
+# Pushing Terraform Remote State to Terraform Enterprise
-Atlas is one of a few options to store [remote state](/help/terraform/state).
+Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state).
Remote state gives you the ability to version and collaborate on Terraform changes. It
stores information about the changes Terraform makes based on configuration.
-To use Atlas to store remote state, you'll first need to have the
+To use Terraform Enterprise to store remote state, you'll first need to have the
`ATLAS_TOKEN` environment variable set and run the following command.
$ terraform remote config -backend-config="name=%{DEFAULT_USERNAME}/product"
diff --git a/website/source/docs/enterprise/state/resolving-conflicts.html.md b/website/source/docs/enterprise/state/resolving-conflicts.html.md
index 5d23e8e97..a9527e228 100755
--- a/website/source/docs/enterprise/state/resolving-conflicts.html.md
+++ b/website/source/docs/enterprise/state/resolving-conflicts.html.md
@@ -1,13 +1,17 @@
---
-title: "Resolving Conflicts in Atlas Remote State"
+layout: "state"
+page_title: "State: Resolving Conflicts"
+sidebar_current: "docs-enterprise-state-resolving"
+description: |-
+ Resolving conflicts with remote states.
---
-# Resolving Conflicts in Atlas Remote State
+# Resolving Conflicts in Remote States
Resolving state conflicts can be time consuming and error prone, so
it's important to approach it carefully.
-There are several tools provided by Atlas to help resolve conflicts
+There are several tools provided by Terraform Enterprise to help resolve conflicts
and fix remote state issues. First, you can navigate between state
versions in the changes view of your environment (after toggling on
the remote state checkbox) and view plain-text differences between
@@ -33,15 +37,15 @@ to perform the operation.
### Using Terraform Locally
-Another way to resolve conflicts in Atlas remote state
+Another way to resolve remote state conflicts
is to merge and conflicted copies locally by inspecting the
raw state available in the path `.terraform/terraform.tfstate`.
When making state changes, it's important to make backup copies in
order to avoid losing any data.
-Atlas will reject any state that is pushed with a serial that is lower
-than the known serial when the MD5 of the state does not match.
+Any state that is pushed with a serial that is lower
+than the known serial when the MD5 of the state does not match will be rejected.
The serial is embedded in the state file:
@@ -58,10 +62,10 @@ The serial is embedded in the state file:
}
Once a conflict has been resolved locally by editing the state file,
-the serial can be incremented past the current version in Atlas and
+the serial can be incremented past the current version and
pushed:
terraform remote push
This will upload the manually resolved state and set it as the head
-version in Atlas.
+version.
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 571d49d02..e8d018699 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -336,6 +336,7 @@
Microsoft Azure (Legacy ASM)
+<<<<<<< HEAD
>
MySQL
@@ -560,4 +561,253 @@
<% end %>
<%= yield %>
+=======
+ >
+ Nomad
+
+
+ >
+ NS1
+
+
+ >
+ Microsoft Azure
+
+
+ >
+ Microsoft Azure (Legacy ASM)
+
+
+ >
+ MySQL
+
+
+ >
+ OpenStack
+
+
+ >
+ OpsGenie
+
+
+ >
+ Packet
+
+
+ >
+ PagerDuty
+
+
+ >
+ PostgreSQL
+
+
+ >
+ PowerDNS
+
+
+ >
+ ProfitBricks
+
+
+ >
+ RabbitMQ
+
+
+ >
+ Rancher
+
+
+ >
+ Random
+
+
+ >
+ Rundeck
+
+
+ >
+ Scaleway
+
+
+ >
+ SoftLayer
+
+
+ >
+ StatusCake
+
+
+ >
+ Spotinst
+
+
+ >
+ Template
+
+
+ >
+ Terraform
+
+
+ >
+ TLS
+
+
+ >
+ Triton
+
+
+ >
+ UltraDNS
+
+
+ >
+ Vault
+
+
+ >
+ VMware vCloud Director
+
+
+ >
+ VMware vSphere
+
+
+
+
+ >
+ Provisioners
+
+
+
+ >
+ Modules
+
+
+
+ >
+ Backends
+
+
+
+ >
+ Plugins
+
+
+
+ >
+ Internals
+
+
+
+ >
+ Terraform Enterprise
+
+
+
+
+
+
+ <% end %>
+
+ <%= yield %>
+>>>>>>> 568c35750... Added all TFE state files
<% end %>
diff --git a/website/source/layouts/state.erb b/website/source/layouts/state.erb
new file mode 100644
index 000000000..c678c1d72
--- /dev/null
+++ b/website/source/layouts/state.erb
@@ -0,0 +1,28 @@
+<% wrap_layout :inner do %>
+ <% content_for :sidebar do %>
+
+ <% end %>
+
+ <%= yield %>
+<% end %>