diff --git a/_data/guides.yml b/_data/guides.yml
index c692df27b0..a019f8a0fc 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -48,18 +48,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
 
@@ -157,18 +148,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
diff --git a/robots.txt b/robots.txt
index 3594b34fc9..b38e183a50 100644
--- a/robots.txt
+++ b/robots.txt
@@ -40,6 +40,22 @@ Disallow: /docs/user-guide/compute-resources/
 
 Disallow: /docs/whatisk8s/
 
+Disallow: /docs/user-guide/petset/bootstrapping/
+Disallow: /docs/user-guide/monitoring/
+Disallow: /docs/user-guide/logging/overview/
+Disallow: /docs/user-guide/logging/stackdriver/
+Disallow: /docs/user-guide/logging/elasticsearch/
+Disallow: /docs/user-guide/connecting-to-applications-proxy/
+Disallow: /docs/user-guide/connecting-to-applications-port-forward/
+Disallow: /docs/admin/audit/
+Disallow: /docs/admin/disruptions/
+Disallow: /docs/admin/resourcequota/
+Disallow: /docs/admin/resourcequota/walkthrough/
+Disallow: /docs/admin/resourcequota/limitstorageconsumption/
+Disallow: /docs/admin/rescheduler/
+Disallow: /docs/admin/sysctls/
+Disallow: /docs/admin/cluster-components
+
 SITEMAP: http://kubernetes.io/sitemap.xml
 
 
diff --git a/skip_toc_check.txt b/skip_toc_check.txt
index d42d092695..33d7f614e0 100644
--- a/skip_toc_check.txt
+++ b/skip_toc_check.txt
@@ -27,4 +27,20 @@ docs/user-guide/pods/multi-container.md
 docs/user-guide/environment-guide/index.md
 docs/user-guide/compute-resources.md
 
+docs/user-guide/petset/bootstrapping/index.md
+docs/user-guide/monitoring.md
+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
+docs/admin/audit.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/whatisk8s.md