Merge branch 'v1.2' into jviviano

daprdocs/content/en/getting-started/configure-state-pubsub.md

@@ -30,7 +30,7 @@ Dapr can use any Redis instance - either containerized on your local dev machine
 {{< tabs "Self-Hosted" "Kubernetes" "Azure" "AWS" "GCP" >}}
 
 {{% codetab %}}
-Redis is automatically installed in self-hosted environments by the Dapr CLI as part of the initialization process. You are all set and can skip to the [next steps](next steps)
+Redis is automatically installed in self-hosted environments by the Dapr CLI as part of the initialization process. You are all set and can skip to the [next steps](#next-steps)
 {{% /codetab %}}
 
 {{% codetab %}}
@@ -127,7 +127,7 @@ spec:
       key: redis-password
 ```
 
-This example uses the the kubernetes secret that was created when setting up a cluster with the above instructions.
+This example uses the kubernetes secret that was created when setting up a cluster with the above instructions.
 
 {{% alert title="Other stores" color="primary" %}}
 If using a state store other than Redis, refer to the [supported state stores]({{< ref supported-state-stores >}}) for information on what options to set.
@@ -155,7 +155,7 @@ spec:
       key: redis-password
 ```
 
-This example uses the the kubernetes secret that was created when setting up a cluster with the above instructions.
+This example uses the kubernetes secret that was created when setting up a cluster with the above instructions.
 
 {{% alert title="Other stores" color="primary" %}}
 If using a pub/sub message broker other than Redis, refer to the [supported pub/sub message brokers]({{< ref supported-pubsub >}}) for information on what options to set.

daprdocs/content/en/operations/configuration/control-concurrency.md

@@ -46,7 +46,7 @@ spec:
         dapr.io/enabled: "true"
         dapr.io/app-id: "nodesubscriber"
         dapr.io/app-port: "3000"
-        <b>dapr.io/app-max-concurrency: "1"</b>
+        dapr.io/app-max-concurrency: "1"
 ...
 ```
 

daprdocs/content/en/reference/api/actors_api.md

@@ -381,7 +381,7 @@ Deletes a timer for an actor.
 
 #### HTTP Request
 
-```http
+```
 DELETE http://localhost:<daprPort>/v1.0/actors/<actorType>/<actorId>/timers/<name>
 ```
 

daprdocs/content/en/reference/api/health_api.md

@@ -14,7 +14,7 @@ Gets the health state for Dapr.
 
 ### HTTP Request
 
-```http
+```
 GET http://localhost:<daprPort>/v1.0/healthz
 ```
 

daprdocs/content/en/reference/api/metadata_api.md

@@ -18,7 +18,7 @@ Gets the Dapr sidecar information provided by the Metadata Endpoint.
 
 ### HTTP Request
 
-```http
+```
 GET http://localhost:<daprPort>/v1.0/metadata
 ```
 
@@ -103,7 +103,7 @@ Adds a custom attribute to the Dapr sidecar information stored by the Metadata E
 
 ### HTTP Request
 
-```http
+```
 PUT http://localhost:<daprPort>/v1.0/metadata/attributeName
 ```
 

daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md

@@ -22,38 +22,38 @@ spec:
   metadata:
   - name: connectionString # Required
     value: "Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}"
-  - name: timeoutInSec # Optional
+  # - name: timeoutInSec # Optional
-    value: 60
+  #   value: 60
-  - name: handlerTimeoutInSec # Optional
+  # - name: handlerTimeoutInSec # Optional
-    value: 60
+  #   value: 60
-  - name: disableEntityManagement # Optional
+  # - name: disableEntityManagement # Optional
-    value: "false"
+  #   value: "false"
-  - name: maxDeliveryCount # Optional
+  # - name: maxDeliveryCount # Optional
-    value: 3
+  #   value: 3
-  - name: lockDurationInSec # Optional
+  # - name: lockDurationInSec # Optional
-    value: 60
+  #   value: 60
-  - name: lockRenewalInSec # Optional
+  # - name: lockRenewalInSec # Optional
-    value: 20
+  #   value: 20
-  - name: maxActiveMessages # Optional
+  # - name: maxActiveMessages # Optional
-    value: 2000
+  #   value: 2000
-  - name: maxActiveMessagesRecoveryInSec # Optional
+  # - name: maxActiveMessagesRecoveryInSec # Optional
-    value: 2
+  #   value: 2
-  - name: maxConcurrentHandlers # Optional
+  # - name: maxConcurrentHandlers # Optional
-    value: 10
+  #   value: 10
-  - name: prefetchCount # Optional
+  # - name: prefetchCount # Optional
-    value: 5
+  #   value: 5
-  - name: defaultMessageTimeToLiveInSec # Optional
+  # - name: defaultMessageTimeToLiveInSec # Optional
-    value: 10
+  #   value: 10
-  - name: autoDeleteOnIdleInSec # Optional
+  # - name: autoDeleteOnIdleInSec # Optional
-    value: 10
+  #   value: 10
-  - name: maxReconnectionAttempts # Optional
+  # - name: maxReconnectionAttempts # Optional
-    value: 30
+  #   value: 30
-  - name: connectionRecoveryInSec # Optional
+  # - name: connectionRecoveryInSec # Optional
-    value: 2
+  #   value: 2
-  - name: publishMaxRetries # Optional
+  # - name: publishMaxRetries # Optional
-    value: 5
+  #   value: 5
-  - name: publishInitialRetryInternalInMs # Optional
+  # - name: publishInitialRetryInternalInMs # Optional
-    value: 500
+  #   value: 500
 ```
 
 > __NOTE:__ The above settings are shared across all topics that use this component.
@@ -66,7 +66,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
 
 | Field              | Required | Details | Example |
 |--------------------|:--------:|---------|---------|
-| connectionString   | Y  | Connection-string for the Service Bus  | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`"
+| connectionString   | Y  | Shared access policy connection-string for the Service Bus  | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`"
 | timeoutInSec       | N  | Timeout for sending messages and management operations. Default: `60` |`30`
 | handlerTimeoutInSec| N  |  Timeout for invoking app handler. # Optional. Default: `60` | `30`
 | disableEntityManagement | N  | When set to true, topics and subscriptions do not get created automatically. Default: `"false"` | `"true"`, `"false"`

sdkdocs/python

@@ -1 +1 @@
-Subproject commit 3d610a4db9a589d85de7fa20c42be1934a1d6f0e
+Subproject commit 058cfcf4d603823c5916bb5ae533bb9f5bb862fd