From 05a76297e72710a38fdfb70a0351b74182c1ef0f Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Wed, 26 Apr 2017 15:49:36 -0700
Subject: [PATCH 1/5] Removing reference to remote state pushing in TFE

---
 .../docs/enterprise/state/pushing.html.md     | 23 -------------------
 website/source/layouts/enterprise.erb         |  3 ---
 2 files changed, 26 deletions(-)
 delete mode 100755 website/source/docs/enterprise/state/pushing.html.md

diff --git a/website/source/docs/enterprise/state/pushing.html.md b/website/source/docs/enterprise/state/pushing.html.md
deleted file mode 100755
index 4e9545fda..000000000
--- a/website/source/docs/enterprise/state/pushing.html.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: "enterprise"
-page_title: "Pushing - State - Terraform Enterprise"
-sidebar_current: "docs-enterprise-state-pushing"
-description: |-
-  Pushing remote states.
----
-
-# Pushing Terraform Remote State to Terraform Enterprise
-
-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 Terraform Enterprise to store remote state, you'll first need to have the
-`ATLAS_TOKEN` environment variable set and run the following command.
-
-```shell
-$ terraform remote config \
-    -backend-config="name=$USERNAME/product"
-```
diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb
index 127074249..3aaf4cc1d 100644
--- a/website/source/layouts/enterprise.erb
+++ b/website/source/layouts/enterprise.erb
@@ -79,9 +79,6 @@
       <li<%= sidebar_current("docs-enterprise-state") %>>
         <a href="/docs/enterprise/state/index.html">State</a>
         <ul class="nav">
-          <li<%= sidebar_current("docs-enterprise-state-pushing") %>>
-            <a href="/docs/enterprise/state/pushing.html">Pushing State</a>
-          </li>
           <li<%= sidebar_current("docs-enterprise-state-resolving") %>>
             <a href="/docs/enterprise/state/resolving-conflicts.html">Resolving Conflicts</a>
           </li>

From 9e791ad35711522952f2b73e231eb4faa45b4591 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Wed, 26 Apr 2017 15:50:15 -0700
Subject: [PATCH 2/5] Update steps per new state management commands

---
 .../state/resolving-conflicts.html.md         | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/website/source/docs/enterprise/state/resolving-conflicts.html.md b/website/source/docs/enterprise/state/resolving-conflicts.html.md
index 0de4069d6..e31a7fafa 100755
--- a/website/source/docs/enterprise/state/resolving-conflicts.html.md
+++ b/website/source/docs/enterprise/state/resolving-conflicts.html.md
@@ -35,36 +35,22 @@ operation.
 
 ### Using Terraform Locally
 
-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`.
+Another way to resolve remote state conflicts is by manual intervention of the
+state file.
 
-When making state changes, it's important to make backup copies in order to
-avoid losing any data.
+Use the [`state pull`](/docs/commands/state/pull.html) subcommand to pull the
+remote state into a local state file.
 
-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:
-
-```json
-{
-  "version": 1,
-  "serial": 555,
-  "remote": {
-    "type": "atlas",
-    "config": {
-      "name": "my-username/production"
-    }
-  }
-}
+```shell
+$ terraform state pull > example.tfstate
 ```
 
 Once a conflict has been resolved locally by editing the state file, the serial
-can be incremented past the current version and pushed:
+can be incremented past the current version and pushed with the
+[`state push`](/docs/commands/state/push.html) subcommand:
 
 ```shell
-$ terraform remote push
+$ terraform state push example.tfstate
 ```
 
 This will upload the manually resolved state and set it as the head version.

From 94ed759663e09d2870df9dce9219d6b0b5d294a9 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Wed, 26 Apr 2017 15:51:25 -0700
Subject: [PATCH 3/5] Updating guide to reference runs and applies instead of
 remote state push

---
 .../docs/enterprise/state/collaborating.html.md  |  7 +++----
 .../source/docs/enterprise/state/index.html.md   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/website/source/docs/enterprise/state/collaborating.html.md b/website/source/docs/enterprise/state/collaborating.html.md
index a5e799f47..417887e5a 100755
--- a/website/source/docs/enterprise/state/collaborating.html.md
+++ b/website/source/docs/enterprise/state/collaborating.html.md
@@ -8,7 +8,7 @@ description: |-
 
 # Collaborating on Terraform Remote State
 
-Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state).
+Terraform Enterprise is one of a few options to store [remote state](/docs/state/remote.html).
 
 Remote state gives you the ability to version and collaborate on Terraform
 changes. It stores information about the changes Terraform makes based on
