Merge branch 'master' into page-version

_data/concepts.yml

@@ -2,9 +2,16 @@ bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
 toc:
 - docs/concepts/index.md
+- title: Kubectl Command Line
+  section:
+  - docs/concepts/tools/kubectl/object-management-overview.md
+- title: Kubernetes Objects
+  section:
+  - docs/concepts/abstractions/overview.md
+  - docs/concepts/abstractions/pod.md
+  - title: Controllers
+    section:
+    - docs/concepts/abstractions/controllers/statefulsets.md
 - title: Object Metadata
   section:
   - docs/concepts/object-metadata/annotations.md
-- title: Controllers
-  section:
-  - docs/concepts/abstractions/controllers/statefulsets.md

_data/guides.yml

@@ -65,11 +65,8 @@ toc:
 
 - title: Containers and Pods
   section:
-  - docs/user-guide/simple-nginx.md
-  - docs/user-guide/pods/single-container.md
   - docs/user-guide/pods/multi-container.md
   - docs/user-guide/pods/init-container.md
-  - docs/user-guide/configuring-containers.md
   - docs/user-guide/pod-templates.md
   - docs/user-guide/containers.md
   - docs/user-guide/environment-guide/index.md

_data/support.yml

@@ -3,17 +3,6 @@ abstract: "Troubleshooting resources, frequently asked questions, and community
 toc:
 - docs/troubleshooting.md
 
-- title: Contributing to the Kubernetes Docs
-  section:
-  - editdocs.md
-  - docs/contribute/create-pull-request.md
-  - docs/contribute/write-new-topic.md
-  - docs/contribute/stage-documentation-changes.md
-  - docs/contribute/page-templates.md
-  - docs/contribute/review-issues.md
-  - docs/contribute/style-guide.md
-
-
 - title: Troubleshooting
   section:
   - docs/user-guide/debugging-pods-and-replication-controllers.md
@@ -31,6 +20,16 @@ toc:
   - title: Services FAQ
     path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/
 
+- title: Contributing to the Kubernetes Docs
+  section:
+  - editdocs.md
+  - docs/contribute/create-pull-request.md
+  - docs/contribute/write-new-topic.md
+  - docs/contribute/stage-documentation-changes.md
+  - docs/contribute/page-templates.md
+  - docs/contribute/review-issues.md
+  - docs/contribute/style-guide.md
+
 - title: Other Resources
   section:
   - title: Kubernetes Issue Tracker on GitHub
@@ -40,6 +39,6 @@ toc:
     path: https://github.com/kubernetes/kubernetes/releases/
   - title: Release Roadmap
     path: https://github.com/kubernetes/kubernetes/milestones/
-  
+
 - title: Deprecation Policy
   path: /docs/deprecation-policy.md