Merge branch 'v1.15' into endgame_1.15-updates

Author: hhunter-ms

daprdocs/content/en/concepts/dapr-services/scheduler.md

@@ -65,11 +65,11 @@ For non-client side errors, for example, when a job cannot be sent to an availab
 
 The Scheduler service Docker container is started automatically as part of `dapr init`. It can also be run manually as a process if you are running in [slim-init mode]({{< ref self-hosted-no-docker.md >}}).
 
-## Kubernetes mode
+The Scheduler can be run in both high availability (HA) and non-HA modes in self-hosted deployments. However, non-HA mode is not recommended for production use. If switching between non-HA and HA modes, the existing data directory must be removed, which results in loss of jobs and actor reminders. [Run a back-up]({{< ref "#back-up-and-restore-scheduler-data" >}}) before making this change to avoid losing data.
 
-The Scheduler service is deployed as part of `dapr init -k`, or via the Dapr Helm charts. When running in Kubernetes mode, the Scheduler service is configured to run with exactly 3 replicas to ensure data integrity. 
+## Kubernetes mode
 
-You can run Scheduler in high availability (HA) mode. [Learn more about setting HA mode in your Kubernetes service.]({{< ref "kubernetes-production.md#individual-service-ha-helm-configuration" >}})
+The Scheduler service is deployed as part of `dapr init -k`, or via the Dapr Helm charts. Scheduler always runs in high availability (HA) mode in Kubernetes deployments. Scaling the Scheduler service replicas up or down is not possible without incurring data loss due to the nature of the embedded data store. [Learn more about setting HA mode in your Kubernetes service.]({{< ref "kubernetes-production.md#individual-service-ha-helm-configuration" >}})
 
 When a Kubernetes namespace is deleted, all the Job and Actor Reminders corresponding to that namespace are deleted.
 

daprdocs/content/en/developing-applications/building-blocks/conversation/conversation-overview.md

@@ -32,6 +32,19 @@ Prompt caching optimizes performance by storing and reusing prompts that are oft
 
 The PII obfuscation feature identifies and removes any form of sensitve user information from a conversation response. Simply enable PII obfuscation on input and output data to protect your privacy and scrub sensitive details that could be used to identify an individual. 
 
+The PII scrubber obfuscates the following user information:
+- Phone number
+- Email address
+- IP address
+- Street address
+- Credit cards
+- Social Security number
+- ISBN
+- Media Access Control (MAC) address
+- Secure Hash Algorithm 1 (SHA-1) hex
+- SHA-256 hex
+- MD5 hex
+
 ## Demo
 
 Watch the demo presented during [Diagrid's Dapr v1.15 celebration](https://www.diagrid.io/videos/dapr-1-15-deep-dive) to see how the conversation API works using the .NET SDK.

daprdocs/content/en/developing-applications/debugging/_index.md

@@ -2,6 +2,6 @@
 type: docs
 title: "Debugging Dapr applications and the Dapr control plane"
 linkTitle: "Debugging"
-weight: 60
+weight: 50
 description: "Guides on how to debug Dapr applications and the Dapr control plane"
 ---

daprdocs/content/en/developing-applications/debugging/bridge-to-kubernetes.md

@@ -2,6 +2,6 @@
 type: docs
 title: "Components"
 linkTitle: "Components"
-weight: 40
+weight: 70
 description: "Learn more about developing Dapr's pluggable and middleware components"
 ---

daprdocs/content/en/developing-applications/develop-components/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Error codes"
 linkTitle: "Error codes"
-weight: 20
+weight: 30
 description: "Error codes and messages you may encounter while using Dapr"
 ---
 

daprdocs/content/en/developing-applications/error-codes/_index.md

@@ -2,6 +2,6 @@
 type: docs
 title: "Integrations"
 linkTitle: "Integrations"
-weight: 70
+weight: 60
 description: "Dapr integrations with other technologies"
 ---

daprdocs/content/en/developing-applications/integrations/_index.md

@@ -2,6 +2,6 @@
 type: docs
 title: "Local development"
 linkTitle: "Local development"
-weight: 50
+weight: 40
 description: "Capabilities for developing Dapr applications locally"
 ---

daprdocs/content/en/developing-applications/local-development/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "How to: Use the gRPC interface in your Dapr application"
 linkTitle: "gRPC interface"
-weight: 6000
+weight: 400
 description: "Use the Dapr gRPC API in your application"
 ---
 

daprdocs/content/en/developing-applications/integrations/gRPC-integration.md renamed to daprdocs/content/en/developing-applications/local-development/gRPC-integration.md

@@ -124,6 +124,7 @@ apps:
     appDirPath: ./nodeapp/
     appPort: 3000
     containerImage: ghcr.io/dapr/samples/hello-k8s-node:latest
+    containerImagePullPolicy: Always
     createService: true
     env:
       APP_PORT: 3000
@@ -134,6 +135,7 @@ apps:
 
 > **Note:**
 > - If the `containerImage` field is not specified, `dapr run -k -f` produces an error.
+> - The containerImagePullPolicy indicates that a new container image is always downloaded for this app.
 > - The `createService` field defines a basic service in Kubernetes (ClusterIP or LoadBalancer) that targets the `--app-port` specified in the template. If `createService` isn't specified, the application is not accessible from outside the cluster.
 
 For a more in-depth example and explanation of the template properties, see [Multi-app template]({{< ref multi-app-template.md >}}).
@@ -169,4 +171,4 @@ Watch [this video for an overview on Multi-App Run in Kubernetes](https://youtu.
 
 - [Learn the Multi-App Run template file structure and its properties]({{< ref multi-app-template.md >}})
 - [Try out the self-hosted Multi-App Run template with the Service Invocation quickstart]({{< ref serviceinvocation-quickstart.md >}})
-- [Try out the Kubernetes Multi-App Run template with the `hello-kubernetes` tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes)
+- [Try out the Kubernetes Multi-App Run template with the `hello-kubernetes` tutorial](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-kubernetes)