Merge remote-tracking branch 'upstream/master' into dev-1.19

content/en/docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md

@@ -75,7 +75,7 @@ set to RUNNING until the postStart handler completes.
 Kubernetes sends the preStop event immediately before the Container is terminated.
 Kubernetes' management of the Container blocks until the preStop handler completes,
 unless the Pod's grace period expires. For more details, see
-[Termination of Pods](/docs/concepts/workloads/pods/pod/#termination-of-pods).
+[Pod Lifecycle](/docs/concepts/workloads/pods/pod-lifecycle/).
 
 {{< note >}}
 Kubernetes only sends the preStop event when a Pod is *terminated*.

content/en/docs/tasks/configure-pod-container/static-pod.md

@@ -14,7 +14,7 @@ without the {{< glossary_tooltip text="API server" term_id="kube-apiserver" >}}
 observing them.
 Unlike Pods that are managed by the control plane (for example, a
 {{< glossary_tooltip text="Deployment" term_id="deployment" >}});
-instead, the kubelet watches each static Pod (and restarts it if it crashes).
+instead, the kubelet watches each static Pod (and restarts it if it fails).
 
 Static Pods are always bound to one {{< glossary_tooltip term_id="kubelet" >}} on a specific node.