@@ -18,6 +18,5 @@ In order to collaborate safely on remote state, we recommend
 [creating an organization](/docs/enterprise/organizations/create.html) to
 manage teams of users.
 
-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.
+Then, following a [Terraform Enterprise Run](/docs/enterprise/runs) or [`apply`](/docs/commands/apply.html)
+you can view state versions in the `States` list of the environment.
diff --git a/website/source/docs/enterprise/state/index.html.md b/website/source/docs/enterprise/state/index.html.md
index 047cfee28..3b8a0589b 100755
--- a/website/source/docs/enterprise/state/index.html.md
+++ b/website/source/docs/enterprise/state/index.html.md
@@ -8,17 +8,17 @@ description: |-
 
 # State
 
-Terraform stores the state of your managed infrastructure from the last 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.
-
-Terraform Enterprise is a remote state provider, allowing you to store, version
-and collaborate on states.
+Terraform Enterprise stores the state of your managed infrastructure from the
+last time Terraform was run. The state is stored remotely, which works better in a
+team environment, allowing you to store, version and collaborate on state.
 
 Remote state gives you more than just easier version control and safer storage.
 It also allows you to delegate the outputs to other teams. This allows your
 infrastructure to be more easily broken down into components that multiple teams
 can access.
 
-Read [more about remote state](https://www.terraform.io/docs/state/remote.html).
+Remote state is automatically updated when you run [`apply`](/docs/commands/apply.html)
+locally. It is also updated when an `apply` is executed in a [Terraform Enterprise
+Run](/docs/enterprise/runs/index.html).
+
+Read [more about remote state](/docs/state/remote.html).

From 8cee4eb12b6cf72c959d431fb5723c237c5a6b80 Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Fri, 28 Apr 2017 10:52:59 -0700
Subject: [PATCH 4/5] Adding a deprecation warning on 'terraform remote config'
 command

---
 .../docs/enterprise/state/pushing.html.md     | 25 +++++++++++++++++++
 website/source/layouts/enterprise.erb         |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 website/source/docs/enterprise/state/pushing.html.md

diff --git a/website/source/docs/enterprise/state/pushing.html.md b/website/source/docs/enterprise/state/pushing.html.md
new file mode 100644
index 000000000..ad058d144
--- /dev/null
+++ b/website/source/docs/enterprise/state/pushing.html.md
@@ -0,0 +1,25 @@
+---
+layout: "enterprise"
+page_title: "Pushing - State - Terraform Enterprise"
+sidebar_current: "docs-enterprise-state-pushing"
+description: |-
+  Pushing remote states.
+---
+
+# Pushing Terraform Remote State to Terraform Enterprise
+
+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 Terraform Enterprise to store remote state, you'll first need to have the
+`ATLAS_TOKEN` environment variable set and run the following command.
+
+**NOTE:** `terraform remote config` command has been deprecated in 0.9.X. Remote configuration is now managed as a [backend configuration](/docs/backends/config.html).
+
+```shell
+$ terraform remote config \
+    -backend-config="name=$USERNAME/product"
+```
\ No newline at end of file
diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb
index 3aaf4cc1d..188a66a38 100644
--- a/website/source/layouts/enterprise.erb
+++ b/website/source/layouts/enterprise.erb
@@ -79,6 +79,9 @@
       <li<%= sidebar_current("docs-enterprise-state") %>>
         <a href="/docs/enterprise/state/index.html">State</a>
         <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-state-pushing") %>>
+            <a href="/docs/enterprise/state/pushing.html">Pushing State</a>
+          </li>        
           <li<%= sidebar_current("docs-enterprise-state-resolving") %>>
             <a href="/docs/enterprise/state/resolving-conflicts.html">Resolving Conflicts</a>
           </li>

From b142c04db221434a1d993146e7df5cdc5edd936e Mon Sep 17 00:00:00 2001
From: Maciej Skierkowski <maciej@skierkowski.com>
Date: Fri, 28 Apr 2017 10:54:37 -0700
Subject: [PATCH 5/5] removing whitespace

---
 website/source/layouts/enterprise.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb
index 188a66a38..127074249 100644
--- a/website/source/layouts/enterprise.erb
+++ b/website/source/layouts/enterprise.erb
@@ -81,7 +81,7 @@
         <ul class="nav">
           <li<%= sidebar_current("docs-enterprise-state-pushing") %>>
             <a href="/docs/enterprise/state/pushing.html">Pushing State</a>
-          </li>        
+          </li>
           <li<%= sidebar_current("docs-enterprise-state-resolving") %>>
             <a href="/docs/enterprise/state/resolving-conflicts.html">Resolving Conflicts</a>
           </li>