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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Improve RBAC doc (#3951)
  Clarify CNI acronym
  Fix 404 to kubectl install link
  install-kubectl.md: Fix Windows texts, link to latest macOS binaries

docs/admin/authorization/rbac.md

@@ -416,11 +416,6 @@ When used in a <b>ClusterRoleBinding</b>, it gives full control over every resou
 When used in a <b>RoleBinding</b>, it gives full control over every resource in the rolebinding's namespace, including the namespace itself.</td>
 </tr>
 <tr>
-<td><b>cluster-status</b></td>
-<td>None</td>
-<td>Allows read-only access to basic cluster status information.</td>
-</tr>
-<tr>
 <td><b>admin</b></td>
 <td>None</td>
 <td>Allows admin access, intended to be granted within a namespace using a <b>RoleBinding</b>.
@@ -531,6 +526,8 @@ This is commonly used by add-on API servers for unified authentication and autho
 The [Kubernetes controller manager](/docs/admin/kube-controller-manager/) runs core control loops.
 When invoked with `--use-service-account-credentials`, each control loop is started using a separate service account.
 Corresponding roles exist for each control loop, prefixed with `system:controller:`.
+If the controller manager is not started with `--use-service-account-credentials`, 
+it runs all control loops using its own credential, which must be granted all the relevant roles.
 These roles include:
 
 * system:controller:attachdetach-controller

docs/getting-started-guides/kops.md

@@ -25,7 +25,7 @@ a building block.  kops builds on the kubeadm work.
 
 #### Requirements
 
-You must have [kubectl](http://kubernetes.io/docs/getting-started-guides/kubectl/) installed in order for kops to work.
+You must have [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed in order for kops to work.
 
 #### Installation
 

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

@@ -221,7 +221,7 @@ each other.
 
 **The network must be deployed before any applications.  Also, kube-dns, a
 helper service, will not start up before a network is installed. kubeadm only
-supports CNI based networks (and does not support kubenet).**
+supports Container Network Interface (CNI) based networks (and does not support kubenet).**
 
 Several projects provide Kubernetes pod networks using CNI, some of which also
 support [Network Policy](/docs/concepts/services-networking/networkpolicies/). See the [add-ons

docs/tasks/tools/install-kubectl.md

@@ -28,9 +28,9 @@ Here are a few methods to install kubectl.
 
     To download a specific version, replace the `$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)` portion of the command with the specific version. 
 
-    For example, to download version 1.4.6 on MacOS, type:
+    For example, to download version {{page.fullversion}} on MacOS, type:
 
-        curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/darwin/amd64/kubectl
+        curl -LO https://storage.googleapis.com/kubernetes-release/release/{{page.fullversion}}/bin/darwin/amd64/kubectl
 
 2. Make the kubectl binary executable.
 
@@ -70,27 +70,16 @@ Here are a few methods to install kubectl.
 {% endcapture %}
 
 {% capture win %}
-1. Download the latest release with the command:
+1. Download the latest release {{page.fullversion}} from [this link](https://storage.googleapis.com/kubernetes-release/release/{{page.fullversion}}/bin/windows/amd64/kubectl.exe).
 
-        curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/windows/amd64/kubectl.exe
+    Or if you have `curl` installed, use this command:
-
-    To download a specific version, replace the `$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)` portion of the command with the specific version. 
-
-    For example, to download version {{page.fullversion}} on Windows, type:
 
         curl -LO https://storage.googleapis.com/kubernetes-release/release/{{page.fullversion}}/bin/windows/amd64/kubectl.exe
 
-2. Make the kubectl binary executable.
+    To find out the latest stable version (for example, for scripting), take a look at https://storage.googleapis.com/kubernetes-release/release/stable.txt
 
-    ```
+2. Add the binary in to your PATH.
-    chmod +x ./kubectl
-    ```
 
-3. Move the binary in to your PATH. 
-
-    ```
-    sudo mv ./kubectl /usr/local/bin/kubectl
-    ```
 {% endcapture %}
 
 {% assign tab_names = "macOS,Linux,Windows" | split: ',' | compact %}