From 0a595cb1e92dd5be443d35def51c47fb0ed151dd Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 6 Apr 2017 23:59:35 -0400
Subject: [PATCH] Cleanup layouts

---
 website/source/layouts/accounts.erb      |  25 --
 website/source/layouts/api.erb           |  37 ---
 website/source/layouts/artifacts.erb     |  28 --
 website/source/layouts/docs.erb          |   2 +
 website/source/layouts/enterprise.erb    | 405 ++++++++++++-----------
 website/source/layouts/faq.erb           |  25 --
 website/source/layouts/organizations.erb |  34 --
 website/source/layouts/packer.erb        |  65 ----
 website/source/layouts/runs.erb          |  43 ---
 website/source/layouts/state.erb         |  28 --
 website/source/layouts/vcs.erb           |  25 --
 11 files changed, 206 insertions(+), 511 deletions(-)
 delete mode 100644 website/source/layouts/accounts.erb
 delete mode 100644 website/source/layouts/api.erb
 delete mode 100644 website/source/layouts/artifacts.erb
 delete mode 100644 website/source/layouts/faq.erb
 delete mode 100644 website/source/layouts/organizations.erb
 delete mode 100644 website/source/layouts/packer.erb
 delete mode 100644 website/source/layouts/runs.erb
 delete mode 100644 website/source/layouts/state.erb
 delete mode 100644 website/source/layouts/vcs.erb

diff --git a/website/source/layouts/accounts.erb b/website/source/layouts/accounts.erb
deleted file mode 100644
index c175cb180..000000000
--- a/website/source/layouts/accounts.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-accounts-/) %>>
-					<a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-accounts-authentication") %>>
-							<a href="/docs/enterprise/user-accounts/authentication.html">Authentication</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-accounts-recovery") %>>
-							<a href="/docs/enterprise/user-accounts/recovery.html">Recovery</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/api.erb b/website/source/layouts/api.erb
deleted file mode 100644
index 147af5115..000000000
--- a/website/source/layouts/api.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-api-/) %>>
-					<a href="/docs/enterprise/api/index.html">API</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-api-environments") %>>
-							<a href="/docs/enterprise/api/environments.html">Environments</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api-runs") %>>
-							<a href="/docs/enterprise/api/runs.html">Runs</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api-states") %>>
-							<a href="/docs/enterprise/api/states.html">States</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api-configurations") %>>
-							<a href="/docs/enterprise/api/configurations.html">Configurations</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api-configversions") %>>
-							<a href="/docs/enterprise/api/configuration-versions.html">Configuration Versions</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api-users") %>>
-							<a href="/docs/enterprise/api/users.html">Users</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/artifacts.erb b/website/source/layouts/artifacts.erb
deleted file mode 100644
index 5cae19233..000000000
--- a/website/source/layouts/artifacts.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-artifacts-/) %>>
-					<a href="/docs/enterprise/artifacts/index.html">Artifact</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-artifacts-provider") %>>
-							<a href="/docs/enterprise/artifacts/artifact-provider.html">Artifact Provider</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-artifacts-versions") %>>
-							<a href="/docs/enterprise/artifacts/managing-versions.html">Managing Versions</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-artifacts-amis") %>>
-							<a href="/docs/enterprise/artifacts/creating-amis.html">Creating AMI Artifacts</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index ded2e3fcb..8a643f029 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -543,6 +543,8 @@
         </ul>
       </li>
 
+      <hr>
+
       <li<%= sidebar_current("docs-enterprise") %>>
         <a href="/docs/enterprise/index.html">Terraform Enterprise</a>
         <ul class="nav">
diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb
index d38f5bf5d..16df41156 100644
--- a/website/source/layouts/enterprise.erb
+++ b/website/source/layouts/enterprise.erb
@@ -1,205 +1,208 @@
 <% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li<%= sidebar_current("docs-home") %>>
