Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-master

Author: HeidiSteen

articles/frontdoor/media/quickstart-create-front-door/add-backend-host-to-pool-for-front-door.png renamed to articles/frontdoor/media/quickstart-create-front-door/add-backend-host-pool-azure-front-door.png

@@ -38,7 +38,7 @@ If you don't already have a web app, use the following steps to set up example w
 
 1. Select **Web** > **Web App**.
 
-   ![Create a web app in the Azure portal](media/quickstart-create-front-door/create-web-app-for-front-door.png)
+   ![Create a web app in the Azure portal](media/quickstart-create-front-door/create-web-app-azure-front-door.png)
 
 1. In **Web App**, select the **Subscription** to use.
 
@@ -56,7 +56,7 @@ If you don't already have a web app, use the following steps to set up example w
 
 1. Select **Review + create**, review the **Summary**, and then select **Create**. It might take several minutes for the deployment to complete.
 
-   ![Review summary for web app](media/quickstart-create-front-door/summary-for-web-app-for-front-door.png)
+   ![Review summary for web app](media/quickstart-create-front-door/web-app-summary-azure-front-door.png)
 
 After your deployment is complete, create a second web app. Use the same procedure with the same values, except for the following values:
 
@@ -83,7 +83,7 @@ Configure Azure Front Door to direct user traffic based on lowest latency betwee
 
 1. For **Host name**, enter a globally unique hostname. This example uses *contoso-frontend*. Select **Add**.
 
-   ![Add a frontend host for Azure Front Door](media/quickstart-create-front-door/add-frontend-host-for-front-door.png)
+   ![Add a frontend host for Azure Front Door](media/quickstart-create-front-door/add-frontend-host-azure-front-door.png)
 
 Next, create a backend pool that contains your two web apps.
 
@@ -99,7 +99,7 @@ Next, create a backend pool that contains your two web apps.
 
 1. Select your subscription, again, and choose the second web app you created from **Backend host name**. Select **Add**.
 
-   ![Add a backend host to your Front Door](media/quickstart-create-front-door/add-backend-host-to-pool-for-front-door.png)
+   ![Add a backend host to your Front Door](media/quickstart-create-front-door/add-backend-host-pool-azure-front-door.png)
 
 Finally, add a routing rule. A routing rule maps your frontend host to the backend pool. The rule forwards a request for `contoso-frontend.azurefd.net` to **myBackendPool**.
 
@@ -112,7 +112,7 @@ Finally, add a routing rule. A routing rule maps your frontend host to the backe
 
 1. Select **Review + Create**, and then **Create**.
 
-   ![Configured Azure Front Door](media/quickstart-create-front-door/configuration-of-front-door.png)
+   ![Configured Azure Front Door](media/quickstart-create-front-door/configuration-azure-front-door.png)
 
 ## View Azure Front Door in action
 
@@ -137,7 +137,7 @@ To test instant global failover in action, try the following steps:
 
 1. Refresh your browser. This time, you should see an error message.
 
-   ![Both instances of the web app stopped](media/quickstart-create-front-door/service-has-been-stopped.png)
+   ![Both instances of the web app stopped](media/quickstart-create-front-door/web-app-stopped-message.png)
 
 ## Clean up resources
 

articles/frontdoor/media/quickstart-create-front-door/add-frontend-host-for-front-door.png renamed to articles/frontdoor/media/quickstart-create-front-door/add-frontend-host-azure-front-door.png

@@ -7,7 +7,7 @@ ms.author: hrasheed
 ms.reviewer: jasonh
 ms.service: hdinsight
 ms.topic: conceptual
-ms.date: 04/14/2020
+ms.date: 04/23/2020
 ---
 
 # Set up the PySpark interactive environment for Visual Studio Code
