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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Moving topics to deprecation phase 2. (#3119)

_data/guides.yml

@@ -47,18 +47,9 @@ toc:
   - docs/user-guide/liveness/index.md
   - docs/user-guide/container-environment.md
   - docs/user-guide/node-selection/index.md
-  - docs/user-guide/petset/bootstrapping/index.md
 
 - title: Monitoring, Logging, and Debugging Containers
   section:
-  - docs/user-guide/monitoring.md
-  - title: Logging
-    section:
-    - docs/user-guide/logging/overview.md
-    - docs/user-guide/logging/stackdriver.md
-    - docs/user-guide/logging/elasticsearch.md
-  - docs/user-guide/connecting-to-applications-proxy.md
-  - docs/user-guide/connecting-to-applications-port-forward.md
   - title: Using Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
 
@@ -156,18 +147,10 @@ toc:
   - docs/admin/kubeadm.md
   - docs/admin/addons.md
   - docs/admin/node-allocatable.md
-  - docs/admin/audit.md
   - docs/admin/ha-master-gce.md
   - docs/admin/namespaces/index.md
   - docs/admin/namespaces/walkthrough.md
   - docs/admin/limitrange/index.md
-  - docs/admin/disruptions.md
-  - docs/admin/resourcequota/index.md
-  - docs/admin/resourcequota/walkthrough.md
-  - docs/admin/resourcequota/limitstorageconsumption.md
-  - docs/admin/rescheduler.md
-  - docs/admin/sysctls.md
-  - docs/admin/cluster-components.md
   - docs/admin/etcd.md
   - docs/admin/etcd_upgrade.md
   - docs/admin/multi-cluster.md