Merge branch 'v1.12' into crypto-reference

dapr · Jan 22, 2024 · cee6d5d · cee6d5d
2 parents c3640c8 + 18785e4
commit cee6d5d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/daprdocs/content/en/contributing/codespaces.md b/daprdocs/content/en/contributing/codespaces.md
@@ -30,6 +30,7 @@ If you haven't already forked the repo, creating the Codespace will also create
 - [dapr/dapr](https://github.com/dapr/dapr)
 - [dapr/components-contrib](https://github.com/dapr/components-contrib)
 - [dapr/cli](https://github.com/dapr/cli)
+- [dapr/docs](https://github.com/dapr/docs)
 - [dapr/python-sdk](https://github.com/dapr/python-sdk)
 
 ## Developing Dapr Components in a Codespace

diff --git a/daprdocs/content/en/contributing/docs-contrib/contributing-docs.md b/daprdocs/content/en/contributing/docs-contrib/contributing-docs.md
@@ -8,6 +8,8 @@ description: Get started with contributing to the Dapr docs
 
 In this guide, you'll learn how to contribute to the [Dapr docs repository](https://github.com/dapr/docs). Since Dapr docs are published to [docs.dapr.io](https://docs.dapr.io), you must make sure your contributions compile and publish correctly.
 
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/uPYuXcaEs-c" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
 ## Prerequisites
 
 Before contributing to the Dapr docs: 

diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md
@@ -251,7 +251,7 @@ To use Mariner-based images for Dapr, you need to add `-mariner` to your Docker
 In the Dapr CLI, you can switch to using Mariner-based images with the `--image-variant` flag.
 
 ```sh
-dapr init --image-variant mariner
+dapr init -k --image-variant mariner
 ```
 
 {{% /codetab %}}