website: Decommission derelict "guides" section, move some content to "intro"

Guides was already mostly gone. The two major remaining bits (the "core
workflow" guide and the "recommended practices" guide, which deserves a rename)
make much more sense as highly technical marketing material, and thus have a
natural home in the intro section.

website/guides/core-workflow.html.md

@@ -1,5 +1,5 @@
 ---
-layout: "guides"
+layout: "intro"
 page_title: "The Core Terraform Workflow - Guides"
 sidebar_current: "guides-core-workflow"
 description: |-

website/guides/index.html.md

@@ -1,5 +1,5 @@
 ---
-layout: "guides"
+layout: "intro"
 page_title: "Guides"
 sidebar_current: "guides-home"
 description: |-

website/layouts/guides.erb

@@ -1,65 +0,0 @@
-<% wrap_layout :inner do %>
-  <% content_for :sidebar do %>
-    <h4><a href="/guides/index.html">Guides and Whitepapers</a></h4>
-
-    <ul class="nav docs-sidenav">
-      <li<%= sidebar_current("guides-getting-started") %>>
-        <a href="https://learn.hashicorp.com/collections/terraform/aws-get-started?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">Getting Started</a>
-      </li>
-
-      <li<%= sidebar_current("guides-core-workflow") %>>
-        <a href="/guides/core-workflow.html">The Core Terraform Workflow</a>
-      </li>
-
-      <li<%= sidebar_current("recommended-practices") %>><a href="/docs/cloud/guides/recommended-practices/index.html">Terraform Recommended Practices</a>
-        <ul class="nav">
-          <li<%= sidebar_current("recommended-practices-1") %>><a href="/docs/cloud/guides/recommended-practices/part1.html">Part 1: Workflow Overview</a></li>
-          <li<%= sidebar_current("recommended-practices-2") %>><a href="/docs/cloud/guides/recommended-practices/part2.html">Part 2: Evaluating Current Practices</a></li>
-          <li<%= sidebar_current("recommended-practices-3-0") %>><a href="/docs/cloud/guides/recommended-practices/part3.html">Part 3: Evolving Your Practices</a></li>
-          <li<%= sidebar_current("recommended-practices-3-1") %>><a href="/docs/cloud/guides/recommended-practices/part3.1.html">Part 3.1: From Manual to Semi-Automated</a></li>
-          <li<%= sidebar_current("recommended-practices-3-2") %>><a href="/docs/cloud/guides/recommended-practices/part3.2.html">Part 3.2: From Semi-Automated to Infrastructure as Code</a></li>
-          <li<%= sidebar_current("recommended-practices-3-3") %>><a href="/docs/cloud/guides/recommended-practices/part3.3.html">Part 3.3: From Infrastructure as Code to Collaborative IaC</a></li>
-          <li<%= sidebar_current("recommended-practices-3-4") %>><a href="/docs/cloud/guides/recommended-practices/part3.4.html">Part 3.4: Advanced Improvements</a></li>
-        </ul>
-      </li>
-
-      <li<%= sidebar_current("guides-running-terraform-in-automation") %>>
-        <a href="https://learn.hashicorp.com/tutorials/terraform/automate-terraform?in=terraform/automation&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">Running Terraform in Automation</a>
-      </li>
-
-      <li<%= sidebar_current("upgrade-guides") %>>
-        <a href="/upgrade-guides/index.html">Upgrade Guides</a>
-        <ul class="nav">
-          <li<%= sidebar_current("upgrade-guides-0-14") %>>
-            <a href="/upgrade-guides/0-14.html">Upgrading to v0.14</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-13") %>>
-            <a href="/upgrade-guides/0-13.html">Upgrading to v0.13</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-12") %>>
-            <a href="/upgrade-guides/0-12.html">Upgrading to v0.12</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-11") %>>
-            <a href="/upgrade-guides/0-11.html">Upgrading to v0.11</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-10") %>>
-            <a href="/upgrade-guides/0-10.html">Upgrading to v0.10</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-9") %>>
-            <a href="/upgrade-guides/0-9.html">Upgrading to v0.9</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-8") %>>
-            <a href="/upgrade-guides/0-8.html">Upgrading to v0.8</a>
-          </li>
-          <li<%= sidebar_current("upgrade-guides-0-7") %>>
-            <a href="/upgrade-guides/0-7.html">Upgrading to v0.7</a>
-          </li>
-        </ul>
-      </li>
-    </ul>
-
-    <%= partial("layouts/otherdocs", :locals => { :skip => "Guides and Whitepapers" }) %>
-  <% end %>
-
-  <%= yield %>
-<% end %>

website/layouts/intro.erb

@@ -8,45 +8,65 @@
     <h4><a href="/intro/index.html">Introduction to Terraform</a></h4>
 
     <ul class="nav docs-sidenav">
-      <li<%= sidebar_current("what") %>>
+      <li>
         <a href="/intro/index.html">What is Terraform?</a>
       </li>
 
-      <li<%= sidebar_current("use-cases") %>>
+      <li>
         <a href="/intro/use-cases.html">Use Cases</a>
       </li>
 
-      <li<%= sidebar_current("vs-other") %>>
+      <li>
+        <a href="https://learn.hashicorp.com/collections/terraform/aws-get-started?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">Getting Started</a>
+      </li>
+
+      <li>
+        <a href="/guides/core-workflow.html">The Core Terraform Workflow</a>
+      </li>
+
+      <li><a href="/docs/cloud/guides/recommended-practices/index.html">Terraform Recommended Practices</a>
+        <ul class="nav">
+          <li><a href="/docs/cloud/guides/recommended-practices/part1.html">Part 1: Workflow Overview</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part2.html">Part 2: Evaluating Current Practices</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part3.html">Part 3: Evolving Your Practices</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part3.1.html">Part 3.1: From Manual to Semi-Automated</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part3.2.html">Part 3.2: From Semi-Automated to Infrastructure as Code</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part3.3.html">Part 3.3: From Infrastructure as Code to Collaborative IaC</a></li>
+          <li><a href="/docs/cloud/guides/recommended-practices/part3.4.html">Part 3.4: Advanced Improvements</a></li>
+        </ul>
+      </li>
+
+      <li>
         <a href="/intro/vs/index.html">Terraform vs. Other</a>
         <ul class="nav">
-          <li<%= sidebar_current("vs-other-chef") %>>
+          <li>
             <a href="/intro/vs/chef-puppet.html">Chef, Puppet, etc.</a>
           </li>
-          <li<%= sidebar_current("vs-other-cloudformation") %>>
+          <li>
             <a href="/intro/vs/cloudformation.html">CloudFormation, Heat, etc.</a>
           </li>
-          <li<%= sidebar_current("vs-other-boto") %>>
+          <li>
             <a href="/intro/vs/boto.html">Boto, Fog, etc.</a>
           </li>
-          <li<%= sidebar_current("vs-other-custom") %>>
+          <li>
             <a href="/intro/vs/custom.html">Custom Solutions</a>
           </li>
         </ul>
       </li>
 
-      <li<%= sidebar_current("examples") %>>
+      <li>
         <a href="/intro/examples/index.html">Example Configurations</a>
         <ul class="nav">
-          <li<%= sidebar_current("examples-aws") %>>
+          <li>
             <a href="/intro/examples/aws.html">Two-Tier AWS Architecture</a>
           </li>
-          <li<%= sidebar_current("examples-cross-provider") %>>
+          <li>
             <a href="/intro/examples/cross-provider.html">Cross Provider</a>
           </li>
-          <li<%= sidebar_current("examples-count") %>>
+          <li>
             <a href="/intro/examples/count.html">Count Parameter</a>
           </li>
-          <li<%= sidebar_current("examples-consul") %>>
+          <li>
             <a href="/intro/examples/consul.html">Consul</a>
           </li>
         </ul>