-					<a href="/docs/index.html">Documentation Home</a>
-				</li>
+  <% content_for :sidebar do %>
+    <ul class="nav docs-sidenav">
+      <li<%= sidebar_current("docs-home") %>>
+        <a class="back" href="/docs/index.html">Documentation Home</a>
+      </li>
 
-				<li<%= sidebar_current(/^docs-enterprise/) %>>
-					<a href="/docs/enterprise/index.html">Terraform Enterprise</a>
-					<ul class="nav">
-						<li<%= sidebar_current("docs-enterprise-runs") %>>
-							<a href="/docs/enterprise/runs/index.html">Runs</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-runs-starting") %>>
-									<a href="/docs/enterprise/runs/starting.html">Starting</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-applies") %>>
-									<a href="/docs/enterprise/runs/automatic-applies.html">Automatic Applies</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-schedule") %>>
-									<a href="/docs/enterprise/runs/scheduling-runs.html">Scheduling Runs</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-variables") %>>
-									<a href="/docs/enterprise/runs/variables-and-configuration.html">Variables and Config</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-installing") %>>
-									<a href="/docs/enterprise/runs/installing-software.html">Installing Software</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-execute") %>>
-									<a href="/docs/enterprise/runs/how-runs-execute.html">How Runs Execute</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-versions") %>>
-									<a href="/docs/enterprise/runs/managing-terraform-versions.html">Managing Terraform Versions</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-runs-notifications") %>>
-									<a href="/docs/enterprise/runs/notifications.html">Run Notifications</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-state") %>>
-							<a href="/docs/enterprise/state/index.html">State</a>
-							<ul class="nav nav-visible">
-								<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>
-								<li<%= sidebar_current("docs-enterprise-state-collaborating") %>>
-									<a href="/docs/enterprise/state/collaborating.html">Collaborating</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-artifacts") %>>
-							<a href="/docs/enterprise/artifacts/index.html">Artifacts</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-artifacts-provider") %>>
-									<a href="/docs/enterprise/artifacts/artifact-provider.html">Artifact Provider</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-artifacts-versions") %>>
-									<a href="/docs/enterprise/artifacts/managing-versions.html">Managing Versions</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-artifacts-amis") %>>
-									<a href="/docs/enterprise/artifacts/creating-amis.html">Creating AMI Artifacts</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-vcs") %>>
-							<a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-vcs-git") %>>
-									<a href="/docs/enterprise/vcs/git.html">Git</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-vcs-github") %>>
-									<a href="/docs/enterprise/vcs/github.html">GitHub</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-packerartifacts") %>>
-							<a href="/docs/enterprise/packer/artifacts/index.html">Packer Artifacts</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-packerartifacts-amis") %>>
-									<a href="/docs/enterprise/packer/artifacts/creating-amis.html">Creating AMIs</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerartifacts-vagrant") %>>
-									<a href="/docs/enterprise/packer/artifacts/creating-vagrant-boxes.html">Creating Vagrant Boxes</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-packerbuilds") %>>
-							<a href="/docs/enterprise/packer/builds/index.html">Packer Builds</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-starting") %>>
-									<a href="/docs/enterprise/packer/builds/starting.html">Starting Builds</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-installing") %>>
-									<a href="/docs/enterprise/packer/builds/installing-software.html">Installing Software</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-rebuilding") %>>
-									<a href="/docs/enterprise/packer/builds/rebuilding.html">Rebuilding</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-linkedapps") %>>
-									<a href="/docs/enterprise/packer/builds/linked-applications.html">Linked Applications</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-runbuilds") %>>
-									<a href="/docs/enterprise/packer/builds/how-builds-run.html">How Builds Run</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-environment") %>>
-									<a href="/docs/enterprise/packer/builds/build-environment.html">Build Environment</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-notifications") %>>
-									<a href="/docs/enterprise/packer/builds/notifications.html">Build Notifications</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-scheduling") %>>
-									<a href="/docs/enterprise/packer/builds/scheduling-builds.html">Scheduling Builds</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-versions") %>>
-									<a href="/docs/enterprise/packer/builds/managing-packer-versions.html">Managing Packer Versions</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packerbuilds-troubleshooting") %>>
-									<a href="/docs/enterprise/packer/builds/troubleshooting.html">Troubleshooting</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-api") %>>
-							<a href="/docs/enterprise/api/index.html">API</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-api-environments") %>>
-									<a href="/docs/enterprise/api/environments.html">Environments</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-api-runs") %>>
-									<a href="/docs/enterprise/api/runs.html">Runs</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-api-states") %>>
-									<a href="/docs/enterprise/api/states.html">States</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-api-configurations") %>>
-									<a href="/docs/enterprise/api/configurations.html">Configurations</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-api-configversions") %>>
-									<a href="/docs/enterprise/api/configuration-versions.html">Configuration Versions</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-api-users") %>>
-									<a href="/docs/enterprise/api/users.html">Users</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-accounts") %>>
-							<a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-accounts-authentication") %>>
-									<a href="/docs/enterprise/user-accounts/authentication.html">Authentication</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-accounts-recovery") %>>
-									<a href="/docs/enterprise/user-accounts/recovery.html">Recovery</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-organizations") %>>
-							<a href="/docs/enterprise/organizations/index.html">Organizations</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-organizations-create") %>>
-									<a href="/docs/enterprise/organizations/create.html">Create</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-organizations-trials") %>>
-									<a href="/docs/enterprise/organizations/trials.html">Trials</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-organizations-migrate") %>>
-									<a href="/docs/enterprise/organizations/migrate.html">Migrate</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-organizations-policy") %>>
-									<a href="/docs/enterprise/organizations/authentication-policy.html">Authentication Policy</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-organizations-credit") %>>
-									<a href="/docs/enterprise/organizations/credit-card.html">Add Credit Card</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-glossary") %>>
-							<a href="/docs/enterprise/glossary/index.html">Glossary</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-faq") %>>
-							<a href="/docs/enterprise/faq/index.html">FAQ</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-faq-monolithic") %>>
-									<a href="/docs/enterprise/faq/monolithic-artifacts.html">Monolithic Artifacts</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-faq-deployments") %>>
-									<a href="/docs/enterprise/faq/rolling-deployments.html">Rolling Deployments</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-support") %>>
-							<a href="/docs/enterprise/support.html">Contact Support</a>
-						</li>
-					</ul>
-				</li>
-	
-			</ul>
-		</div>
-	<% end %>
+      <li<%= sidebar_current("docs-enterprise-home") %>>
+        <a class="back" href="/docs/enterprise/index.html">Terraform Enterprise</a>
+      </li>
 
