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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Create hyperlink
  Add files via upload
  Fix typo
  Remove from TOC/Search: pods/init-containers ... (#2694)
  Add files via upload
  fix to taint the master node
  Move Guide topics: Container Lifestyle Hooks, Images, Volumes
  Correct ASM logo filename
  fixed ASM blurb
  Repair Spotinst logo
  Remove redundant section in deployments

# Conflicts:
#	docs/getting-started-guides/kubeadm.md
#	docs/user-guide/volumes.md

_data/concepts.yml

@@ -14,6 +14,11 @@ toc:
     - docs/concepts/overview/working-with-objects/annotations.md
   - docs/concepts/overview/kubernetes-api.md
 
+- title: Containers
+  section:
+  - docs/concepts/containers/images.md
+  - docs/concepts/containers/container-lifecycle-hooks.md
+
 - title: Workloads
   section:
   - title: Pods
@@ -48,6 +53,10 @@ toc:
   - docs/concepts/cluster-administration/access-cluster.md
   - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
 
+- title: Storage
+  section:
+  - docs/concepts/storage/volumes.md
+
 - title: Services, Load Balancing, and Networking
   section:
   - docs/concepts/services-networking/dns-pod-service.md

_data/guides.yml

@@ -55,16 +55,12 @@ toc:
 - title: Containers and Pods
   section:
   - docs/user-guide/pods/multi-container.md
-  - docs/user-guide/pods/init-container.md
   - docs/user-guide/pod-templates.md
   - docs/user-guide/environment-guide/index.md
   - docs/user-guide/compute-resources.md
-  - docs/user-guide/pod-states.md
   - docs/user-guide/liveness/index.md
   - docs/user-guide/container-environment.md
   - 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/petset/bootstrapping/index.md
 
 - title: Monitoring, Logging, and Debugging Containers
@@ -75,7 +71,6 @@ toc:
     - docs/user-guide/logging/overview.md
     - docs/user-guide/logging/stackdriver.md
     - docs/user-guide/logging/elasticsearch.md
-  - docs/user-guide/getting-into-containers.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