Merge branch 'master' into mapboxv1

Author: v-nagta

.openpublishing.redirection.json

@@ -33927,6 +33927,11 @@
       "redirect_url": "/azure/role-based-access-control/role-assignments-portal",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/role-based-access-control/tutorial-role-assignments-user-template.md",
+      "redirect_url": "/azure/role-based-access-control/quickstart-role-assignments-template",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/privileged-identity-management/active-directory-securing-privileged-access.md",
       "redirect_url": "/azure/active-directory/users-groups-roles/directory-admin-roles-secure",
@@ -40833,7 +40838,7 @@
     },
     {
       "source_path": "articles/monitoring/monitoring-solutions-inventory.md",
-      "redirect_url": "/azure/azure-monitor/insights/solutions-inventory",
+      "redirect_url": "/azure/azure-monitor/monitor-reference",
       "redirect_document_id": false
     },
     {
@@ -41698,8 +41703,8 @@
     },
     {
       "source_path": "articles/log-analytics/powershell-samples.md",
-      "redirect_url": "/azure/azure-monitor/platform/powershell-samples",
-      "redirect_document_id": true
+      "redirect_url": "/azure/azure-monitor/samples/powershell-samples",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/alert-log.md",
@@ -41838,7 +41843,7 @@
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/insights-cli-samples.md",
-      "redirect_url": "/azure/azure-monitor/platform/cli-samples",
+      "redirect_url": "/azure/azure-monitor/samples/cli-samples",
       "redirect_document_id": true
     },
     {
@@ -43006,6 +43011,41 @@
       "redirect_url": "/azure/azure-monitor/platform/activity-log-collect",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/learn/quick-create-workspace-posh.md",
+      "redirect_url": "/azure/azure-monitor/platform/powershell-workspace-configuration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/powershell-quickstart-samples.md",
+      "redirect_url": "/azure/azure-monitor/platform/powershell-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/cli-samples.md",
+      "redirect_url": "/azure/azure-monitor/samples/cli-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/azure-management.md",
+      "redirect_url": "/azure/azure-monitor/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/insights/solutions-inventory.md",
+      "redirect_url": "/azure/azure-monitor/monitor-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/policy-samples.md",
+      "redirect_url": "/azure/azure-monitor/samples/policy-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/powershell-samples.md",
+      "redirect_url": "/azure/azure-monitor/samples/powershell-samples",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-automated-ml.md",
       "redirect_url": "/azure/machine-learning/service/concept-automated-ml",

articles/active-directory-b2c/identity-provider-salesforce-custom.md

@@ -205,7 +205,7 @@ Now that you have a button in place, you need to link it to an action. The actio
     <ClaimsExchange Id="SalesforceExchange" TechnicalProfileReferenceId="salesforce" />
     ```
 
-    Update the value of **TechnicalProfileReferenceId** to the **ID** of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
+    Update the value of **TechnicalProfileReferenceId** to the **ID** of the technical profile you created earlier. For example, `salesforce` or `LinkedIn-OAUTH`.
 
 3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
 

articles/active-directory-b2c/secure-rest-api.md

@@ -237,7 +237,7 @@ For the ServiceUrl, replace your-tenant-name with the name of your Azure AD tena
   <DisplayName></DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.RestfulProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
   <Metadata>
-    <Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.microsoft.com/oauth2/v2.0/token</Item>
+    <Item Key="ServiceUrl">https://login.microsoftonline.com/your-tenant-name.onmicrosoft.com/oauth2/v2.0/token</Item>
     <Item Key="AuthenticationType">Basic</Item>
      <Item Key="SendClaimsIn">Form</Item>
   </Metadata>

articles/active-directory-domain-services/alert-service-principal.md

@@ -98,7 +98,7 @@ To recreate the Azure AD application used for credential synchronization, use Az
     $app = Get-AzureADApplication -Filter "IdentifierUris eq 'https://sync.aaddc.activedirectory.windowsazure.com'"
     Remove-AzureADApplication -ObjectId $app.ObjectId
     $spObject = Get-AzureADServicePrincipal -Filter "DisplayName eq 'Azure AD Domain Services Sync'"
-    Remove-AzureADServicePrincipal -ObjectId $app.ObjectId
+    Remove-AzureADServicePrincipal -ObjectId $spObject
     ```
 
 After you delete both applications, the Azure platform automatically recreates them and tries to resume password synchronization. The Azure AD DS managed domain's health automatically updates itself within two hours and removes the alert.

articles/active-directory/app-provisioning/toc.yml

@@ -99,8 +99,8 @@
           href: /azure/active-directory/develop/developer-support-help-options
         - name: Azure feedback forum
           href: https://feedback.azure.com/forums/169401-azure-active-directory
-        - name: MSDN forum
-          href: https://social.msdn.microsoft.com/Forums/azure/en-US/home?forum=WindowsAzureAD
+        - name: Microsoft Q&A question page
+          href: https://docs.microsoft.com/answers/topics/azure-active-directory.html
         - name: Pricing
           href: https://azure.microsoft.com/pricing/details/active-directory
         - name: Service updates

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

@@ -1224,10 +1224,6 @@ To help drive awareness and demand of our joint integration, we recommend you up
 ) 
 * **Customer communication.** Alert customers of the new integration through your customer communication (monthly newsletters, email campaigns, product release notes). 
 
