Merge branch 'master' into release-1.5

docs/user-guide/kubectl-cheatsheet.md

@@ -178,7 +178,7 @@ $ KUBE_EDITOR="nano" kubectl edit svc/docker-registry   # Use an alternative edi
 ## Scaling Resources
 
 ```console
-$ kubectl scale --replicas=3 rs/foo                                 # Scale a replicaset named 'foo' to
+$ kubectl scale --replicas=3 rs/foo                                 # Scale a replicaset named 'foo' to 3
 $ kubectl scale --replicas=3 -f foo.yaml                            # Scale a resource specified in "foo.yaml" to 3
 $ kubectl scale --current-replicas=2 --replicas=3 deployment/mysql  # If the deployment named mysql's current size is 2, scale mysql to 3
 $ kubectl scale --replicas=5 rc/foo rc/bar rc/baz                   # Scale multiple replication controllers

docs/user-guide/prereqs.md

@@ -7,30 +7,52 @@ assignees:
 
 To deploy and manage applications on Kubernetes, you’ll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps.
 
-## Installing kubectl
+## Install kubectl Binary Via curl
 
-If you downloaded a pre-compiled [release](https://github.com/kubernetes/kubernetes/releases), kubectl should be under `platforms/<os>/<arch>` from the tar bundle.
-
-If you built from source, kubectl should be either under `_output/local/bin/<os>/<arch>` or `_output/dockerized/bin/<os>/<arch>`.
-
-The kubectl binary doesn't have to be installed to be executable, but the rest of the walkthrough will assume that it's in your PATH.
-
-The simplest way to install is to copy or move kubectl into a dir already in PATH (e.g. `/usr/local/bin`). For example:
+Download the latest release with the command:
 
 ```shell
 # OS X
-$ sudo cp kubernetes/platforms/darwin/amd64/kubectl /usr/local/bin/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl
+
 # Linux
-$ sudo cp kubernetes/platforms/linux/amd64/kubectl /usr/local/bin/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 ```
 
-You also need to ensure it's executable:
+If you want to download a specific version of kubectl you can replace the nested curl command from above with the version you want. (e.g. v1.4.6, v1.5.0-beta.2)
+
+Make the kubectl binary executable and move it to your PATH (e.g. `/usr/local/bin`):
 
 ```shell
-$ sudo chmod +x /usr/local/bin/kubectl
+chmod +x ./kubectl
+sudo mv ./kubectl /usr/local/bin/kubectl
 ```
 
-If you prefer not to copy kubectl, you need to ensure the tool is in your path:
+## Extract kubectl from Release .tar.gz or Compiled Source
+
+If you downloaded a pre-compiled [release](https://github.com/kubernetes/kubernetes/releases), kubectl will be under `platforms/<os>/<arch>` from the tar bundle.
+
+If you compiled kubernetes from source, kubectl should be either under `_output/local/bin/<os>/<arch>` or `_output/dockerized/bin/<os>/<arch>`.
+
+Copy or move kubectl into a directory already in your PATH (e.g. `/usr/local/bin`). For example:
+
+```shell
+# OS X
+sudo cp platforms/darwin/amd64/kubectl /usr/local/bin/kubectl
+
+# Linux
+sudo cp platforms/linux/amd64/kubectl /usr/local/bin/kubectl
+```
+
+Next make it executable with the following command:
+
+```shell
+sudo chmod +x /usr/local/bin/kubectl
+```
+
+The kubectl binary doesn't have to be installed to be executable, but the rest of the walkthrough will assume that it's in your PATH.
+
+If you prefer not to copy kubectl, you need to ensure it is in your path:
 
 ```shell
 # OS X
@@ -57,4 +79,4 @@ If you see a url response, you are ready to go.
 
 ## What's next?
 
-[Learn how to launch and expose your application.](/docs/user-guide/quick-start)
+[Learn how to launch and expose your application.](/docs/user-guide/quick-start)

docs/user-guide/production-pods.md

@@ -11,11 +11,11 @@ You've seen [how to configure and deploy pods and containers](/docs/user-guide/c
 * TOC
 {:toc}
 
-## Persistent storage
+## Using a Volume for storage
 
-The container file system only lives as long as the container does, so when a container crashes and restarts, changes to the filesystem will be lost and the container will restart from a clean slate. To access more-persistent storage, outside the container file system, you need a [*volume*](/docs/user-guide/volumes). This is especially important to stateful applications, such as key-value stores and databases.
+The container file system only lives as long as the container does, so when a container crashes and restarts, changes to the filesystem will be lost and the container will restart from a clean slate. For more consistent storage that lasts for the life of a Pod, you need a [*volume*](/docs/user-guide/volumes). This is especially important to stateful applications, such as key-value stores and databases.
 
-For example, [Redis](http://redis.io/) is a key-value cache and store, which we use in the [guestbook](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/guestbook/) and other examples. We can add a volume to it to store persistent data as follows:
+For example, [Redis](http://redis.io/) is a key-value cache and store, which we use in the [guestbook](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/guestbook/) and other examples. We can add a volume to it to store data as follows:
 
 {% include code.html language="yaml" file="redis-deployment.yaml" ghlink="/docs/user-guide/redis-deployment.yaml" %}