Merge branch 'master' into release-1.9

2017-12-15 13:11:00 -06:00
parent 989acbf6f8 0e628e7895
commit c4ea942a40
13 changed files with 273 additions and 122 deletions
@@ -32,7 +32,7 @@ $ kubectl config view
 ```

 Many of the [examples](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/) provide an introduction to using
-kubectl. Complete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/index).
+kubectl. Complete documentation is found in the [kubectl manual](/docs/reference/kubectl/overview/).

 ### Directly accessing the REST API