Merge branch 'master' into release-1.12

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

@@ -106,8 +106,8 @@ It is **recommended** that you migrate your old `v1alpha2` configuration to `v1a
 the [kubeadm config migrate](/docs/reference/setup-tools/kubeadm/kubeadm-config/) command,
 because `v1alpha2` will be removed in Kubernetes 1.13.
 
-For more details on each field in the configuration you can navigate to our
-[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm)
+For more details on each field in the `v1alpha3` configuration you can navigate to our
+[API reference pages.] (https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3)
 
 ### Adding kube-proxy parameters {#kube-proxy}
 
@@ -226,7 +226,7 @@ Other CRI-based runtimes include:
 - [frakti](https://github.com/kubernetes/frakti)
 - [rkt](https://github.com/kubernetes-incubator/rktlet)
 
-Refer to the [CRI installation instructions](/docs/setup/cri.md) for more information.
+Refer to the [CRI installation instructions](/docs/setup/cri) for more information.
 
 After you have successfully installed `kubeadm` and `kubelet`, execute
 these two additional steps:
@@ -411,4 +411,4 @@ provisioned). For details, see the [kubeadm join](/docs/reference/setup-tools/ku
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to bootstrap a Kubernetes worker node and join it to the cluster
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
-{{% /capture %}}
+{{% /capture %}}