merge origin master

content/en/docs/tasks/access-kubernetes-api/configure-aggregation-layer.md

@@ -31,7 +31,7 @@ Configuring the [aggregation layer](/docs/concepts/api-extension/apiserver-aggre
 Enable the aggregation layer via the following kube-apiserver flags. They may have already been taken care of by your provider.
 
     --requestheader-client-ca-file=<path to aggregator CA cert>
-    --requestheader-allowed-names=aggregator
+    --requestheader-allowed-names=front-proxy-client
     --requestheader-extra-headers-prefix=X-Remote-Extra-
     --requestheader-group-headers=X-Remote-Group
     --requestheader-username-headers=X-Remote-User

content/en/docs/tasks/administer-cluster/configure-upgrade-etcd.md

@@ -390,7 +390,9 @@ TARGET_VERSION=2.2.1
 STORAGE_MEDIA_TYPE=application/json
 ```
 
-** Note: this upgrade procedure is for getting from 2.x to 3.x.  Version `3.0.17` is not recommended for running in production (see [prerequisites](#prereqisites) for minimum recommended etcd versions.
+{{< note >}}
+**Note:** This procedure upgrades from 2.x to 3.x.  Version `3.0.17` is not recommended for running in production (see [prerequisites](#prerequisites) for minimum recommended etcd versions).
+{{< /note >}}
 
 ## Notes for etcd Version 2.2.1
 

content/en/docs/tasks/run-application/horizontal-pod-autoscale.md

@@ -4,6 +4,11 @@ reviewers:
 - jszczepkowski
 - directxman12
 title: Horizontal Pod Autoscaler
+feature:
+  title: Horizontal scaling
+  description: >
+    Scale your application up and down with a simple command, with a UI, or automatically based on CPU usage.
+
 content_template: templates/concept
 weight: 90
 ---