-	<%= yield %>
+      <hr>
+
+      <li<%= sidebar_current("docs-enterprise-accounts") %>>
+        <a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-accounts-authentication") %>>
+            <a href="/docs/enterprise/user-accounts/authentication.html">Authentication</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-accounts-recovery") %>>
+            <a href="/docs/enterprise/user-accounts/recovery.html">Recovery</a>
+          </li>
+        </ul>
+      </li>
+
+      <li<%= sidebar_current("docs-enterprise-organizations") %>>
+        <a href="/docs/enterprise/organizations/index.html">Organizations</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-organizations-create") %>>
+            <a href="/docs/enterprise/organizations/create.html">Create</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-organizations-trials") %>>
+            <a href="/docs/enterprise/organizations/trials.html">Trials</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-organizations-migrate") %>>
+            <a href="/docs/enterprise/organizations/migrate.html">Migrate</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-organizations-policy") %>>
+            <a href="/docs/enterprise/organizations/authentication-policy.html">Authentication Policy</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-organizations-credit") %>>
+            <a href="/docs/enterprise/organizations/credit-card.html">Add Credit Card</a>
+          </li>
+        </ul>
+      </li>
+
+      <li<%= sidebar_current("docs-enterprise-runs") %>>
+        <a href="/docs/enterprise/runs/index.html">Runs</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-runs-starting") %>>
+            <a href="/docs/enterprise/runs/starting.html">Starting</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-applies") %>>
+            <a href="/docs/enterprise/runs/automatic-applies.html">Automatic Applies</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-schedule") %>>
+            <a href="/docs/enterprise/runs/scheduling-runs.html">Scheduling Runs</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-variables") %>>
+            <a href="/docs/enterprise/runs/variables-and-configuration.html">Variables and Config</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-installing") %>>
+            <a href="/docs/enterprise/runs/installing-software.html">Installing Software</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-execute") %>>
+            <a href="/docs/enterprise/runs/how-runs-execute.html">How Runs Execute</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-versions") %>>
+            <a href="/docs/enterprise/runs/managing-terraform-versions.html">Managing Versions</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-notifications") %>>
+            <a href="/docs/enterprise/runs/notifications.html">Run Notifications</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-runs-multifactor-authentication") %>>
+            <a href="/docs/enterprise/runs/multifactor-authentication.html">Multi-Factor Authentication</a>
+          </li>
+        </ul>
+      </li>
+      <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>
+          <li<%= sidebar_current("docs-enterprise-state-collaborating") %>>
+            <a href="/docs/enterprise/state/collaborating.html">Collaborating</a>
+          </li>
+        </ul>
+      </li>
+      <li<%= sidebar_current("docs-enterprise-artifacts") %>>
+        <a href="/docs/enterprise/artifacts/index.html">Artifacts</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-artifacts-provider") %>>
+            <a href="/docs/enterprise/artifacts/artifact-provider.html">Artifact Provider</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-artifacts-versions") %>>
+            <a href="/docs/enterprise/artifacts/managing-versions.html">Managing Versions</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-artifacts-amis") %>>
+            <a href="/docs/enterprise/artifacts/creating-amis.html">Creating AMI Artifacts</a>
+          </li>
+        </ul>
+      </li>
+      <li<%= sidebar_current("docs-enterprise-vcs") %>>
+        <a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-vcs-git-") %>>
+            <a href="/docs/enterprise/vcs/git.html">Git</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-vcs-github") %>>
+            <a href="/docs/enterprise/vcs/github.html">GitHub</a>
+          </li>
+        </ul>
+      </li>
+      <li<%= sidebar_current("docs-enterprise-packerartifacts") %>>
+        <a href="/docs/enterprise/packer/artifacts/index.html">Packer Artifacts</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-packerartifacts-amis") %>>
+            <a href="/docs/enterprise/packer/artifacts/creating-amis.html">Creating AMIs</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerartifacts-vagrant") %>>
+            <a href="/docs/enterprise/packer/artifacts/creating-vagrant-boxes.html">Creating Vagrant Boxes</a>
+          </li>
+        </ul>
+      </li>
+      <li<%= sidebar_current("docs-enterprise-packerbuilds") %>>
+        <a href="/docs/enterprise/packer/builds/index.html">Packer Builds</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-starting") %>>
+            <a href="/docs/enterprise/packer/builds/starting.html">Starting Builds</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-installing") %>>
+            <a href="/docs/enterprise/packer/builds/installing-software.html">Installing Software</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-rebuilding") %>>
+            <a href="/docs/enterprise/packer/builds/rebuilding.html">Rebuilding</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-runbuilds") %>>
+            <a href="/docs/enterprise/packer/builds/how-builds-run.html">How Builds Run</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-environment") %>>
+            <a href="/docs/enterprise/packer/builds/build-environment.html">Build Environment</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-notifications") %>>
+            <a href="/docs/enterprise/packer/builds/notifications.html">Build Notifications</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-scheduling") %>>
+            <a href="/docs/enterprise/packer/builds/scheduling-builds.html">Scheduling Builds</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-versions") %>>
+            <a href="/docs/enterprise/packer/builds/managing-packer-versions.html">Managing Versions</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-packerbuilds-troubleshooting") %>>
+            <a href="/docs/enterprise/packer/builds/troubleshooting.html">Troubleshooting</a>
+          </li>
+        </ul>
+      </li>
+
+      <hr>
+
+      <li<%= sidebar_current("docs-enterprise-faq") %>>
+        <a href="/docs/enterprise/faq/index.html">FAQ</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-faq-monolithic") %>>
+            <a href="/docs/enterprise/faq/monolithic-artifacts.html">Monolithic Artifacts</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-faq-deployments") %>>
+            <a href="/docs/enterprise/faq/rolling-deployments.html">Rolling Deployments</a>
+          </li>
+        </ul>
+      </li>
+
+      <li<%= sidebar_current("docs-enterprise-glossary") %>>
+        <a href="/docs/enterprise/glossary/index.html">Glossary</a>
+      </li>
+
+      <li<%= sidebar_current("docs-enterprise-api") %>>
+        <a href="/docs/enterprise/api/index.html">API</a>
+        <ul class="nav">
+          <li<%= sidebar_current("docs-enterprise-api-environments") %>>
+            <a href="/docs/enterprise/api/environments.html">Environments</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-api-runs") %>>
+            <a href="/docs/enterprise/api/runs.html">Runs</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-api-states") %>>
+            <a href="/docs/enterprise/api/states.html">States</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-api-configurations") %>>
+            <a href="/docs/enterprise/api/configurations.html">Configurations</a>
+          </li>
+          <li<%= sidebar_current("docs-enterprise-api-users") %>>
+            <a href="/docs/enterprise/api/users.html">Users</a>
+          </li>
+        </ul>
+      </li>
+
+      <li<%= sidebar_current("docs-enterprise-support") %>>
+        <a href="/docs/enterprise/support.html">Support</a>
+      </li>
+    </ul>
+  <% end %>
+
+  <%= yield %>
 <% end %>
