Merge remote-tracking branch 'upstream/v1.3' into actor_reminder_partition

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

@@ -83,8 +83,7 @@ Dapr apps are also able to subscribe to raw events coming from existing pub/sub
 
 <img src="/images/pubsub_subscribe_raw.png" alt="Diagram showing how to subscribe with Dapr when publisher does not use Dapr or CloudEvent" width=1000>
 
-
-### Programmatically subscribe to raw events 
+### Programmatically subscribe to raw events
 
 When subscribing programmatically, add the additional metadata entry for `rawPayload` so the Dapr sidecar automatically wraps the payloads into a CloudEvent that is compatible with current Dapr SDKs.
 
@@ -148,10 +147,25 @@ $app->start();
 
 {{< /tabs >}}
 
-
 ## Declaratively subscribe to raw events
 
-Subscription Custom Resources Definitions (CRDs) do not currently contain metadata attributes ([issue #3225](https://github.com/dapr/dapr/issues/3225)). At this time subscribing to raw events can only be done through programmatic subscriptions.
+Similarly, you can subscribe to raw events declaratively by adding the `rawPayload` metadata entry to your Subscription Custom Resource Definition (CRD):
+
+```yaml
+apiVersion: dapr.io/v1alpha1
+kind: Subscription
+metadata:
+  name: myevent-subscription
+spec:
+  topic: deathStarStatus
+  route: /dsstatus
+  pubsubname: pubsub
+  metadata:
+    rawPayload: "true"
+scopes:
+- app1
+- app2
+```
 
 ## Related links
 

daprdocs/content/en/getting-started/install-dapr-cli.md

@@ -12,40 +12,62 @@ Begin by downloading and installing the Dapr CLI:
 {{< tabs Linux Windows MacOS Binaries>}}
 
 {{% codetab %}}
+### Install from Terminal
+
 This command installs the latest linux Dapr CLI to `/usr/local/bin`:
 ```bash
 wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
 ```
-{{% /codetab %}}
 
-{{% codetab %}}
-This Command Prompt command installs the latest windows Dapr cli to `C:\dapr` and adds this directory to User PATH environment variable.
-```powershell
-powershell -Command "iwr -useb https://raw.githubusercontent.com/dapr/cli/master/install/install.ps1 | iex"
+### Install without `sudo`
+If you do not have access to the `sudo` command or your username is not in the `sudoers` file you can install Dapr to an alternate directory via the `DAPR_INSTALL_DIR` environment variable.
+
+```bash
+wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | DAPR_INSTALL_DIR="$HOME/dapr" /bin/bash
 ```
 {{% /codetab %}}
 
 {{% codetab %}}
+### Install from Command Prompt
+This Command Prompt command installs the latest windows Dapr cli to `C:\dapr` and adds this directory to User PATH environment variable.
+```powershell
+powershell -Command "iwr -useb https://raw.githubusercontent.com/dapr/cli/master/install/install.ps1 | iex"
+```
+
+### Install without administrative rights
+If you do not have admin rights you can install Dapr to an alternate directory via the `DAPR_INSTALL_DIR` environment variable.
+
+```powershell
+$script=iwr -useb https://raw.githubusercontent.com/dapr/cli/master/install/install.ps1; $block=[ScriptBlock]::Create($script); invoke-command -ScriptBlock $block -ArgumentList "", "$HOME/dapr"
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+### Install from Terminal
 This command installs the latest darwin Dapr CLI to `/usr/local/bin`:
 ```bash
 curl -fsSL https://raw.githubusercontent.com/dapr/cli/master/install/install.sh | /bin/bash
 ```
 
-Or you can install via [Homebrew](https://brew.sh):
+### Install from Homebrew
+You can install via [Homebrew](https://brew.sh):
 ```bash
 brew install dapr/tap/dapr-cli
 ```
 
-{{% alert title="Note for M1 Macs" color="primary" %}}
+#### Note for M1 Macs
 For M1 Macs, homebrew is not supported. You will need to use the dapr install script and have the rosetta amd64 compatibility layer installed. If you do not have it installed already, you can run the following:
 
 ```bash
 softwareupdate --install-rosetta
 ```
 
-{{% /alert %}}
-
+### Install without `sudo`
+If you do not have access to the `sudo` command or your username is not in the `sudoers` file you can install Dapr to an alternate directory via the `DAPR_INSTALL_DIR` environment variable.
 
+```bash
+curl -fsSL https://raw.githubusercontent.com/dapr/cli/master/install/install.sh | DAPR_INSTALL_DIR="$HOME/dapr" /bin/bash
+```
 {{% /codetab %}}
 
 {{% codetab %}}
@@ -54,7 +76,7 @@ Each release of Dapr CLI includes various OSes and architectures. These binary v
 1. Download the desired Dapr CLI from the latest [Dapr Release](https://github.com/dapr/cli/releases)
 2. Unpack it (e.g. dapr_linux_amd64.tar.gz, dapr_windows_amd64.zip)
 3. Move it to your desired location.
-   - For Linux/MacOS - `/usr/local/bin`
+   - For Linux/MacOS `/usr/local/bin` is recommended.
    - For Windows, create a directory and add this to your System PATH. For example create a directory called `C:\dapr` and add this directory to your User PATH, by editing your system environment variable.
 {{% /codetab %}}
 {{< /tabs >}}