merge conflicts

Author: batamig

.openpublishing.publish.config.json

@@ -947,7 +947,7 @@
     {
       "path_to_root": "azure-cosmos-mongodb-dotnet",
       "url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
-      "branch": "quickstart-test",
+      "branch": "main",
       "branch_mapping": {}
     }
   ],

.openpublishing.redirection.active-directory.json

@@ -30,6 +30,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
+      "redirect_url": "/azure/active-directory/fundamentals/whats-new",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
       "redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -10801,6 +10806,16 @@
       "redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
       "redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",

.openpublishing.redirection.azure-monitor.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-monitor/change/change-analysis-powershell.md",
+            "redirect_url": "/azure/azure-monitor/change/change-analysis",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/snapshot-debugger.md",
             "redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger",
@@ -405,6 +410,11 @@
             "source_path_from_root": "/articles/azure-monitor/logs/custom-logs-overview.md" ,
             "redirect_url": "/azure/azure-monitor/logs/logs-ingestion-api-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/cosmosdb-insights-overview.md" ,
+            "redirect_url": "/azure/cosmos-db/cosmosdb-insights-overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/appliance-catalog/appliance-catalog-overview.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/appliance-catalog/index",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/plan-network-monitoring.md",
             "redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-network-monitoring",

.openpublishing.redirection.json

