Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-availability-zones-regions

Author: rolyon

articles/active-directory/develop/active-directory-configurable-token-lifetimes.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 02/19/2020
+ms.date: 04/17/2020
 ms.author: ryanwi
 ms.custom: aaddev, identityplatformtop40
 ms.reviewer: hirsin, jlu, annaba
@@ -240,19 +240,25 @@ In this example, you create a policy that lets your users' sign in less frequent
         }')
         ```
 
-    2. To create the policy, run the following command:
+    1. To create the policy, run the following command:
 
         ```powershell
         $policy = New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1, "MaxAgeSingleFactor":"until-revoked"}}') -DisplayName "OrganizationDefaultPolicyScenario" -IsOrganizationDefault $true -Type "TokenLifetimePolicy"
         ```
 
-    3. To see your new policy, and to get the policy's **ObjectId**, run the following command:
+    1. To remove any whitespace, run the following command:
+
+        ```powershell
+        Get-AzureADPolicy -id | set-azureadpolicy -Definition @($((Get-AzureADPolicy -id ).Replace(" ","")))
+        ```
+
+    1. To see your new policy, and to get the policy's **ObjectId**, run the following command:
 
         ```powershell
         Get-AzureADPolicy -Id $policy.Id
         ```
 
-2. Update the policy.
+1. Update the policy.
 
     You might decide that the first policy you set in this example is not as strict as your service requires. To set your Single-Factor Refresh Token to expire in two days, run the following command:
 
@@ -274,21 +280,21 @@ In this example, you create a policy that requires users to authenticate more fr
         $policy = New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1,"AccessTokenLifetime":"02:00:00","MaxAgeSessionSingleFactor":"02:00:00"}}') -DisplayName "WebPolicyScenario" -IsOrganizationDefault $false -Type "TokenLifetimePolicy"
         ```
 
-    2. To see your new policy, and to get the policy **ObjectId**, run the following command:
+    1. To see your new policy, and to get the policy **ObjectId**, run the following command:
 
         ```powershell
         Get-AzureADPolicy -Id $policy.Id
         ```
 
-2. Assign the policy to your service principal. You also need to get the **ObjectId** of your service principal.
+1. Assign the policy to your service principal. You also need to get the **ObjectId** of your service principal.
 
     1. Use the [Get-AzureADServicePrincipal](/powershell/module/azuread/get-azureadserviceprincipal) cmdlet to see all your organization's service principals or a single service principal.
         ```powershell
         # Get ID of the service principal
         $sp = Get-AzureADServicePrincipal -Filter "DisplayName eq '<service principal display name>'"
         ```
 
-    2. When you have the service principal, run the following command:
+    1. When you have the service principal, run the following command:
         ```powershell
         # Assign policy to a service principal
         Add-AzureADServicePrincipalPolicy -Id $sp.ObjectId -RefObjectId $policy.Id
@@ -305,13 +311,13 @@ In this example, you create a policy that requires users to authenticate less fr
         $policy = New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1,"MaxInactiveTime":"30.00:00:00","MaxAgeMultiFactor":"until-revoked","MaxAgeSingleFactor":"180.00:00:00"}}') -DisplayName "WebApiDefaultPolicyScenario" -IsOrganizationDefault $false -Type "TokenLifetimePolicy"
         ```
 
-    2. To see your new policy, run the following command:
+    1. To see your new policy, run the following command:
 
         ```powershell
         Get-AzureADPolicy -Id $policy.Id
         ```
 
-2. Assign the policy to your web API. You also need to get the **ObjectId** of your application. Use the [Get-AzureADApplication](/powershell/module/azuread/get-azureadapplication) cmdlet to find your app's **ObjectId**, or use the [Azure portal](https://portal.azure.com/).
+1. Assign the policy to your web API. You also need to get the **ObjectId** of your application. Use the [Get-AzureADApplication](/powershell/module/azuread/get-azureadapplication) cmdlet to find your app's **ObjectId**, or use the [Azure portal](https://portal.azure.com/).
 
     Get the **ObjectId** of your app and assign the policy:
 
