Merge branch 'master' into master

2016-11-21 13:27:31 -08:00
parent bbceda0ba2 5d6460b979
commit 9e3ac0ddb8
48 changed files with 1319 additions and 154 deletions
@@ -345,7 +345,7 @@ can do a DNS SRV query for `"_http._tcp.my-service.my-ns"` to discover the port
 number for `"http"`.

 The Kubernetes DNS server is the only way to access services of type
-`ExternalName`.
+`ExternalName`.  More information is available in the [DNS Admin Guide](http://kubernetes.io/docs/admin/dns/).

 ## Headless services