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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fixes typos and corrects links in the minikube guide (#4051)
  Use native patch functionality instead of JQ
  add the introduce of using wildcard '*' in nonResourceURL
  Rephrase doc about Deployment .spec.rollbackTo field
  create-cluster-kubeadm: add ToC using task template
  install-kubeadm: fix What's Next link text

docs/admin/authorization/rbac.md

@@ -247,7 +247,7 @@ Allow "GET" and "POST" requests to the non-resource endpoint "/healthz" and all
 
 ```yaml
 rules:
-- nonResourceURLs: ["/healthz", "/healthz/*"]
+- nonResourceURLs: ["/healthz", "/healthz/*"] # '*' in a nonResourceURL is a suffix glob match
   verbs: ["get", "post"]
 ```
 

docs/concepts/workloads/controllers/deployment.md

@@ -865,13 +865,20 @@ a Pod is considered ready, see [Container Probes](/docs/concepts/workloads/pods/
 
 ### Rollback To
 
-`.spec.rollbackTo` is an optional field with the configuration the Deployment is rolling back to. Setting
+`.spec.rollbackTo` is an optional field with the configuration the Deployment
-this field will trigger a rollback, and this field will be cleared every time a rollback is done.
+should roll back to. Setting this field triggers a rollback, and this field will
+be cleared by the server after a rollback is done.
+
+Because this field will be cleared by the server, it should not be used
+declaratively. For example, you should not perform `kubectl apply` with a
+manifest with `.spec.rollbackTo` field set.
 
 #### Revision
 
-`.spec.rollbackTo.revision` is an optional field specifying the revision to rollback to. This defaults
+`.spec.rollbackTo.revision` is an optional field specifying the revision to roll
-to 0, meaning rollback to the last revision in history.
+back to. Setting to 0 means rolling back to the last revision in history;
+otherwise, means rolling back to the specified revision. This defaults to 0 when
+[`spec.rollbackTo`](#rollback-to) is set.
 
 ### Revision History Limit
 

docs/getting-started-guides/minikube.md

@@ -149,7 +149,7 @@ To use this feature, you can use the `--extra-config` flag on the `minikube star
 
 This flag is repeated, so you can pass it several times with several different values to set multiple options.
 
-This flag takes a string of the form `component.key=value`, where `component` is one of the strings from the above list, `key` is a value on the
+This flag takes a string of the form `component.key=value`, where `component` is one of the strings from the below list, `key` is a value on the
 configuration struct and `value` is the value to set.
 
 Valid `key`s can be found by examining the documentation for the Kubernetes `componentconfigs` for each component.
@@ -226,7 +226,7 @@ However, Minikube is configured to persist files stored under the following host
 * `/var/lib/localkube`
 * `/var/lib/docker`
 
-Here is an example PersistentVolume config to persist data in the '/data' directory:
+Here is an example PersistentVolume config to persist data in the `/data` directory:
 
 ```yaml
 apiVersion: v1
@@ -243,13 +243,15 @@ spec:
 ```
 
 ## Mounted Host Folders
-Some drivers will mount a host folder within the VM so that you can easily share files between the VM and host.  These are not configurable at the moment and different for the driver and OS you are using.  Note: Host folder sharing is not implemented in the KVM driver yet.
+Some drivers will mount a host folder within the VM so that you can easily share files between the VM and host.  These are not configurable at the moment and different for the driver and OS you are using.
+
+**Note:** Host folder sharing is not implemented in the KVM driver yet.
 
 | Driver | OS | HostFolder | VM |
 | --- | --- | --- | --- |
-| Virtualbox | Linux | /home | /hosthome |
+| VirtualBox | Linux | /home | /hosthome |
-| Virtualbox | OSX | /Users | /Users |
+| VirtualBox | OSX | /Users | /Users |
-| Virtualbox | Windows | C://Users | /c/Users |
+| VirtualBox | Windows | C://Users | /c/Users |
 | VMWare Fusion | OSX | /Users | /Users |
 | Xhyve | OSX | /Users | /Users |
 
@@ -258,11 +260,11 @@ Some drivers will mount a host folder within the VM so that you can easily share
 
 To access a private container registry, follow the steps on [this page](/docs/concepts/containers/images/).
 
-We recommend you use ImagePullSecrets, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/home/docker/.docker` directory.
+We recommend you use `ImagePullSecrets`, but if you would like to configure access on the minikube VM you can place the `.dockercfg` in the `/home/docker` directory or the `config.json` in the `/home/docker/.docker` directory.
 
 ## Add-ons
 
-In order to have minikube properly start/restart custom addons, place the addons you wish to be launched with minikube in the `.minikube/addons` directory.  Addons in this folder will be moved to the minikubeVM and launched each time minikube is started/restarted.
+In order to have minikube properly start/restart custom addons, place the addons you wish to be launched with minikube in the `~/.minikube/addons` directory.  Addons in this folder will be moved to the minikubeVM and launched each time minikube is started/restarted.
 
 ## Using Minikube with an HTTP Proxy
 
@@ -293,12 +295,13 @@ Minikube uses [libmachine](https://github.com/docker/machine/tree/master/libmach
 For more information about minikube, see the [proposal](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/local-cluster-ux.md).
 
 ## Additional Links:
-* **Goals and Non-Goals**: For the goals and non-goals of the minikube project, please see our [roadmap](https://github.com/kubernetes/minikube/blob/master/ROADMAP.md).
+* **Goals and Non-Goals**: For the goals and non-goals of the minikube project, please see our [roadmap](https://github.com/kubernetes/minikube/blob/master/docs/contributors/roadmap.md).
 * **Development Guide**: See [CONTRIBUTING.md](https://github.com/kubernetes/minikube/blob/master/CONTRIBUTING.md) for an overview of how to send pull requests.
-* **Building Minikube**: For instructions on how to build/test minikube from source, see the [build guide](https://github.com/kubernetes/minikube/blob/master/BUILD_GUIDE.md)
+* **Building Minikube**: For instructions on how to build/test minikube from source, see the [build guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/build_guide.md)
-* **Adding a New Dependency**: For instructions on how to add a new dependency to minikube see the [adding dependencies guide](https://github.com/kubernetes/minikube/blob/master/ADD_DEPENDENCY.md)
+* **Adding a New Dependency**: For instructions on how to add a new depeindency to minikube see the [adding dependencies guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/adding_a_dependency.md)
-* **Updating Kubernetes**: For instructions on how to add a new dependency to minikube see the [updating Kubernetes guide](https://github.com/kubernetes/minikube/blob/master/UPDATE_KUBERNETES.md)
+* **Adding a New Addon**: For instruction on how to add a new addon for minikube see the [adding an addon guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/adding_an_addon.md)
+* **Updating Kubernetes**: For instructions on how to update kubernetes see the [updating Kubernetes guide](https://github.com/kubernetes/minikube/blob/master/docs/contributors/updating_kubernetes.md)
 
 ## Community
 
-Contributions, questions, and comments are all welcomed and encouraged! minkube developers hang out on [Slack](https://kubernetes.slack.com) in the #minikube channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [kubernetes-dev Google Groups mailing list](https://groups.google.com/forum/#!forum/kubernetes-dev). If you are posting to the list please prefix your subject with "minikube: ".
+Contributions, questions, and comments are all welcomed and encouraged! minikube developers hang out on [Slack](https://kubernetes.slack.com) in the #minikube channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [kubernetes-dev Google Groups mailing list](https://groups.google.com/forum/#!forum/kubernetes-dev). If you are posting to the list please prefix your subject with "minikube: ".

docs/setup/independent/create-cluster-kubeadm.md

@@ -10,7 +10,7 @@ redirect_from:
 - "/docs/getting-started-guides/kubeadm.html"
 ---
 
-## Overview
+{% capture overview %}
 
 This quickstart shows you how to easily install a Kubernetes cluster on machines
 running Ubuntu 16.04, CentOS 7 or HypriotOS v1.0.1+. The installation uses a
@@ -60,14 +60,18 @@ documented here) are, of course, alpha.
 **Be sure to read the [limitations](#limitations)**.  Specifically, configuring
 cloud providers is difficult.  Upgrades are also not well documented or
 particularly easy.
+{% endcapture %}
 
-## Prerequisites
+{% capture prerequisites %}
 
 1. One or more machines running Ubuntu 16.04+, CentOS 7 or HypriotOS v1.0.1+
 1. 1GB or more of RAM per machine (any less will leave little room for your
    apps)
 1. Full network connectivity between all machines in the cluster (public or
    private network is fine)
+{% endcapture %}
+
+{% capture steps %}
 
 ## Objectives
 
@@ -644,3 +648,8 @@ Finally, when running `kubeadm init` you must specify the `--use-kubernetes-vers
 ```bash
 kubeadm init --use-kubernetes-version=v1.5.6
 ```
+
+{% endcapture %}
+
+
+{% include templates/task.md %}

docs/setup/independent/install-kubeadm.md

@@ -100,7 +100,7 @@ details.
 
 {% capture whatsnext %}
 
-* [Installing Kubernetes on Linux with kubeadm](/docs/getting-started-guides/kubeadm/)
+* [Using kubeadm to Create a Cluster](/docs/getting-started-guides/kubeadm/)
 
 {% endcapture %}
 

docs/tasks/configure-pod-container/configure-service-account.md

@@ -175,14 +175,10 @@ NAME             TYPE                              DATA    AGE
 myregistrykey    kubernetes.io/.dockerconfigjson   1       1d
 ```
 
-Next, read/modify/write the service account for the namespace to use this secret as an imagePullSecret.
+Next, modify the default service account for the namespace to use this secret as an imagePullSecret.
 
-Automated version using json and the jq utility:
 ```shell
-kubectl get serviceaccounts default -o json |
+kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "myregistrykey"}]}'
-     jq  'del(.metadata.resourceVersion)'|
-     jq 'setpath(["imagePullSecrets"];[{"name":"myregistrykey"}])' |
-     kubectl replace serviceaccount default -f -
 
 ```