@@ -334,19 +340,19 @@ In this example, you create a few policies to learn how the priority system work
         $policy = New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1,"MaxAgeSingleFactor":"30.00:00:00"}}') -DisplayName "ComplexPolicyScenario" -IsOrganizationDefault $true -Type "TokenLifetimePolicy"
         ```
 
-    2. To see your new policy, run the following command:
+    1. To see your new policy, run the following command:
 
         ```powershell
         Get-AzureADPolicy -Id $policy.Id
         ```
 
-2. Assign the policy to a service principal.
+1. Assign the policy to a service principal.
 
     Now, you have a policy that applies to the entire organization. You might want to preserve this 30-day policy for a specific service principal, but change the organization default policy to the upper limit of "until-revoked."
 
     1. To see all your organization's service principals, you use the [Get-AzureADServicePrincipal](/powershell/module/azuread/get-azureadserviceprincipal) cmdlet.
 
-    2. When you have the service principal, run the following command:
+    1. When you have the service principal, run the following command:
 
         ```powershell
         # Get ID of the service principal
@@ -356,13 +362,13 @@ In this example, you create a few policies to learn how the priority system work
         Add-AzureADServicePrincipalPolicy -Id $sp.ObjectId -RefObjectId $policy.Id
         ```
 
-3. Set the `IsOrganizationDefault` flag to false:
+1. Set the `IsOrganizationDefault` flag to false:
 
     ```powershell
     Set-AzureADPolicy -Id $policy.Id -DisplayName "ComplexPolicyScenario" -IsOrganizationDefault $false
     ```
 
-4. Create a new organization default policy:
+1. Create a new organization default policy:
 
     ```powershell
     New-AzureADPolicy -Definition @('{"TokenLifetimePolicy":{"Version":1,"MaxAgeSingleFactor":"until-revoked"}}') -DisplayName "ComplexPolicyScenarioTwo" -IsOrganizationDefault $true -Type "TokenLifetimePolicy"

articles/azure-app-configuration/quickstart-feature-flag-spring-boot.md

@@ -4,7 +4,7 @@ description: Add feature flags to Spring Boot apps and manage them using Azure A
 author: lisaguthrie
 ms.service: azure-app-configuration
 ms.topic: quickstart
-ms.date: 04/13/2020
+ms.date: 04/18/2020
 ms.author: lcozzens
 
 #Customer intent: As an Spring Boot developer, I want to use feature flags to control feature availability quickly and confidently.
