Merge pull request #180355 from MicrosoftDocs/master

Merge master to live, 4AM

Author: v-ccolin

articles/active-directory-b2c/TOC.yml

@@ -639,7 +639,7 @@
   - name: Getting help
     href: ../active-directory/develop/developer-support-help-options.md
   - name: Pricing
-    href: https://azure.microsoft.com/pricing/details/active-directory-b2c/
+    href: https://azure.microsoft.com/pricing/details/active-directory/external-identities/
   - name: Pricing calculator
     href: https://azure.microsoft.com/pricing/calculator/
   - name: Service updates

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

@@ -17,7 +17,7 @@
     - name: Customize attribute mappings
       href: customize-application-attributes.md
     - name: App specific provisioning tutorials
-      href: /azure/active-directory/saas-apps
+      href: /azure/active-directory/saas-apps/tutorial-list
     - name: Provisioning to SQL based apps
       href: tutorial-ecma-sql-connector.md
   - name: Concepts
@@ -129,7 +129,7 @@
     - name: Microsoft Q&A question page
       href: /answers/topics/azure-active-directory.html
     - name: Pricing
-      href: https://azure.microsoft.com/pricing/details/active-directory
+      href: https://azure.microsoft.com/pricing/details/active-directory/
     - name: Service updates
       href: https://azure.microsoft.com/updates/?product=active-directory
     - name: Stack Overflow

articles/active-directory/app-provisioning/user-provisioning.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: app-provisioning
 ms.topic: overview
 ms.workload: identity
-ms.date: 05/28/2021
+ms.date: 11/15/2021
 ms.author: kenwith
 ms.reviewer: arvinh
 ---
@@ -19,11 +19,9 @@ In Azure Active Directory (Azure AD), the term *app provisioning* refers to auto
 
 ![Diagram that shows provisioning scenarios.](../governance/media/what-is-provisioning/provisioning.png)
 