@@ -18,9 +18,9 @@ We use **python/pip** command to build virtual environment in your Home path. If
 
 1. Install [Python](https://www.python.org/downloads/) and [pip](https://pip.pypa.io/en/stable/installing/).
 
-   + Install Python from [https://www.python.org/downloads/](https://www.python.org/downloads/).
-   + Install pip from [https://pip.pypa.io/en/stable/installing](https://pip.pypa.io/en/stable/installing/) (if it's not installed from the Python installation).
-   + Validate that Python and pip are installed successfully by using the following commands. (Optional)
+   * Install Python from [https://www.python.org/downloads/](https://www.python.org/downloads/).
+   * Install pip from [https://pip.pypa.io/en/stable/installing](https://pip.pypa.io/en/stable/installing/) (if it's not installed from the Python installation).
+   * Validate that Python and pip are installed successfully by using the following commands. (Optional)
 
         ![Check Python pip version command](./media/set-up-pyspark-interactive-environment/check-python-pip-version.png)
 
@@ -59,12 +59,4 @@ Restart VS Code, and then go back to the script editor that's running **HDInsigh
 
 * [Use Azure HDInsight Tool for Visual Studio Code](hdinsight-for-vscode.md)
 * [Use Azure Toolkit for IntelliJ to create and submit Apache Spark Scala applications](spark/apache-spark-intellij-tool-plugin.md)
-* [Use Azure Toolkit for IntelliJ to debug Apache Spark applications remotely through SSH](spark/apache-spark-intellij-tool-debug-remotely-through-ssh.md)
-* [Use Azure Toolkit for IntelliJ to debug Apache Spark applications remotely through VPN](spark/apache-spark-intellij-tool-plugin-debug-jobs-remotely.md)
-* [Use HDInsight Tools in Azure Toolkit for Eclipse to create Apache Spark applications](spark/apache-spark-eclipse-tool-plugin.md)
-* [Use Apache Zeppelin notebooks with an Apache Spark cluster on HDInsight](spark/apache-spark-zeppelin-notebook.md)
-* [Kernels available for Jupyter notebook in an Apache Spark cluster for HDInsight](spark/apache-spark-jupyter-notebook-kernels.md)
-* [Use external packages with Jupyter notebooks](spark/apache-spark-jupyter-notebook-use-external-packages.md)
 * [Install Jupyter on your computer and connect to an HDInsight Spark cluster](spark/apache-spark-jupyter-notebook-install-locally.md)
-* [Visualize Apache Hive data with Microsoft Power BI in Azure HDInsight](hadoop/apache-hadoop-connect-hive-power-bi.md)
-* [Use Apache Zeppelin to run Apache Hive queries in Azure HDInsight](./interactive-query/hdinsight-connect-hive-zeppelin.md)

articles/frontdoor/media/quickstart-create-front-door/configuration-of-front-door.png renamed to articles/frontdoor/media/quickstart-create-front-door/configuration-azure-front-door.png

@@ -7,7 +7,7 @@ ms.reviewer: jasonh
 ms.service: hdinsight
 ms.topic: conceptual
 ms.custom: hdinsightactive
-ms.date: 04/02/2020
+ms.date: 04/23/2020
 ---
 
 # Install Jupyter notebook on your computer and connect to Apache Spark on HDInsight
@@ -177,5 +177,5 @@ Reasons to install Jupyter on your computer and then connect it to an Apache Spa
 ## Next steps
 
 * [Overview: Apache Spark on Azure HDInsight](apache-spark-overview.md)
-* [Apache Spark with BI: Analyze Apache Spark data using Power BI in HDInsight](apache-spark-use-bi-tools.md)
-* [Apache Spark with Machine Learning: Use Spark in HDInsight for analyzing building temperature using HVAC data](apache-spark-ipython-notebook-machine-learning.md)
+* [Kernels for Jupyter notebook on Apache Spark](apache-spark-jupyter-notebook-kernels.md)
+* [Use external packages with Jupyter notebooks in Apache Spark](apache-spark-jupyter-notebook-use-external-packages.md)

articles/frontdoor/media/quickstart-create-front-door/create-web-app-for-front-door.png renamed to articles/frontdoor/media/quickstart-create-front-door/create-web-app-azure-front-door.png

@@ -41,7 +41,7 @@ You cannot reuse the name of a key vault that has been soft-deleted until the re
 
 ### Purge protection 
 
-Purge protection is an optional Key Vault behavior and is **not enabled by default**. It can be turned on via [CLI](soft-delete-cli.md#enabling-purge-protection) or [PowerShell](soft-delete-powershell.md#enabling-purge-protection).
+Purge protection is an optional Key Vault behavior and is **not enabled by default**. Purge protection can only be enabled once soft-delete is enabled.  It can be turned on via [CLI](soft-delete-cli.md#enabling-purge-protection) or [PowerShell](soft-delete-powershell.md#enabling-purge-protection).
 
 When purge protection is on, a vault or an object in the deleted state cannot be purged until the retention period has passed. Soft-deleted vaults and objects can still be recovered, ensuring that the retention policy will be followed.