@@ -52,9 +52,9 @@ Use the [Spring Initializr](https://start.spring.io/) to create a new Spring Boo
 
 1. After you extract the files on your local system, your Spring Boot application is ready for editing. Locate  *pom.xml* in the root directory of your app.
 
-1. Open the *pom.xml* file in a text editor and add the following to the list of `<dependencies>`.:
+1. Open the *pom.xml* file in a text editor and add the following to the list of `<dependencies>`:
 
-### Spring Cloud 1.1.x
+    **Spring Cloud 1.1.x**
 
     ```xml
     <dependency>
@@ -73,7 +73,7 @@ Use the [Spring Initializr](https://start.spring.io/) to create a new Spring Boo
     </dependency>
     ```
 
-### Spring Cloud 1.2.x
+    **Spring Cloud 1.2.x**
 
     ```xml
     <dependency>

articles/azure-app-configuration/quickstart-java-spring-app.md

@@ -8,7 +8,7 @@ manager: maiye
 editor: ''
 ms.service: azure-app-configuration
 ms.topic: quickstart
-ms.date: 12/17/2019
+ms.date: 04/18/2020
 ms.author: lcozzens
 
 #Customer intent: As a Java Spring developer, I want to manage all my app settings in one place.
@@ -139,25 +139,25 @@ Use the [Spring Initializr](https://start.spring.io/) to create a new Spring Boo
 1. Create a new file named `bootstrap.properties` under the resources directory of your app, and add the following lines to the file. Replace the sample values with the appropriate properties for your App Configuration store.
 
     ```CLI
-    spring.cloud.azure.appconfiguration.stores[0].name= ${APP_CONFIGURATION_CONNECTION_STRING}
+    spring.cloud.azure.appconfiguration.stores[0].connection-string=${APP_CONFIGURATION_CONNECTION_STRING}
     ```
 
 1. Set an environment variable named **APP_CONFIGURATION_CONNECTION_STRING**, and set it to the access key to your App Configuration store. At the command line, run the following command and restart the command prompt to allow the change to take effect:
 
     ```cmd
-        setx APP_CONFIGURATION_CONNECTION_STRING "connection-string-of-your-app-configuration-store"
+    setx APP_CONFIGURATION_CONNECTION_STRING "connection-string-of-your-app-configuration-store"
     ```
 
     If you use Windows PowerShell, run the following command:
 
     ```azurepowershell
-        $Env:APP_CONFIGURATION_CONNECTION_STRING = "connection-string-of-your-app-configuration-store"
+    $Env:APP_CONFIGURATION_CONNECTION_STRING = "connection-string-of-your-app-configuration-store"
     ```
 
     If you use macOS or Linux, run the following command:
 
     ```cmd
-        export APP_CONFIGURATION_CONNECTION_STRING='connection-string-of-your-app-configuration-store'
+    export APP_CONFIGURATION_CONNECTION_STRING='connection-string-of-your-app-configuration-store'
     ```
 
 ## Build and run the app locally

articles/governance/blueprints/how-to/import-export-ps.md

@@ -100,7 +100,7 @@ manually created blueprint definition in the [required folder structure](#folder
 you can import that blueprint definition to a different management group or subscription.
 
 For examples of built-in blueprint definitions, see the
-[Azure Blueprint GitHub repo](https://github.com/Azure/azure-blueprints/tree/master/samples/builtins).
+[Azure Blueprint GitHub repo](https://github.com/Azure/azure-blueprints/tree/master/samples/001-builtins).
 
 - **Name** [required]
   - Specifies the name for the new blueprint definition

articles/hdinsight/security-baseline.md

@@ -703,7 +703,7 @@ Optionally, if you have a Rapid7, Qualys, or any other vulnerability management
 
 How to Install Rapid7 Agent Manually:
 
-https://insightvm.help.rapid7.com/v1.0/docs/agent-installation-on-linux
+https://insightvm.help.rapid7.com/docs/install
 
 How to install Qualys Agent Manually:
 

articles/machine-learning/team-data-science-process/hive-criteo-walkthrough.md

@@ -428,7 +428,7 @@ For the **Import Data** module, the values of the parameters that are provided i
 
 1. Choose "Hive query" for **Data Source**
 2. In the **Hive database query** box, a simple SELECT * FROM <your\_database\_name.your\_table\_name> - is enough.
-3. **Hcatalog server URI**: If your cluster is "abc", then this is simply: https://abc.azurehdinsight.net
+3. **Hcatalog server URI**: If your cluster is "abc", then this is simply: https:\//abc.azurehdinsight.net
 4. **Hadoop user account name**: The user name chosen at the time of commissioning the cluster. (NOT the Remote Access user name!)
 5. **Hadoop user account password**: The password for the user name chosen at the time of commissioning the cluster. (NOT the Remote Access password!)
 6. **Location of output data**: Choose "Azure"

articles/machine-learning/team-data-science-process/hive-walkthrough.md

@@ -715,7 +715,7 @@ To issue Hive queries in the [Import Data][import-data] module of Machine Learni
 
 Here are some details about the [Import Data][import-data] module and the parameters to input:
 
-**HCatalog server URI**: If the cluster name is **abc123**, then use: https://abc123.azurehdinsight.net.
+**HCatalog server URI**: If the cluster name is **abc123**, then use: https:\//abc123.azurehdinsight.net.
 
 **Hadoop user account name**: The user name chosen for the cluster (not the remote access user name).
 

articles/machine-learning/team-data-science-process/predictive-maintenance-playbook.md

@@ -461,6 +461,6 @@ Microsoft Azure offers learning paths for the foundational concepts behind PdM t
 | [Microsoft AI YouTube Webinars](https://www.youtube.com/watch?v=NvrH7_KKzoM&t=4s) | Public |
 | [Microsoft AI Show](https://channel9.msdn.com/Shows/AI-Show) | Public |
 | [LearnAI@MS](https://learnanalytics.microsoft.com) | Partners |
-| [Microsoft Partner Network](https://learningportal.microsoft.com) | Partners |
+| [Microsoft Partner Network](https://partner.microsoft.com/training/training-center) | Partners |
 
 In addition, free MOOCS (massive open online courses) on AI are offered online by academic  institutions like Stanford and MIT, and other educational companies.

articles/machine-learning/team-data-science-process/team-data-science-process-for-data-scientists.md

@@ -55,7 +55,7 @@ You can use the items in the following table to guide your own self-study. Read
 | Use Azure Machine Learning to create a predictive solution                       | [Azure Machine Learning](../overview-what-is-azure-ml.md)                         | Microsoft Azure Machine Learning uses AI for data wrangling and feature engineering, manages experiments, and tracks model runs. All of this works in a single environment and most functions can run locally or in Azure. You can use the PyTorch, TensorFlow, and other frameworks to create your experiments. In this article, we focus on a complete example of this process, using everything you’ve learned so far.                                                                                                                                                   |                                                                                                                                                                                                                                             |
 | Use Power BI to visualize results                                                         | [Power BI](https://powerbi.microsoft.com/guided-learning/)                                                                                     | Power BI is Microsoft’s data visualization tool. It is available on multiple platforms from Web to mobile devices and desktop computers. In this article, you learn how to work with the output of the solution you’ve created by accessing the results from Azure storage and creating visualizations using Power BI.                                                                                                                                                                                                                                                                                                                             | [Complete this tutorial on Power BI.](https://powerbi.microsoft.com/documentation/powerbi-service-get-started/) Then connect Power BI to the Blob CSV created in an experiment run.                                                                                                                                                                                                                                                                       |
 | Monitor your Solution                                                                     | [Application Insights](../../azure-monitor/app/app-insights-overview.md)                                            | There are multiple tools you can use to monitor your end solution. Azure Application Insights makes it easy to integrate built-in monitoring into your solution.                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | [Set up Application Insights to monitor an Application](https://cmatskas.com/visual-studio-code-integration-with-azure-application-insights/).                                                                                                                                                                                                                                                                                                                  |
-|                                                                                           | [Azure Monitor logs](../../log-analytics/log-analytics-overview.md)                                                   | Another method to monitor your application is to integrate it into your DevOps process. The Azure Monitor logs system provides a rich set of features to help you watch your analytic solutions after you deploy them.                                                                                                                                                                                                                                                                                                                                                                                                                       | [Complete this tutorial](https://docs.loganalytics.io/docs/Learn/Getting-Started/Getting-started-with-the-Analytics-portal) on using Azure Monitor logs.                                                                                                                                                                                                                                                                                                       |
+|                                                                                           | [Azure Monitor logs](../../log-analytics/log-analytics-overview.md)                                                   | Another method to monitor your application is to integrate it into your DevOps process. The Azure Monitor logs system provides a rich set of features to help you watch your analytic solutions after you deploy them.                                                                                                                                                                                                                                                                                                                                                                                                                       | [Complete this tutorial](https://docs.microsoft.com/azure/azure-monitor/log-query/get-started-queries) on using Azure Monitor logs.                                                                                                                                                                                                                                                                                                       |
 | Complete this Learning Path                                                               |                                                                                                                           | Congratulations! You’ve completed this learning path.                                                                                                                                                                                                                                                                                                                                            |
 
 ## Next steps