Merge branch 'master' into release-1.8

docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig.md

@@ -138,7 +138,7 @@ current-context: federal-context
 
 `current-context` is the nickname or 'key' for the cluster,user,namespace tuple that kubectl
 will use by default when loading config from this file. You can override any of the values in kubectl
-from the commandline, by passing `--context=CONTEXT`, `--cluster=CLUSTER`, `--user=USER`, and/or `--namespace=NAMESPACE` respectively.
+from the command line, by passing `--context=CONTEXT`, `--cluster=CLUSTER`, `--user=USER`, and/or `--namespace=NAMESPACE` respectively.
 You can change the `current-context` with [`kubectl config use-context`](/docs/user-guide/kubectl/{{page.version}}/#-em-use-context-em-).
 
 #### miscellaneous
@@ -315,7 +315,7 @@ So, tying this all together, a quick start to create your own kubeconfig file:
 - Make sure your api-server provides at least one set of credentials (for example, `green-user`) when launched.  You will of course have to look at api-server documentation in order to determine the current state-of-the-art in terms of providing authentication details.
 
 ## Related discussion
-[http://issue.k8s.io/1755](http://issue.k8s.io/1755)
+[https://github.com/kubernetes/kubernetes/issues/1755](https://github.com/kubernetes/kubernetes/issues/1755)
 {% endcapture %}
 
 {% include templates/task.md %}

docs/tasks/access-application-cluster/list-all-running-container-images.md

@@ -46,7 +46,7 @@ for all items returned.
 
 As an alternative, it is possible to use the absolute path to the image
 field within the Pod.  This ensures the correct field is retrieved
-in the even the field name is repeated,
+even when the field name is repeated,
 e.g. many fields are called `name` within a given item:
 
 ```sh

docs/tasks/administer-cluster/encrypt-data.md

@@ -137,7 +137,7 @@ program to retrieve the contents of your secret.
 4. Verify the secret is correctly decrypted when retrieved via the API:
 
     ```
-    kubectl describe secret generic -n default
+    kubectl describe secret secret1 -n default
     ```
 
     should match `mykey: mydata`

docs/tasks/debug-application-cluster/determine-reason-pod-failure.md

@@ -72,7 +72,7 @@ the container starts.
 only the termination message:
 
 ```
-{% raw %}    kubectl get pod termination-demo -o go-template="{{range .status.containerStatuses}}{{.lastState.terminated.message}}{{end}}"{% endraw %}
+{% raw %}  kubectl get pod termination-demo -o go-template="{{range .status.containerStatuses}}{{.lastState.terminated.message}}{{end}}"{% endraw %}
 ```
 
 ## Setting the termination log file

docs/tasks/manage-daemon/rollback-daemon-set.md

@@ -99,7 +99,7 @@ kubectl rollout status ds/<daemonset-name>
 When the rollback is complete, the output is similar to this:
 
 ```shell
-daemon set "<daemonset-name>" successfully rolled out
+daemonset "<daemonset-name>" successfully rolled out
 ```
 
 {% endcapture %}