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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  rephrase the expression of configmap/index.md
  Do not link to org/team links on GitHub
  Fixed typos (#2721)
  Revert "update init-containers.md"
  Fix doc sentence
  Add Minikube reference in the Kubectl configuration doc
  Mention Minikube in the Kubectl configuration doc

# Conflicts:
#	docs/tasks/index.md

docs/user-guide/configmap/index.md

@@ -600,7 +600,7 @@ ConfigMaps reside in a namespace.   They can only be referenced by pods in the s
 
 Quota for ConfigMap size is a planned feature.
 
-Kubelet only supports use of ConfigMap for pods it gets from the API server.  This includes any pods
+Kubelet only supports use of ConfigMap for pods it gets from the API server.  This includes every pod
 created using kubectl, or indirectly via a replication controller.  It does not include pods created
 via the Kubelet's `--manifest-url` flag, its `--config` flag, or its REST API (these are not common
 ways to create pods.)

docs/user-guide/prereqs.md

@@ -10,4 +10,4 @@ redirect_from:
 
 {% include user-guide-content-moved.md %}
 
-[Installing and Setting Up kubectl](/docs/tasks/kubectl/install/)
+[Installing and Setting Up kubectl](/docs/tasks/kubectl/install/)