-Azure AD to software as a service (SaaS) application provisioning refers to automatically creating user identities and roles in the cloud ([SaaS](https://azure.microsoft.com/overview/what-is-saas/)) applications that users need access to. In addition to creating user identities, automatic provisioning includes the maintenance and removal of user identities as status or roles change. Common scenarios include provisioning an Azure AD user into applications like [Dropbox](../../active-directory/saas-apps/dropboxforbusiness-provisioning-tutorial.md), [Salesforce](../../active-directory/saas-apps/salesforce-provisioning-tutorial.md), [ServiceNow](../../active-directory/saas-apps/servicenow-provisioning-tutorial.md), and more.
+Azure AD application provisioning refers to automatically creating user identities and roles in the applications that users need access to. In addition to creating user identities, automatic provisioning includes the maintenance and removal of user identities as status or roles change. Common scenarios include provisioning an Azure AD user into SaaS applications like [Dropbox](../../active-directory/saas-apps/dropboxforbusiness-provisioning-tutorial.md), [Salesforce](../../active-directory/saas-apps/salesforce-provisioning-tutorial.md), [ServiceNow](../../active-directory/saas-apps/servicenow-provisioning-tutorial.md), and more.
 
-Azure AD supports provisioning users into SaaS applications and applications hosted on-premises or an infrastructure as a service (IaaS) solution such as a virtual machine. You might have a legacy application that relies on an LDAP user store or a SQL database. By using the Azure AD provisioning service, you can create, update, and delete users into on-premises applications without having to open up firewalls or deal with TCP ports. 
-
-Using lightweight agents, you can provision users into on-premises applications and govern access. When Azure AD is used with the application proxy, you can manage access to your on-premises application and provide automatic user provisioning (with the provisioning service) and single sign-on (with app proxy). 
+Azure AD also supports provisioning users into applications hosted on-premises or in a virtual machine, without having to open up any firewalls. If your application supports [SCIM](https://aka.ms/scimoverview), or you've built a SCIM gateway to connect to your legacy application, you can use the Azure AD Provisioning agent to [directly connect](https://docs.microsoft.com/azure/active-directory/app-provisioning/on-premises-scim-provisioning) with your application and automate provisioning and deprovisioning. If you have legacy applications that don't support SCIM and rely on an [LDAP](https://docs.microsoft.com/azure/active-directory/app-provisioning/on-premises-ldap-connector-configure) user store or a [SQL](https://docs.microsoft.com/azure/active-directory/app-provisioning/tutorial-ecma-sql-connector) database, Azure AD can support those as well. 
 
 App provisioning lets you:
 

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

@@ -11,7 +11,7 @@
     expanded: true
     items:
     - name: List of app integration tutorials
-      href: /azure/active-directory/saas-apps/
+      href: /azure/active-directory/saas-apps/tutorial-list
     - name: Add an on-premises app with Application Proxy
       href: application-proxy-add-on-premises-application.md
   - name: Samples
@@ -170,7 +170,7 @@
     - name: Microsoft Q&A question page
       href: /answers/topics/azure-active-directory.html
     - name: Pricing
-      href: https://azure.microsoft.com/pricing/details/active-directory
+      href: https://azure.microsoft.com/pricing/details/active-directory/
     - name: Service updates
       href: https://azure.microsoft.com/updates/?product=active-directory
     - name: Stack Overflow

articles/active-directory/authentication/TOC.yml

@@ -57,7 +57,7 @@
     - name: Licenses
       href: concept-mfa-licensing.md
     - name: MFA for Office 365
-      href: /office365/admin/security-and-compliance/set-up-multi-factor-authentication
+      href: /microsoft-365/admin/security-and-compliance/set-up-multi-factor-authentication
     - name: FAQ
       href: multi-factor-authentication-faq.yml
     - name: Operator assistance
@@ -268,7 +268,7 @@
   - name: MFA user guide
     href: https://support.microsoft.com/account-billing/how-to-use-the-microsoft-authenticator-app-9783c865-0308-42fb-a519-8cf666fe0acc
   - name: Code samples
-    href: https://azure.microsoft.com/resources/samples/?service=active-directory
+    href: /samples/browse/?products=azure
   - name: Azure PowerShell cmdlets
     href: /powershell/azure/
   - name: Microsoft Graph REST API beta

articles/active-directory/azuread-dev/TOC.yml

@@ -148,7 +148,7 @@
     - name: Publish to App Source
       href: howto-get-appsource-certified.md
     - name: Publish to the Office 365 Seller Dashboard
-      href: /office/dev/store/use-the-seller-dashboard-to-submit-to-the-office-store
+      href: /office/dev/store/add-in-submission-guide
   - name: Azure Access Control Service
     displayName: ACS
     items:
@@ -184,11 +184,11 @@
   - name: Azure AD blog
     href: https://cloudblogs.microsoft.com/enterprisemobility/?product=azure-active-directory
   - name: Microsoft identity platform developer blog
-    href: https://developer.microsoft.com/identity/blogs/
+    href: https://devblogs.microsoft.com/microsoft365dev/category/microsoft-identity-platform/
   - name: Try Sign in with Microsoft
-    href: https://azure.microsoft.com/develop/identity/signin/
+    href: https://developer.microsoft.com/identity/add-sign-in-with-microsoft
   - name: Getting help
     displayName: support, help options
     href: ../develop/developer-support-help-options.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
   - name: Managed identities for Azure resources
-    href: ../managed-identities-azure-resources/overview.md
+    href: ../managed-identities-azure-resources/overview.md

articles/active-directory/conditional-access/concept-continuous-access-evaluation.md

@@ -185,7 +185,7 @@ To avoid infinite loops because of these scenarios, Azure AD issues a one hour C
 CAE only has insight into [IP-based named locations](../conditional-access/location-condition.md#ip-address-ranges). CAE doesn't have insight into other location conditions like [MFA trusted IPs](../authentication/howto-mfa-mfasettings.md#trusted-ips) or country-based locations. When a user comes from an MFA trusted IP, trusted location that includes MFA Trusted IPs, or country location, CAE won't be enforced after that user moves to a different location. In those cases, Azure AD will issue a one-hour access token without instant IP enforcement check. 
 
 > [!IMPORTANT]
-> When configuring locations for continuous access evaluation, use only the [IP based Conditional Access location condition](../conditional-access/location-condition.md) and configure all IP addresses, **including both IPv4 and IPv6**, that can be seen by your identity provider and resources provider. Do not use country location conditions or the trusted ips feature that is available in Azure AD Multi-Factor Authentication's service settings page.
+> If you want your location policies to be enforced in real time by continuous access evaluation, use only the [IP based Conditional Access location condition](../conditional-access/location-condition.md) and configure all IP addresses, **including both IPv4 and IPv6**, that can be seen by your identity provider and resources provider. Do not use country location conditions or the trusted ips feature that is available in Azure AD Multi-Factor Authentication's service settings page.
 
 ### Office and Web Account Manager settings
 

articles/active-directory/develop/TOC.yml

@@ -596,7 +596,7 @@
     - name: Publish to Azure AD App Gallery
       href: v2-howto-app-gallery-listing.md
     - name: Publish to the Office 365 Seller Dashboard
-      href: /office/dev/store/use-the-seller-dashboard-to-submit-to-the-office-store
+      href: /office/dev/store/add-in-submission-guide
   - name: Work with Visual Studio
     items:
     - name: Use the Active Directory connected service
@@ -687,7 +687,7 @@
   - name: Azure CLI
     href: /cli/azure/identity
   - name: Azure PowerShell
-    href: /powershell/module/az.managedserviceidentity
+    href: /powershell/module/az.managedserviceidentity/
   - name: Application types and OAuth 2.0
     displayName: App types, OAuth
     href: v2-app-types.md
@@ -745,7 +745,7 @@
   - name: Azure roadmap
     href: https://azure.microsoft.com/roadmap/?category=security-identity
   - name: Try Sign in with Microsoft
-    href: https://azure.microsoft.com/develop/identity/signin/
+    href: https://developer.microsoft.com/identity/add-sign-in-with-microsoft
   - name: Managed identities for Azure resources
     href: ../managed-identities-azure-resources/overview.md
   - name: Getting help

articles/active-directory/identity-protection/TOC.yml

@@ -49,11 +49,11 @@
   - name: Graph APIs
     items: 
     - name: riskDetection API
-      href: /graph/api/resources/riskdetection?view=graph-rest-v1.0
+      href: /graph/api/resources/riskdetection?view=graph-rest-1.0
     - name: riskyUsers API
-      href: /graph/api/resources/riskyuser?view=graph-rest-v1.0
+      href: /graph/api/resources/riskyuser?view=graph-rest-1.0
     - name: signIn API
-      href: /graph/api/resources/signin?view=graph-rest-v1.0
+      href: /graph/api/resources/signin?view=graph-rest-1.0
   - name: Glossary
     href: reference-identity-protection-glossary.md
 - name: Resources

articles/active-directory/manage-apps/toc.yml

@@ -25,7 +25,7 @@
   - name: Tutorials
     items:
     - name: List of app integration tutorials
-      href: /azure/active-directory/saas-apps/
+      href: /azure/active-directory/saas-apps/tutorial-list
   - name: Samples
     items: 
     - name: Overview of App Management samples
@@ -201,7 +201,7 @@
         - name: Microsoft Q&A question page
           href: /answers/topics/azure-active-directory.html
         - name: Pricing
-          href: https://azure.microsoft.com/pricing/details/active-directory
+          href: https://azure.microsoft.com/pricing/details/active-directory/
         - name: Service updates
           href: https://azure.microsoft.com/updates/?product=active-directory
         - name: Stack Overflow