Merge master into dev-1.21 to keep in sync

content/en/docs/reference/setup-tools/kubeadm/implementation-details.md

@@ -28,7 +28,7 @@ The cluster that `kubeadm init` and `kubeadm join` set up should be:
    - lock-down the kubelet API
    - locking down access to the API for system components like the kube-proxy and CoreDNS
    - locking down what a Bootstrap Token can access
- - **Easy to use**: The user should not have to run anything more than a couple of commands:
+ - **User-friendly**: The user should not have to run anything more than a couple of commands:
    - `kubeadm init`
    - `export KUBECONFIG=/etc/kubernetes/admin.conf`
    - `kubectl apply -f <network-of-choice.yaml>`

content/en/docs/reference/setup-tools/kubeadm/kubeadm-join.md

@@ -108,7 +108,7 @@ if the `kubeadm init` command was called with `--upload-certs`.
   control-plane node even if other worker nodes or the network are compromised.
 
 - Convenient to execute manually since all of the information required fits
-  into a single `kubeadm join` command that is easy to copy and paste.
+  into a single `kubeadm join` command.
 
 **Disadvantages:**