diff --git a/website/source/docs/enterprise/artifacts/artifact-provider.html.md b/website/source/docs/enterprise/artifacts/artifact-provider.html.md
index ae13f8b21..0c04fe765 100755
--- a/website/source/docs/enterprise/artifacts/artifact-provider.html.md
+++ b/website/source/docs/enterprise/artifacts/artifact-provider.html.md
@@ -1,13 +1,18 @@
---
-title: "Atlas Artifact Provider"
+layout: "artifacts"
+page_title: "Artifact Provider"
+sidebar_current: "docs-enterprise-Provider"
+description: |-
+ Terraform has a provider for managing Atlas artifacts called `atlas_artifact`.
---
-# Atlas Artifact Provider
-Terraform has a [provider](https://terraform.io/docs/providers/index.html) for managing Atlas artifacts called `atlas_artifact`.
+# Artifact Provider
-This is used to make data stored in Atlas Artifacts available to
+Terraform has a [provider](https://terraform.io/docs/providers/index.html) for managing Terraform Enterprise artifacts called `atlas_artifact`.
+
+This is used to make data stored in Artifacts available to
Terraform for interpolation. In the following example, an artifact
-is defined and references an AMI ID stored in Atlas.
+is defined and references an AMI ID stored in Terraform Enterprise.
provider "atlas" {
# You can also set the atlas token by exporting
diff --git a/website/source/docs/enterprise/artifacts/creating-amis.html.md b/website/source/docs/enterprise/artifacts/creating-amis.html.md
index 0ea4b7333..ea68fa6c0 100755
--- a/website/source/docs/enterprise/artifacts/creating-amis.html.md
+++ b/website/source/docs/enterprise/artifacts/creating-amis.html.md
@@ -1,9 +1,14 @@
---
-title: "Creating AMI Artifacts with Packer and Atlas"
+layout: "artifacts"
+page_title: "Creating AMI Artifacts"
+sidebar_current: "docs-enterprise-amis"
+description: |-
+ Creating AMI Artifacts with Packer.
---
-# Creating AMI Artifacts with Packer and Atlas
+
+# Creating AMI Artifacts with Packer and Terraform Enterprise
Currently, the best way to create AWS AMI artifacts is with Packer.
-We detail how to do this in the [Packer section of the documentation](/help/packer/artifacts/creating-amis).
+We detail how to do this in the [Packer section of the documentation](https://atlas.hashicorp.com/help/packer/artifacts/creating-amis).
diff --git a/website/source/docs/enterprise/artifacts/index.html.md b/website/source/docs/enterprise/artifacts/index.html.md
index 03eae7789..9ec62ad1a 100755
--- a/website/source/docs/enterprise/artifacts/index.html.md
+++ b/website/source/docs/enterprise/artifacts/index.html.md
@@ -1,18 +1,21 @@
---
-title: "About Terraform Artifacts in Atlas"
+layout: "artifacts"
+page_title: "Terraform Artifacts"
+sidebar_current: "docs-enterprise-artifact"
+description: |-
+ Terraform Enterprise can be used to store artifacts for use by Terraform. Typically, artifacts are stored with Packer.
---
# About Terraform Artifacts in Atlas
-Atlas can be used to store artifacts for use by Terraform. Typically,
-artifacts are [stored with Packer](/help/packer/artifacts).
+Terraform Enterprise can be used to store artifacts for use by Terraform. Typically,
+artifacts are [stored with Packer](https://packer.io/docs).
-Artifacts can be used in Atlas to deploy and manage images
+Artifacts can be used in to deploy and manage images
of configuration. Artifacts are generic, but can be of varying types
like `amazon.image`. See the Packer [`artifact_type`](https://packer.io/docs/post-processors/atlas.html#artifact_type)
docs for more information.
-Packer can create artifacts both while running in Atlas and out of Atlas'
+Packer can create artifacts both while running in and out of Terraform Enterprise
network. This is possible due to the post-processors use of the public
-artifact API to store the artifacts.
-
+artifact API to store the artifacts.
\ No newline at end of file
diff --git a/website/source/docs/enterprise/artifacts/managing-versions.html.md b/website/source/docs/enterprise/artifacts/managing-versions.html.md
index 894a4894a..3ec346eac 100755
--- a/website/source/docs/enterprise/artifacts/managing-versions.html.md
+++ b/website/source/docs/enterprise/artifacts/managing-versions.html.md
@@ -1,10 +1,14 @@
---
-title: "Managing Artifact Versions"
+layout: "artifacts"
+page_title: "Managing Artifact Versions"
+sidebar_current: "docs-enterprise-Provider"
+description: |-
+ Artifacts are versioned and assigned a version number, here is how to manage the versions.
---
# Managing Artifact Versions
-Artifacts stored in Atlas are versioned and assigned a version number.
+Artifacts stored in Terraform Enterprise are versioned and assigned a version number.
Versions are useful to roll back, audit and deploy images specific versions
of images to certain environments in a targeted way.
@@ -47,8 +51,8 @@ This will use version 7 of the `web-worker` artifact.
### Pinning Artifacts to Specific Builds
-Artifacts can also be pinned to an Atlas build number. This is only
-possible if Atlas was used to build the artifact with Packer.
+Artifacts can also be pinned to an Terraform build number. This is only
+possible if Terraform Enterprise was used to build the artifact with Packer.
resource "atlas_artifact" "web-worker" {
name = "%{DEFAULT_USERNAME}/web-worker"
@@ -57,5 +61,5 @@ possible if Atlas was used to build the artifact with Packer.
}
It's recommended to use versions, instead of builds, as it will
-be easier to track within Atlas and when building outside of the Atlas
+be easier to track when building outside of the Terraform Enterprise
environment.
diff --git a/website/source/docs/enterprise/vcs/git.html.md b/website/source/docs/enterprise/vcs/git.html.md
index 93254ad70..370d40477 100755
--- a/website/source/docs/enterprise/vcs/git.html.md
+++ b/website/source/docs/enterprise/vcs/git.html.md
@@ -1,14 +1,17 @@
---
-title: "Git Integration"
+layout: "vcs"
+page_title: "Git Integration"
+sidebar_current: "docs-enterprise-vcs"
+description: |-
+ Git repositories can be integrated with Terraform Enterprise by using push command.
---
# Git Integation
-Git repositories can be integrated with Atlas by using
+Git repositories can be integrated with Terraform Enterprise by using
[`terraform push`](https://www.terraform.io/docs/commands/push.html) to import
Terraform configuration when changes are committed. When Terraform
-configuration is imported using `terraform push` a plan is automatically queued
-in Atlas.
+configuration is imported using `terraform push` a plan is automatically queued.
_**Note:** This integration is for Git repositories **not** hosted on GitHub.
For repositories on GitHub, there is native [GitHub Integration](/help/terraform/vcs/github).
@@ -36,7 +39,7 @@ repository, set the necessary variables, and ensure the script is executable.
```
#!/bin/bash
#
-# An example hook script to push Terraform configuration to Atlas.
+# An example hook script to push Terraform configuration to Terraform Enterprise.
#
# Set the following variables for your project:
# - ENV_NAME - your Atlas environment name (e.g. org/env)
diff --git a/website/source/docs/enterprise/vcs/index.html.md b/website/source/docs/enterprise/vcs/index.html.md
index c30f75198..d1b29c5f8 100755
--- a/website/source/docs/enterprise/vcs/index.html.md
+++ b/website/source/docs/enterprise/vcs/index.html.md
@@ -1,15 +1,19 @@
---
-title: "Integration with Version Control Software"
+layout: "vcs"
+page_title: "Integration with Version Control Software"
+sidebar_current: "docs-enterprise-artifact"
+description: |-
+ Terraform Enterprise can integrate with version control software Git and GitHub.
---
# Integration with Version Control Software
-Atlas can integrate with your version control software to automatically execute
+Terraform Enterprise can integrate with your version control software to automatically execute
Terraform with your latest Terraform configuration as you commit changes to
source control.
-Different capabilities within Atlas are available depending on the integration
+Different capabilities within Terraform Enterprise are available depending on the integration
in use. The available integration options are below.
-- [Git](/help/terraform/vcs/git)
-- [GitHub](/help/terraform/vcs/github)
+- [Git](/docs/enterprise/vcs/git)
+- [GitHub](/docs/enterprise/vcs/github)
diff --git a/website/source/layouts/artifacts.erb b/website/source/layouts/artifacts.erb
new file mode 100644
index 000000000..598e32deb
--- /dev/null
+++ b/website/source/layouts/artifacts.erb
@@ -0,0 +1,28 @@
+<% wrap_layout :inner do %>
+ <% content_for :sidebar do %>
+
+ <% end %>
+
+ <%= yield %>
+<% end %>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index e8d018699..f819d334e 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -550,264 +550,19 @@
>
Runs
-
+ >
+ State
+
+ >
+ Artifacts
+
+ >
+ VCS Integration
+
<% 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/vcs.erb b/website/source/layouts/vcs.erb
new file mode 100644
index 000000000..f53c51cbd
--- /dev/null
+++ b/website/source/layouts/vcs.erb
@@ -0,0 +1,22 @@
+<% wrap_layout :inner do %>
+ <% content_for :sidebar do %>
+
+ <% end %>
+
+ <%= yield %>
+<% end %>