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

_includes/user-guide-migration-notice.md

@@ -4,7 +4,7 @@
 <tr>
   <td>
   <p><b>NOTICE</b></p>
-  <p>As of March 14, 2017, the <a href="https://github.com/orgs/kubernetes/teams/sig-docs-maintainers">@kubernetes/sig-docs-maintainers</a> have begun migration of the User Guide content as announced previously to the <a href="https://github.com/kubernetes/community/tree/master/sig-docs">SIG Docs community</a> through the <a href="https://groups.google.com/forum/#!forum/kubernetes-sig-docs">kubernetes-sig-docs</a> group and <a href="https://kubernetes.slack.com/messages/sig-docs/">kubernetes.slack.com #sig-docs</a> channel.</p>
+  <p>As of March 14, 2017, the Kubernetes SIG-Docs-Maintainers group have begun migration of the User Guide content as announced previously to the <a href="https://github.com/kubernetes/community/tree/master/sig-docs">SIG Docs community</a> through the <a href="https://groups.google.com/forum/#!forum/kubernetes-sig-docs">kubernetes-sig-docs</a> group and <a href="https://kubernetes.slack.com/messages/sig-docs/">kubernetes.slack.com #sig-docs</a> channel.</p>
   <p>The user guides within this section are being refactored into topics within Tutorials, Tasks, and Concepts. Anything that has been moved will have a notice placed in its previous location as well as a link to its new location. The reorganization implements the table of contents (ToC) outlined in the <a href="https://docs.google.com/a/google.com/document/d/18hRCIorVarExB2eBVHTUR6eEJ2VVk5xq1iBmkQv8O6I/edit?usp=sharing">kubernetes-docs-toc</a> document and should improve the documentation's findability and readability for a wider range of audiences.</p>
   <p>For any questions, please contact: <a href="mailto:kubernetes-sig-docs@googlegroups.com">kubernetes-sig-docs@googlegroups.com</a></p>
   </td>

docs/concepts/workloads/pods/init-containers.md

@@ -223,7 +223,7 @@ validation error is thrown for any Container sharing a name with another.
 ### Resources
 
 Given the ordering and execution for Init Containers, the following rules
-for resource usage application:
+for resource usage apply:
 
 * The highest of any particular resource request or limit defined on all Init
   Containers is the *effective init request/limit*

docs/tasks/access-application-cluster/load-balance-access-application-cluster.md

@@ -4,7 +4,7 @@ title: Providing Load-Balanced Access to an Application in a Cluster
 
 {% capture overview %}
 
-This page shows how to create a Kubernetes Service object to that provides
+This page shows how to create a Kubernetes Service object that provides
 load-balanced access to an application running in a cluster.
 
 {% endcapture %}

docs/tasks/index.md

@@ -53,8 +53,8 @@ single thing, typically by giving a short sequence of steps.
 * [Assigning Pods to Nodes](/docs/tasks/administer-cluster/assign-pods-nodes/)
 * [Autoscaling the DNS Service in a Cluster](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/)
 * [Safely Draining a Node while Respecting Application SLOs](/docs/tasks/administer-cluster/safely-drain-node/)
-* [Changing reclaim policy of a PersistentVolume](/docs/tasks/administer-cluster/change-pv-reclaim-policy/)
-* [Changing the default StorageClass](/docs/tasks/administer-cluster/change-default-storage-class/)
+* [Changing the Reclaim Policy of a PersistentVolume](/docs/tasks/administer-cluster/change-pv-reclaim-policy/)
+* [Changing the Default StorageClass](/docs/tasks/administer-cluster/change-default-storage-class/)
 
 #### Managing Stateful Applications
 

docs/tasks/kubectl/install.md

@@ -104,7 +104,7 @@ sufficiently up-to-date using `kubectl version`.
 
 ## Configuring kubectl
 
-In order for kubectl to find and access the Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when creating a cluster using kube-up.sh (see the [getting started guides](/docs/getting-started-guides/) for more about creating clusters). If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
+In order for kubectl to find and access the Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when creating a cluster using kube-up.sh or upon successful deployment of Minikube cluster (see the [getting started guides](/docs/getting-started-guides/) for more about creating clusters). If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
 By default, kubectl configuration lives at `~/.kube/config`.
 
 #### Making sure you're ready

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/)