From cec451a4229317fca47ed317a22404079148cde4 Mon Sep 17 00:00:00 2001
From: Mukundan Sundararajan <musundar@microsoft.com>
Date: Thu, 11 Feb 2021 14:17:23 -0800
Subject: [PATCH 1/3] Fix intellij docs

---
 .../developing-applications/ides/intellij.md  | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/daprdocs/content/en/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md
index 2239a816a..d5854d087 100644
--- a/daprdocs/content/en/developing-applications/ides/intellij.md
+++ b/daprdocs/content/en/developing-applications/ides/intellij.md
@@ -25,7 +25,44 @@ Let's get started!
 
 First, quit IntelliJ.
 
-Create or edit the file in `$HOME/.IdeaIC2019.3/config/tools/External\ Tools.xml` (change IntelliJ version in path if needed) to add a new `<tool></tool>` entry:
+### IntelliJ configuration file location
+
+{{< tabs Windows Linux  MacOS >}}
+
+{{% codetab %}}
+For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
+```powershell
+%USERPROFILE%\AppData\Roaming\JetBrains\IntelliJIdea2020.1\tools\
+``` 
+{{% /codetab %}}
+
+
+{{% codetab %}}
+For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
+ ```shell
+ $HOME/.config/JetBrains/IntelliJIdea2020.1/tools/
+ ```
+{{% /codetab %}}
+
+
+{{% codetab %}}
+For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
+
+```shell
+~/Library/Application Support/JetBrains/IntelliJIdea2020.1/tools/
+``` 
+{{% /codetab %}}
+
+
+{{< /tabs >}}
+
+> The configuration file location is different for version 2019.3 or prior. See [here](https://www.jetbrains.com/help/idea/2019.3/tuning-the-ide.html#config-directory) for more details.
+
+Change the version in the path if needed.
+
+Create or edit the file in `<CONFIG PATH>/tools/External\ Tools.xml` (change IntelliJ version in path if needed). The `<CONFIG PATH>` is OS dependennt as seen above.
+
+Add a new `<tool></tool>` entry:
 
 ```xml
 <toolSet name="External Tools">
@@ -34,7 +71,8 @@ Create or edit the file in `$HOME/.IdeaIC2019.3/config/tools/External\ Tools.xml
   <tool name="dapr for DemoService in examples" description="Dapr sidecar" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="true" showConsoleOnStdErr="true" synchronizeAfterRun="true">
     <exec>
       <!-- 2. For Linux or MacOS use: /usr/local/bin/daprd -->
-      <option name="COMMAND" value="C:\dapr\daprd.exe" />
+      <!-- 2.1 Replace %USERPROFILE% with the full path -->
+      <option name="COMMAND" value="%USERPROFILE%\dapr\daprd.exe" />
       <!-- 3. Choose app, http and grpc ports that do not conflict with other daprd command entries (placement address should not change). -->
       <option name="PARAMETERS" value="-app-id demoservice -app-port 3000 -dapr-http-port 3005 -dapr-grpc-port 52000 -placement-host-address localhost:50005" />
       <!-- 4. Use the folder where the `components` folder is located -->
@@ -53,7 +91,7 @@ Optionally, you may also create a new entry for a sidecar tool that can be reuse
   <!-- 1. Reusable entry for apps with app port. -->
   <tool name="dapr with app-port" description="Dapr sidecar" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="true" showConsoleOnStdErr="true" synchronizeAfterRun="true">
     <exec>
-      <!-- 2. For Linux or MacOS use: /usr/bin/dapr -->
+      <!-- 2. For Linux or MacOS use: /usr/local/bin/dapr -->
       <option name="COMMAND" value="c:\dapr\dapr.exe" />
       <!-- 3. Prompts user 4 times (in order): app id, app port, Dapr's http port, Dapr's grpc port. -->
       <option name="PARAMETERS" value="run --app-id $Prompt$ --app-port $Prompt$ --dapr-http-port $Prompt$ --dapr-grpc-port $Prompt$" />
@@ -64,7 +102,7 @@ Optionally, you may also create a new entry for a sidecar tool that can be reuse
   <!-- 1. Reusable entry for apps without app port. -->
   <tool name="dapr without app-port" description="Dapr sidecar" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="true" showConsoleOnStdErr="true" synchronizeAfterRun="true">
     <exec>
-      <!-- 2. For Linux or MacOS use: /usr/bin/dapr -->
+      <!-- 2. For Linux or MacOS use: /usr/local/bin/dapr -->
       <option name="COMMAND" value="c:\dapr\dapr.exe" />
       <!-- 3. Prompts user 3 times (in order): app id, Dapr's http port, Dapr's grpc port. -->
       <option name="PARAMETERS" value="run --app-id $Prompt$ --dapr-http-port $Prompt$ --dapr-grpc-port $Prompt$" />
@@ -108,3 +146,7 @@ After debugging, make sure you stop both `dapr` and your app in IntelliJ.
 >Note: Since you launched the service(s) using the **dapr** ***run*** CLI command, the **dapr** ***list*** command will show runs from IntelliJ in the list of apps that are currently running with Dapr.
 
 Happy debugging!
+
+## Related links
+
+- [Change](https://intellij-support.jetbrains.com/hc/en-us/articles/206544519-Directories-used-by-the-IDE-to-store-settings-caches-plugins-and-logs) in IntelliJ configuration directory location
\ No newline at end of file

From 79890ad5654beeb3987ea3d6ce3ac700889cf113 Mon Sep 17 00:00:00 2001
From: Mukundan Sundararajan <musundar@microsoft.com>
Date: Thu, 11 Feb 2021 15:06:51 -0800
Subject: [PATCH 2/3] updates

---
 .../en/developing-applications/ides/intellij.md   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/daprdocs/content/en/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md
index d5854d087..8ac232595 100644
--- a/daprdocs/content/en/developing-applications/ides/intellij.md
+++ b/daprdocs/content/en/developing-applications/ides/intellij.md
@@ -23,14 +23,15 @@ Let's get started!
 
 ## Add Dapr as an 'External Tool'
 
-First, quit IntelliJ.
+First, quit IntelliJ before modifying the configurations file directly.
 
 ### IntelliJ configuration file location
+For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
 
 {{< tabs Windows Linux  MacOS >}}
 
 {{% codetab %}}
-For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
+
 ```powershell
 %USERPROFILE%\AppData\Roaming\JetBrains\IntelliJIdea2020.1\tools\
 ``` 
@@ -38,7 +39,6 @@ For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.
 
 
 {{% codetab %}}
-For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
  ```shell
  $HOME/.config/JetBrains/IntelliJIdea2020.1/tools/
  ```
@@ -46,8 +46,6 @@ For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.
 
 
 {{% codetab %}}
-For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in:
-
 ```shell
 ~/Library/Application Support/JetBrains/IntelliJIdea2020.1/tools/
 ``` 
@@ -58,7 +56,7 @@ For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.
 
 > The configuration file location is different for version 2019.3 or prior. See [here](https://www.jetbrains.com/help/idea/2019.3/tuning-the-ide.html#config-directory) for more details.
 
-Change the version in the path if needed.
+Change the version of IntelliJ in the path if needed.
 
 Create or edit the file in `<CONFIG PATH>/tools/External\ Tools.xml` (change IntelliJ version in path if needed). The `<CONFIG PATH>` is OS dependennt as seen above.
 
@@ -70,9 +68,8 @@ Add a new `<tool></tool>` entry:
   <!-- 1. Each tool has its own app-id, so create one per application to be debugged -->
   <tool name="dapr for DemoService in examples" description="Dapr sidecar" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="true" showConsoleOnStdErr="true" synchronizeAfterRun="true">
     <exec>
-      <!-- 2. For Linux or MacOS use: /usr/local/bin/daprd -->
-      <!-- 2.1 Replace %USERPROFILE% with the full path -->
-      <option name="COMMAND" value="%USERPROFILE%\dapr\daprd.exe" />
+      <!-- 2. For Linux or MacOS use: /usr/local/bin/dapr -->
+      <option name="COMMAND" value="C:\dapr\dapr.exe" />
       <!-- 3. Choose app, http and grpc ports that do not conflict with other daprd command entries (placement address should not change). -->
       <option name="PARAMETERS" value="-app-id demoservice -app-port 3000 -dapr-http-port 3005 -dapr-grpc-port 52000 -placement-host-address localhost:50005" />
       <!-- 4. Use the folder where the `components` folder is located -->

From 88f754f13b364cd8b3129eb16f5a2cfb6c1cd402 Mon Sep 17 00:00:00 2001
From: Mukundan Sundararajan <musundar@microsoft.com>
Date: Fri, 12 Feb 2021 10:32:29 -0800
Subject: [PATCH 3/3] Update intellij.md

---
 daprdocs/content/en/developing-applications/ides/intellij.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/daprdocs/content/en/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md
index 8ac232595..e7facc35f 100644
--- a/daprdocs/content/en/developing-applications/ides/intellij.md
+++ b/daprdocs/content/en/developing-applications/ides/intellij.md
@@ -71,7 +71,7 @@ Add a new `<tool></tool>` entry:
       <!-- 2. For Linux or MacOS use: /usr/local/bin/dapr -->
       <option name="COMMAND" value="C:\dapr\dapr.exe" />
       <!-- 3. Choose app, http and grpc ports that do not conflict with other daprd command entries (placement address should not change). -->
-      <option name="PARAMETERS" value="-app-id demoservice -app-port 3000 -dapr-http-port 3005 -dapr-grpc-port 52000 -placement-host-address localhost:50005" />
+      <option name="PARAMETERS" value="run -app-id demoservice -app-port 3000 -dapr-http-port 3005 -dapr-grpc-port 52000 />
       <!-- 4. Use the folder where the `components` folder is located -->
       <option name="WORKING_DIRECTORY" value="C:/Code/dapr/java-sdk/examples" />
     </exec>
@@ -146,4 +146,4 @@ Happy debugging!
 
 ## Related links
 
-- [Change](https://intellij-support.jetbrains.com/hc/en-us/articles/206544519-Directories-used-by-the-IDE-to-store-settings-caches-plugins-and-logs) in IntelliJ configuration directory location
\ No newline at end of file
+- [Change](https://intellij-support.jetbrains.com/hc/en-us/articles/206544519-Directories-used-by-the-IDE-to-store-settings-caches-plugins-and-logs) in IntelliJ configuration directory location