@@ -10388,8 +10388,8 @@
     },
     {
       "source_path_from_root": "/articles/azure-supportability/classic-deployment-model-quota-increase-requests.md",
-      "redirect_url": "/azure/azure-portal/supportability/classic-deployment-model-quota-increase-requests",
-      "redirect_document_id": true
+      "redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/how-to-create-azure-support-request.md",
@@ -10433,44 +10433,79 @@
     },
     {
       "source_path_from_root": "/articles/azure-supportability/low-priority-quota.md",
-      "redirect_url": "/azure/azure-portal/supportability/spot-quota",
-      "redirect_document_id": true
+      "redirect_url": "/azure/quotas/spot-quota",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/networking-quota-requests.md",
-      "redirect_url": "/azure/azure-portal/supportability/networking-quota-requests",
-      "redirect_document_id": true
+      "redirect_url": "/azure/quotas/networking-quota-requests",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/per-vm-quota-requests.md",
-      "redirect_url": "/azure/azure-portal/supportability/per-vm-quota-requests",
-      "redirect_document_id": true
+      "redirect_url": "/azure/quotas/per-vm-quota-requests",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/regional-quota-requests.md",
-      "redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
-      "redirect_document_id": true
+      "redirect_url": "/azure/quotas/regional-quota-requests",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/resource-manager-core-quotas-request.md",
-      "redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
+      "redirect_url": "/azure/quotas/regional-quota-requests",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
-      "redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
+      "redirect_url": "/azure/quotas/regional-quota-requests",
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",
-      "redirect_url": "/azure/azure-portal/supportability/sku-series-unavailable",
-      "redirect_document_id": true
+      "source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md", 
+      "redirect_url": "/troubleshoot/azure/general/region-access-request-process",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-portal/supportability/low-priority-quota.md",
-      "redirect_url": "/azure/azure-portal/supportability/spot-quota",
+      "redirect_url": "/azure/quotas/spot-quota",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/quotas-overview.md",
+      "redirect_url": "/azure/quotas/quotas-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/view-quotas.md",
+      "redirect_url": "/azure/quotas/view-quotas",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/per-vm-quota-requests.md",
+      "redirect_url": "/azure/quotas/per-vm-quota-requests",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/regional-quota-requests.md",
+      "redirect_url": "/azure/quotas/regional-quota-requests",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/spot-quota.md",
+      "redirect_url": "/azure/quotas/spot-quota",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/classic-deployment-model-quota-increase-requests.md",
+      "redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-portal/supportability/networking-quota-requests.md",
+      "redirect_url": "/azure/quotas/networking-quota-requests",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
       "redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",

articles/active-directory-b2c/best-practices.md

@@ -87,4 +87,4 @@ Stay up to date with the state of the service and find support options.
 |--|--|
 | [Service updates](https://azure.microsoft.com/updates/?product=active-directory-b2c) |  Stay up to date with Azure AD B2C product updates and announcements. |
 | [Microsoft Support](support-options.md) | File a support request for Azure AD B2C technical issues. Billing and subscription management support is provided at no cost. |
-| [Azure status](https://status.azure.com/status) | View the current health status of all Azure services. |
+| [Azure status](https://azure.status.microsoft/status) | View the current health status of all Azure services. |

articles/active-directory-b2c/custom-domain.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 05/13/2022
+ms.date: 07/26/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -116,13 +116,21 @@ Follow these steps to create an Azure Front Door:
     |Tier| Select either Standard or Premium tier. Standard tier is content delivery optimized. Premium tier builds on Standard tier and is focused on security. See [Tier Comparison](../frontdoor/standard-premium/tier-comparison.md).|
     |Endpoint name| Enter a globally unique name for your endpoint, such as `b2cazurefrontdoor`. The **Endpoint hostname** is generated automatically. |
     |Origin type| Select `Custom`.|
-    |Origin host name| Enter `<tenant-name>.b2clogin.com`. Replace `<tenant-name>` with the [name of your Azure AD B2C tenant](tenant-management.md#get-your-tenant-name).|
+    |Origin host name| Enter `<tenant-name>.b2clogin.com`. Replace `<tenant-name>` with the [name of your Azure AD B2C tenant](tenant-management.md#get-your-tenant-name) such as `contoso.b2clogin.com`.|
 
     Leave the **Caching** and **WAF policy** empty.
 
      
 1. Once the Azure Front Door resource is created, select **Overview**, and copy the **Endpoint hostname**. It looks something like `b2cazurefrontdoor-ab123e.z01.azurefd.net`. 
 
+1. Make sure the **Host name** and **Origin host header** of your origin have the same value: 
+    1. Under **Settings**, select **Origin groups**. 
+    1. Select your origin group from the list, such as **default-origin-group**.
+    1. On the right pane, select your **Origin host name** such as `contoso.b2clogin.com`.
+    1. On the **Update origin** pane, update the **Host name** and **Origin host header** to have the same value. 
+
+    :::image type="content" source="./media/custom-domain/azure-front-door-custom-domain-origins.png" alt-text="Screenshot of how to update custom domain origins.":::
+
 
 ## Step 3. Set up your custom domain on Azure Front Door
 

articles/active-directory-b2c/media/custom-domain/azure-front-door-custom-domain-origins.png

@@ -74,13 +74,13 @@ You can use scoping filters to define attribute-based rules that determine which
 
 ### B2B (guest) users
 
-It's possible to use the Azure AD user provisioning service to provision B2B (or guest) users in Azure AD to SaaS applications. 
+It's possible to use the Azure AD user provisioning service to provision B2B (guest) users in Azure AD to SaaS applications. 
 However, for B2B users to sign in to the SaaS application using Azure AD, the SaaS application must have its SAML-based single sign-on capability configured in a specific way. For more information on how to configure SaaS applications to support sign-ins from B2B users, see [Configure SaaS apps for B2B collaboration](../external-identities/configure-saas-apps.md).
 
 > [!NOTE]
-> The userPrincipalName for a guest user is often displayed as "alias#EXT#@domain.com". When the userPrincipalName is included in your attribute mappings as a source attribute, the #EXT# is stripped from the userPrincipalName. If you require the #EXT# to be present, replace userPrincipalName with originalUserPrincipalName as the source attribute. 
-userPrincipalName = alias@domain.com
-originalUserPrincipalName = alias#EXT#@domain.com
+> The userPrincipalName for a B2B user represents the external user's email address alias@theirdomain as "alias_theirdomain#EXT#@yourdomain". When the userPrincipalName attribute is included in your attribute mappings as a source attribute, and a B2B user is being provisioned, the #EXT# and your domain is stripped from the userPrincipalName, so only their original alias@theirdomain is used for matching or provisioning. If you require the full user principal name including #EXT# and your domain to be present, replace userPrincipalName with originalUserPrincipalName as the source attribute. <br />
+userPrincipalName = alias@theirdomain<br />
+originalUserPrincipalName = alias_theirdomain#EXT#@yourdomain
 
 ## Provisioning cycles: Initial and incremental
 

articles/active-directory/app-provisioning/how-provisioning-works.md

@@ -33,7 +33,7 @@ This following tables list Azure AD feature availability in Azure Government.
 || Service-level agreement | ✅ | 
 |**Applications access**|SaaS apps with modern authentication (Azure AD application gallery apps, SAML, and OAUTH 2.0) | ✅ | 
 || Group assignment to applications | ✅ | 
-|| Cloud app discovery (Microsoft Cloud App Security) | ✅ | 
+|| Cloud app discovery (Microsoft Defender for Cloud Apps) | ✅ | 
 || Application Proxy for on-premises, header-based, and Integrated Windows Authentication | ✅ | 
 || Secure hybrid access partnerships (Kerberos, NTLM, LDAP, RDP, and SSH authentication) | ✅ | 
 |**Authorization and Conditional Access**|Role-based access control (RBAC) | ✅ |