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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix example in the "Adding ConfigMap data to a Volume" section
  Update ExternalName example
  Completes PR #3325

* 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io:

docs/concepts/services-networking/service.md

@@ -140,6 +140,8 @@ metadata:
 spec:
   type: ExternalName
   externalName: my.database.example.com
+  ports:
+  - port: 12345
 ```
 
 When looking up the host `my-service.prod.svc.CLUSTER`, the cluster DNS service