Merge pull request #34966 from krol3/merged-main-dev-1.25

Sync main branch into dev-1.25
2022-07-13 07:37:38 -07:00
parent 40fd3b8281 bde5fe9e2a
commit f61e010b89
271 changed files with 12639 additions and 6126 deletions
@@ -179,9 +179,9 @@ Follow the instructions for [getting started with containerd](https://github.com
 {{% tab name="Linux" %}}
 You can find this file under the path `/etc/containerd/config.toml`.
 {{% /tab %}}
-{{< tab name="Windows" >}}
+{{% tab name="Windows" %}}
 You can find this file under the path `C:\Program Files\containerd\config.toml`.
-{{< /tab >}}
+{{% /tab %}}
 {{< /tabs >}}

 On Linux the default CRI socket for containerd is `/run/containerd/containerd.sock`.