Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (58 commits)
  fix unsupported parameter of wget command
  Update Weave Net's title.
  Update garbage-collection.md
  Correct ASM logo filename
  fixed ASM blurb
  Repair Spotinst logo
  Doc formatting update
  fixing typo
  Minor spelling correction -- "rtk" to "rkt"
  update init-containers.md
  Update local instructions to new method.
  Update ubuntu install instructions.
  Highlighted command for `kubectl proxy`.
  Update Tasks landing page. (#2697)
  Deprecate Guide topics: quick-start ... (#2696)
  Deprecate Guide topic: Secrets Walkthrough. (#2695)
  Update multiple-schedulers doc  (#2063)
  remove extra space
  Reimplement PR #2525
  Deprecate Guide topic: Persistent Volume Walkthrough. (#2692)
  ...

_data/concepts.yml

@@ -33,6 +33,10 @@ toc:
     section:
     - docs/concepts/workloads/pods/pod-lifecycle.md
 
+- title: Clusters
+  section:
+  - docs/concepts/clusters/logging.md
+
 - title: Configuration
   section:
   - docs/concepts/configuration/container-command-args.md

_data/guides.yml

@@ -18,14 +18,11 @@ toc:
 
 - title: Workload Deployment and Management
   section:
-  - docs/user-guide/quick-start.md
-  - docs/user-guide/deploying-applications.md
   - docs/user-guide/managing-deployments.md
   - docs/user-guide/replication-controller/operations.md
   - docs/user-guide/resizing-a-replication-controller.md
   - docs/user-guide/rolling-updates.md
   - docs/user-guide/update-demo/index.md
-  - docs/user-guide/secrets/walkthrough.md
   - docs/user-guide/configmap/index.md
   - docs/user-guide/projected-volume/index.md
   - docs/user-guide/horizontal-pod-autoscaling/walkthrough.md
@@ -57,13 +54,9 @@ toc:
 
 - title: Containers and Pods
   section:
-  - 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/production-pods.md
-  - docs/user-guide/containers.md
   - docs/user-guide/environment-guide/index.md
   - docs/user-guide/compute-resources.md
   - docs/user-guide/pod-states.md
@@ -72,7 +65,6 @@ toc:
   - docs/user-guide/node-selection/index.md
   - docs/user-guide/downward-api/index.md
   - docs/user-guide/downward-api/volume/index.md
-  - docs/user-guide/persistent-volumes/walkthrough.md
   - docs/user-guide/petset/bootstrapping/index.md
 
 - title: Monitoring, Logging, and Debugging Containers

_data/tasks.yml

@@ -29,9 +29,12 @@ toc:
   - docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
   - docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
 
-- title: Debugging Applications in a Cluster
+- title: Monitoring, Logging, and Debugging
   section:
   - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
+  - docs/tasks/debug-application-cluster/debug-init-containers.md
+  - docs/tasks/debug-application-cluster/logging-stackdriver.md
+  - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
 
 - title: Accessing the Kubernetes API
   section:
@@ -51,8 +54,3 @@ toc:
   - docs/tasks/manage-stateful-set/deleting-a-statefulset.md
   - docs/tasks/manage-stateful-set/debugging-a-statefulset.md
   - docs/tasks/manage-stateful-set/delete-pods.md
-
-- title: Troubleshooting
-  section:
-  - docs/tasks/troubleshoot/debug-init-containers.md
-  - docs/tasks/administer-cluster/access-control-identity-management/