Merge branch 'v1.7' into daprinit_flags

daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-raw.md

@@ -48,7 +48,7 @@ with DaprClient() as d:
     # Create a typed message with content type and body
     resp = d.publish_event(
         pubsub_name='pubsub',
-        topic='TOPIC_A',
+        topic_name='TOPIC_A',
         data=json.dumps(req_data),
         publish_metadata={'rawPayload': 'true'}
     )

daprdocs/content/en/developing-applications/building-blocks/state-management/state-store-ttl.md

@@ -46,7 +46,7 @@ DAPR_STORE_NAME = "statestore"
 
 with DaprClient() as client:
         client.save_state(DAPR_STORE_NAME, "order_1", str(orderId), metadata=(
-            ('ttlInSeconds', '120')
+            ('ttlInSeconds', '120'),
         )) 
 
 ```
@@ -83,4 +83,4 @@ See [this guide]({{< ref state_api.md >}}) for a reference on the state API.
 
 - Learn [how to use key value pairs to persist a state]({{< ref howto-get-save-state.md >}})
 - List of [state store components]({{< ref supported-state-stores >}})
-- Read the [API reference]({{< ref state_api.md >}})
+- Read the [API reference]({{< ref state_api.md >}})

daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md

@@ -702,7 +702,7 @@ go build app.go
 Run the `order-processor` subscriber service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run app.go
+dapr run --app-port 6002 --app-id order-processor --app-protocol http --dapr-http-port 3501 --components-path ../../../components -- go run app.go
 ```
 
 In the `order-processor` subscriber, we're subscribing to the Redis instance called `order_pub_sub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.

daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md

@@ -537,7 +537,7 @@ go build app.go
 Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
-dapr run --app-port 5001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- go run app.go
+dapr run --app-port 6001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- go run app.go
 ```
 
 Each order is received via an HTTP POST request and processed by the

daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md

@@ -285,7 +285,7 @@ git clone https://github.com/dapr/quickstarts.git
 In a terminal window, navigate to the `order-processor` directory.
 
 ```bash
-cd pub_sub/csharp/sdk/order-processor
+cd state_management/csharp/sdk/order-processor
 ```
 
 Recall NuGet packages:
@@ -414,7 +414,7 @@ Install the dependencies:
 mvn clean install
 ```
 
-Run the `order-processor` publisher service alongside a Dapr sidecar.
+Run the `order-processor` service alongside a Dapr sidecar.
 
 ```bash
 dapr run --app-id order-processor --components-path ../../../components -- java -jar target/order-processor-0.0.1-SNAPSHOT.jar