-### Allow IP addresses used by the Azure AD provisioning service to make SCIM requests
-
-Certain apps allow inbound traffic to their app. In order for the Azure AD provisioning service to function as expected, the IP addresses used must be allowed. For a list of IP addresses for each service tag/region, see the JSON file - [Azure IP Ranges and Service Tags – Public Cloud](https://www.microsoft.com/download/details.aspx?id=56519). You can download and program these IPs into your firewall as needed. The reserved IP ranges for Azure AD provisioning can be found under "AzureActiveDirectoryDomainServices."
-
 ## Related articles
 
 * [Automate user provisioning and deprovisioning to SaaS apps](user-provisioning.md)

articles/active-directory/authentication/TOC.yml

@@ -138,6 +138,8 @@
       href: howto-password-ban-bad-on-premises-agent-versions.md
   - name: Use SMS-based authentication (preview)
     href: howto-authentication-sms-signin.md
+  - name: Use email address sign-in (preview)
+    href: howto-authentication-use-email-signin.md
   - name: Azure AD smart lockout
     href: howto-password-smart-lockout.md
   - name: Certificate-based authentication
@@ -223,8 +225,8 @@
   items:
   - name: Azure feedback forum
     href: https://feedback.azure.com/forums/169401-azure-active-directory
-  - name: MSDN forum
-    href: https://social.msdn.microsoft.com/Forums/azure/en-US/home?forum=WindowsAzureAD
+  - name: Microsoft Q&A question page
+    href: https://docs.microsoft.com/answers/topics/azure-active-directory.html
   - name: Pricing
     href: https://azure.microsoft.com/pricing/details/active-directory/
   - name: Service updates

articles/active-directory/authentication/active-directory-passwords-faq.md

@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
 
 The following are some frequently asked questions (FAQ) for all things related to password reset.
 
-If you have a general question about Azure Active Directory (Azure AD) and self-service password reset (SSPR) that's not answered here, you can ask the community for assistance on the [Azure AD forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=WindowsAzureAD). Members of the community include engineers, product managers, MVPs, and fellow IT professionals.
+If you have a general question about Azure Active Directory (Azure AD) and self-service password reset (SSPR) that's not answered here, you can ask the community for assistance on the [Microsoft Q&A question page for Azure Active Directory](https://docs.microsoft.com/answers/topics/azure-active-directory.html). Members of the community include engineers, product managers, MVPs, and fellow IT professionals.
 
 This FAQ is split into the following sections:
 

articles/active-directory/authentication/active-directory-passwords-troubleshoot.md

@@ -254,7 +254,7 @@ Azure AD Connect requires Active Directory **Reset password** permission to perf
 
 ## Azure AD forums
 
-If you have a general question about Azure AD and self-service password reset, you can ask the community for assistance on the [Azure AD forums](https://social.msdn.microsoft.com/Forums/en-US/home?forum=WindowsAzureAD). Members of the community include engineers, product managers, MVPs, and fellow IT professionals.
+If you have a general question about Azure AD and self-service password reset, you can ask the community for assistance on the [Microsoft Q&A question page for Azure Active Directory](https://docs.microsoft.com/answers/topics/azure-active-directory.html). Members of the community include engineers, product managers, MVPs, and fellow IT professionals.
 
 ## Contact Microsoft support