From d28bff7284bf6b8baaaea58dae16dd927c0d3c76 Mon Sep 17 00:00:00 2001
From: Steve Perry <steveperry-53@users.noreply.github.com>
Date: Wed, 12 Apr 2017 18:42:34 -0700
Subject: [PATCH] Move Support topics. (#3363)

* Move Support topics.

* Fix toc entry.
---
 _config.yml              |  5 ++---
 _data/reference.yml      |  9 +++++++++
 _data/support.yml        | 18 ------------------
 _layouts/docwithnav.html |  3 +--
 docs/troubleshooting.md  | 10 ----------
 5 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 _data/support.yml
 delete mode 100644 docs/troubleshooting.md

diff --git a/_config.yml b/_config.yml
index 629ff14929..9cc20735bc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -45,12 +45,11 @@ twitter:
 # Tables of contents, stored in the _data folder, that control the sidebar nav
 tocs:
   - docs-home
-  - guides
   - setup
-  - tutorials
+  - guides
   - tasks
+  - tutorials
   - concepts
   - reference
   - samples
-  - support
   - search
diff --git a/_data/reference.yml b/_data/reference.yml
index 897b751dc1..240c325988 100644
--- a/_data/reference.yml
+++ b/_data/reference.yml
@@ -98,3 +98,12 @@ toc:
     path: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/security_context.md
   - title: Security in Kubernetes
     path: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/security.md
+
+- title: Issues and Security
+  section:
+  - title: Kubernetes Issue Tracker on GitHub
+    path: https://github.com/kubernetes/kubernetes/issues/
+  - docs/reporting-security-issues.md
+  - docs/home/deprecation-policy.md
+
+
diff --git a/_data/support.yml b/_data/support.yml
deleted file mode 100644
index 40b03b73e0..0000000000
--- a/_data/support.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-bigheader: "Support"
-abstract: "Troubleshooting resources, frequently asked questions, and community support channels."
-toc:
-- docs/troubleshooting.md
-
-- title: Other Resources
-  section:
-  - title: Kubernetes Issue Tracker on GitHub
-    path: https://github.com/kubernetes/kubernetes/issues/
-  - docs/reporting-security-issues.md
-  - title: Release Notes
-    path: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md
-  - title: Release Roadmap
-    path: https://github.com/kubernetes/kubernetes/milestones/
-
-- title: Deprecation Policy
-  path: /docs/home/deprecation-policy/
-
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index 498568f6ee..765f564588 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -23,14 +23,13 @@
   <div id="vendorStrip" class="light-text">
     <ul>
       <li><a href="/docs/home/" {% if toc.bigheader == "Kubernetes Documentation" %}class="YAH"{% endif %}>HOME</a></li>
-      <li><a href="/docs/user-guide/" {% if toc.bigheader == "Guides" %}class="YAH"{% endif %}>GUIDES</a></li>
       <li><a href="/docs/setup/" {% if toc.bigheader == "Setup" %}class="YAH"{% endif %}>SETUP</a></li>
+      <li><a href="/docs/user-guide/" {% if toc.bigheader == "Guides" %}class="YAH"{% endif %}>GUIDES</a></li>
       <li><a href="/docs/tasks/" {% if toc.bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
       <li><a href="/docs/tutorials/" {% if toc.bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
       <li><a href="/docs/concepts/" {% if toc.bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
       <li><a href="/docs/reference/" {% if toc.bigheader == "Reference Documentation" %}class="YAH"{% endif %}>REFERENCE</a></li>
       <li><a href="/docs/samples/" {% if toc.bigheader == "Samples" %}class="YAH"{% endif %}>SAMPLES</a></li>
-      <li><a href="/docs/troubleshooting/" {% if toc.bigheader == "Support" %}class="YAH"{% endif %}>SUPPORT</a></li>
     </ul>
     <div id="searchBox">
       <input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)" autofocus="autofocus">
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
deleted file mode 100644
index 8fc3a15492..0000000000
--- a/docs/troubleshooting.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-assignees:
-- brendandburns
-- davidopp
-title: Support
----
-
-{% include user-guide-content-moved.md %}
-
-[Troubleshooting](/docs/tasks/debug-application-cluster/troubleshooting/)