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

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  bump openstack cli tools versions to working values
  fix header size for sub-sections under Services
  Finish #4036
  Be more specific about cpu-shares passed to Docker (#4016)
  Clarify the required uniqueness of Label Key
  Add --show-all to documentation
  docs(service): remove invalid `,` from example
  Add  "remove" example for kubectl patch (#4042)
  Fix wrong link to create a ConfigMap
  Fix a typo in the High Availability docs (#4048)
  Remove ports from ExternalName Service example
  remove extra that
  update kops installation instructions

docs/concepts/services-networking/dns-pod-service.md

@@ -48,7 +48,7 @@ Services, this resolves to the set of IPs of the pods selected by the Service.
 Clients are expected to consume the set or else use standard round-robin
 selection from the set.
 
-### SRV records
+#### SRV records
 
 SRV Records are created for named ports that are part of normal or [Headless
 Services](https://kubernetes.io/docs/user-guide/services/#headless-services).
@@ -60,7 +60,7 @@ For a headless service, this resolves to multiple answers, one for each pod
 that is backing the service, and contains the port number and a CNAME of the pod
 of the form `auto-generated-name.my-svc.my-namespace.svc.cluster.local`.
 
-### Backwards compatibility
+#### Backwards compatibility
 
 Previous versions of kube-dns made names of the form
 `my-svc.my-namespace.cluster.local` (the 'svc' level was added later).  This

docs/concepts/services-networking/service.md

@@ -140,8 +140,6 @@ 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
@@ -489,17 +487,17 @@ In the ServiceSpec, `externalIPs` can be specified along with any of the `Servic
 In the example below, my-service can be accessed by clients on 80.11.12.10:80 (externalIP:port)
 
 ```yaml
-kind: Service,
-apiVersion: v1,
+kind: Service
+apiVersion: v1
 metadata:
   name: my-service
 spec:
   selector:
     app: MyApp
   ports:
-    - name: http,
-      protocol: TCP,
-      port: 80,
+    - name: http
+      protocol: TCP
+      port: 80
       targetPort: 9376
   externalIPs: 
     - 80.11.12.10