diff --git a/website/source/layouts/faq.erb b/website/source/layouts/faq.erb
deleted file mode 100644
index 725fe37fc..000000000
--- a/website/source/layouts/faq.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-faq-/) %>>
-					<a href="/docs/enterprise/faq/index.html">FAQ</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-faq-monolithic") %>>
-							<a href="/docs/enterprise/faq/monolithic-artifacts.html">Monolithic Artifacts</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-faq-deployments") %>>
-							<a href="/docs/enterprise/faq/rolling-deployments.html">Rolling Deployments</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/organizations.erb b/website/source/layouts/organizations.erb
deleted file mode 100644
index 831f24489..000000000
--- a/website/source/layouts/organizations.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-organizations-/) %>>
-					<a href="/docs/enterprise/organizations/index.html">Organizations</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-organizations-create") %>>
-							<a href="/docs/enterprise/organizations/create.html">Create</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-organizations-trials") %>>
-							<a href="/docs/enterprise/organizations/trials.html">Trials</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-organizations-migrate") %>>
-							<a href="/docs/enterprise/organizations/migrate.html">Migrate</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-organizations-policy") %>>
-							<a href="/docs/enterprise/organizations/authentication-policy.html">Authentication Policy</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-organizations-credit") %>>
-							<a href="/docs/enterprise/organizations/credit-card.html">Add Credit Card</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/packer.erb b/website/source/layouts/packer.erb
deleted file mode 100644
index 7062734de..000000000
--- a/website/source/layouts/packer.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-packer-/) %>>
-					<a href="/docs/enterprise/packer/index.html">Packer</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-packer-artifacts") %>>
-							<a href="/docs/enterprise/packer/artifacts/index.html">Artifacts</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-packer-artifacts-amis") %>>
-									<a href="/docs/enterprise/packer/artifacts/creating-amis.html">Creating AMIs</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-artifacts-vagrant") %>>
-									<a href="/docs/enterprise/packer/artifacts/creating-vagrant-boxes.html">Creating Vagrant Boxes</a>
-								</li>
-							</ul>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-packer-builds") %>>
-							<a href="/docs/enterprise/packer/builds/index.html">Builds</a>
-							<ul class="nav nav-visible">
-								<li<%= sidebar_current("docs-enterprise-packer-builds-starting") %>>
-									<a href="/docs/enterprise/packer/builds/starting.html">Starting Builds</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-installing") %>>
-									<a href="/docs/enterprise/packer/builds/installing-software.html">Installing Software</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-rebuilding") %>>
-									<a href="/docs/enterprise/packer/builds/rebuilding.html">Rebuilding</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-linkedapps") %>>
-									<a href="/docs/enterprise/packer/builds/linked-applications.html">Linked Applications</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-runbuilds") %>>
-									<a href="/docs/enterprise/packer/builds/how-builds-run.html">How Builds Run</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-environment") %>>
-									<a href="/docs/enterprise/packer/builds/build-environment.html">Build Environment</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-notifications") %>>
-									<a href="/docs/enterprise/packer/builds/notifications.html">Build Notifications</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-scheduling") %>>
-									<a href="/docs/enterprise/packer/builds/scheduling-builds.html">Scheduling Builds</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-versions") %>>
-									<a href="/docs/enterprise/packer/builds/managing-packer-versions.html">Managing Packer Versions</a>
-								</li>
-								<li<%= sidebar_current("docs-enterprise-packer-builds-troubleshooting") %>>
-									<a href="/docs/enterprise/packer/builds/troubleshooting.html">Troubleshooting</a>
-								</li>
-							</ul>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/runs.erb b/website/source/layouts/runs.erb
deleted file mode 100644
index 4b98fe356..000000000
--- a/website/source/layouts/runs.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-runs-/) %>>
-					<a href="/docs/enterprise/runs/index.html">Runs</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-runs-starting") %>>
-							<a href="/docs/enterprise/runs/starting.html">Starting</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-applies") %>>
-							<a href="/docs/enterprise/runs/automatic-applies.html">Automatic Applies</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-schedule") %>>
-							<a href="/docs/enterprise/runs/scheduling-runs.html">Scheduling Runs</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-variables") %>>
-							<a href="/docs/enterprise/runs/variables-and-configuration.html">Variables and Config</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-installing") %>>
-							<a href="/docs/enterprise/runs/installing-software.html">Installing Software</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-execute") %>>
-							<a href="/docs/enterprise/runs/how-runs-execute.html">How Runs Execute</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-versions") %>>
-							<a href="/docs/enterprise/runs/managing-terraform-versions.html">Managing Terraform Versions</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-runs-notifications") %>>
-							<a href="/docs/enterprise/runs/notifications.html">Run Notifications</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/state.erb b/website/source/layouts/state.erb
deleted file mode 100644
index c678c1d72..000000000
--- a/website/source/layouts/state.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-state-/) %>>
-					<a href="/docs/enterprise/state/index.html">State</a>
-					<ul class="nav nav-visible">
-						<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>
-						<li<%= sidebar_current("docs-enterprise-state-collaborating") %>>
-							<a href="/docs/enterprise/state/collaborating.html">Collaborating</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>
diff --git a/website/source/layouts/vcs.erb b/website/source/layouts/vcs.erb
deleted file mode 100644
index bf2d0d3dd..000000000
--- a/website/source/layouts/vcs.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% wrap_layout :inner do %>
-	<% content_for :sidebar do %>
-		<div class="docs-sidebar hidden-print affix-top" role="complementary">
-			<ul class="nav docs-sidenav">
-				<li>
-					<a href="/docs/enterprise/index.html">&laquo; Terraform Enterprise</a>
-				</li>
-
-				<li<%= sidebar_current(/^docs-enterprise-vcs-/) %>>
-					<a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
-					<ul class="nav nav-visible">
-						<li<%= sidebar_current("docs-enterprise-vcs-git") %>>
-							<a href="/docs/enterprise/vcs/git.html">Git</a>
-						</li>
-						<li<%= sidebar_current("docs-enterprise-vcs-github") %>>
-							<a href="/docs/enterprise/vcs/github.html">GitHub</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</div>
-	<% end %>
-
-	<%= yield %>
-<% end %>