From 4ac4670d978665cda5796743740104bb53cc79c8 Mon Sep 17 00:00:00 2001
From: Peter <45140408+pelithne@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:02:30 +0100
Subject: [PATCH 1/4] Update security-concept.md
Minor wording fix, as described in https://github.com/dapr/docs/issues/1264
---
daprdocs/content/en/concepts/security-concept.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daprdocs/content/en/concepts/security-concept.md b/daprdocs/content/en/concepts/security-concept.md
index 66a2bd304..c130d0fe4 100644
--- a/daprdocs/content/en/concepts/security-concept.md
+++ b/daprdocs/content/en/concepts/security-concept.md
@@ -50,7 +50,7 @@ The diagram below shows how the Sentry system service issues certificates for ap
### mTLS in Kubernetes
-The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service as stored as a Kubernetes secret
+The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service and stored as a Kubernetes secret
From d698cd212fe1aada4294ccc91787ad44ab0ff21c Mon Sep 17 00:00:00 2001
From: darron froese
Date: Thu, 25 Feb 2021 18:28:59 -0700
Subject: [PATCH 2/4] Update setup-nats-streaming.md (#1258)
Missing a single -
---
.../setup-pubsub/supported-pubsub/setup-nats-streaming.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md b/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md
index 004051d77..e8fb5d5a5 100644
--- a/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md
+++ b/daprdocs/content/en/operations/components/setup-pubsub/supported-pubsub/setup-nats-streaming.md
@@ -78,7 +78,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
You can run a NATS server locally using Docker:
```bash
-docker run -d -name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming
+docker run -d --name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming
```
You can then interact with the server using the client port: `localhost:4222`.
From ba0c8eddb8453eb4c923f5121e6296132912508d Mon Sep 17 00:00:00 2001
From: Sahan Serasinghe
Date: Fri, 26 Feb 2021 12:29:46 +1030
Subject: [PATCH 3/4] Update get-started-api.md (#1268)
Improved grammar to get the message clearly across to the reader.
Co-authored-by: Mark Fussell
---
daprdocs/content/en/getting-started/get-started-api.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daprdocs/content/en/getting-started/get-started-api.md b/daprdocs/content/en/getting-started/get-started-api.md
index a574ae797..b795de4f0 100644
--- a/daprdocs/content/en/getting-started/get-started-api.md
+++ b/daprdocs/content/en/getting-started/get-started-api.md
@@ -19,7 +19,7 @@ Run the following command to launch a Dapr sidecar that will listen on port 3500
dapr run --app-id myapp --dapr-http-port 3500
```
-With this command, no custom component folder was defined so the Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to the local Redis Docker container as a state store and message broker.
+With this command, no custom component folder was defined, so Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to use the local Redis Docker container as a state store and message broker.
## Step 2: Save state
From 78e2b60c82fdc1cbd97cd6552ebe86d4895c2451 Mon Sep 17 00:00:00 2001
From: Artur Souza
Date: Fri, 26 Feb 2021 18:33:13 -0800
Subject: [PATCH 4/4] Fix mysql name in helm and Docker.
---
.../setup-state-store/supported-state-stores/setup-mysql.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md
index f49cfb36d..434a7bf8f 100644
--- a/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md
+++ b/daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md
@@ -64,7 +64,7 @@ Run an instance of MySQL. You can run a local instance of MySQL in Docker CE wit
This example does not describe a production configuration because it sets the password in plain text and the user name is left as the MySQL default of "root".
```bash
-docker run --name dapr_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
+docker run --name dapr-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
```
{{% /codetab %}}
@@ -78,7 +78,7 @@ We can use [Helm](https://helm.sh/) to quickly create a MySQL instance in our Ku
```bash
helm repo add bitnami https://charts.bitnami.com/bitnami
- helm install dapr_mysql bitnami/mysql
+ helm install dapr-mysql bitnami/mysql
```
1. Run `kubectl get pods` to see the MySQL containers now running in your cluster.