Merge remote-tracking branch 'upstream/master' into lperkins/hugo-version-readme

content/en/docs/concepts/configuration/secret.md

@@ -482,7 +482,9 @@ Create a secret containing some ssh keys:
 $ kubectl create secret generic ssh-key-secret --from-file=ssh-privatekey=/path/to/.ssh/id_rsa --from-file=ssh-publickey=/path/to/.ssh/id_rsa.pub
 ```
 
-**Security Note:** Think carefully before sending your own ssh keys: other users of the cluster may have access to the secret.  Use a service account which you want to be accessible to all the users with whom you share the Kubernetes cluster, and can revoke if they are compromised.
+{{< caution >}}
+**Caution:** Think carefully before sending your own ssh keys: other users of the cluster may have access to the secret.  Use a service account which you want to be accessible to all the users with whom you share the Kubernetes cluster, and can revoke if they are compromised.
+{{< /caution >}}
 
 
 Now we can create a pod which references the secret with the ssh key and

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

@@ -1,5 +1,5 @@
 ---
-title: Configure the aggregation layer
+title: Configure the Aggregation Layer
 reviewers:
 - lavalamp
 - cheftako

content/en/docs/tasks/access-kubernetes-api/setup-extension-api-server.md

@@ -1,5 +1,5 @@
 ---
-title: Setup an extension API server
+title: Setup an Extension API Server
 reviewers:
 - lavalamp
 - cheftako

content/en/docs/tasks/administer-federation/configmap.md

@@ -78,10 +78,9 @@ For example, you can do that using kubectl by running:
 kubectl --context=federation-cluster delete configmap
 ```
 
-Note that at this point, deleting a Federated ConfigMap will not delete the
-corresponding ConfigMaps from underlying clusters.
-You must delete the underlying ConfigMaps manually.
-We intend to fix this in the future.
+{{< note >}}
+**Note:** Deleting a Federated ConfigMap does not delete the corresponding ConfigMaps from underlying clusters. You must delete the underlying ConfigMaps manually.
+{{< /note >}}
 
 {{% /capture %}}
 

content/en/docs/tasks/administer-federation/hpa.md

@@ -122,10 +122,10 @@ in the previous section.
 
 You can delete a federated HPA as you would delete a Kubernetes
 HPA; however, for a federated HPA, you must send the request to
-the federation API server instead of sending it to a specific Kubernetes cluster.
-It should also be noted that for the federated resource to be deleted from
-all underlying clusters, [cascading deletion](/docs/concepts/cluster-administration/federation/#cascading-deletion)
-should be used.
+the federation API server instead of to a specific Kubernetes cluster.
+{{< note >}}
+**Note:** For the federated resource to be deleted from all underlying clusters, [cascading deletion](/docs/concepts/cluster-administration/federation/#cascading-deletion) should be used.
+{{< /note >}}
 
 For example, you can do that using `kubectl` by running:
 

content/en/docs/tasks/federation/set-up-cluster-federation-kubefed.md

@@ -206,9 +206,9 @@ newly deployed federation. You can set the current context manually by running:
 ```shell
 kubectl config use-context fellowship
 ```
-{{< /note >}}
 
 where `fellowship` is the name of your federation.
+{{< /note >}}
 
 ### Basic and token authentication support
 

content/en/docs/tasks/manage-daemon/rollback-daemon-set.md

@@ -1,7 +1,7 @@
 ---
 reviewers:
 - janetkuo
-title: Performing a Rollback on a DaemonSet
+title: Perform a Rollback on a DaemonSet
 content_template: templates/task
 ---
 
@@ -139,11 +139,13 @@ DaemonSet template with the template stored in the `ControllerRevision`.
 previous revision through other commands, such as `kubectl edit` or `kubectl
 apply`.
 
-Note that DaemonSet revisions only roll forward. That is to say, after a
-rollback is complete, the revision number (`.revision` field) of the
+{{< note >}}
+**Note:** DaemonSet revisions only roll forward. That is to say, after a
+rollback completes, the revision number (`.revision` field) of the
 `ControllerRevision` being rolled back to will advance. For example, if you
 have revision 1 and 2 in the system, and roll back from revision 2 to revision
 1, the `ControllerRevision` with `.revision: 1` will become `.revision: 3`.
+{{< /note >}}
 
 ## Troubleshooting
 

content/en/docs/tasks/manage-daemon/update-daemon-set.md

@@ -159,11 +159,12 @@ kubectl get pods -l <daemonset-selector-key>=<daemonset-selector-value> -o wide
 ```
 
 Once you've found those nodes, delete some non-DaemonSet pods from the node to
-make room for new DaemonSet pods. Note that this will cause service disruption
-if the deleted pods are not controlled by any controllers, or if the pods aren't
-replicated. This doesn't respect
-[PodDisruptionBudget](/docs/tasks/configure-pod-container/configure-pod-disruption-budget/)
+make room for new DaemonSet pods. 
+{{< note >}}
+**Note:** This will cause service disruption when deleted pods are not controlled by any controllers or pods are not
+replicated. This does not respect [PodDisruptionBudget](/docs/tasks/configure-pod-container/configure-pod-disruption-budget/)
 either.
+{{< /note >}}
 
 #### Broken rollout