20221110 1420 resolve merge conflict

Author: WilliamDAssafMSFT

.openpublishing.publish.config.json

@@ -164,6 +164,12 @@
       "branch": "dev",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-quickstart-templates-v1",
+      "url": "https://github.com/Azure/azure-functions-templates",
+      "branch": "v1.x",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-functions-samples-java",
       "url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -877,6 +883,12 @@
       "url": "https://github.com/MicrosoftDocs/reusable-content",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
+      "url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -130,6 +130,11 @@
             "redirect_url": "/azure/aks/monitor-aks",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
+            "redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/api-management/zone-redundancy.md",
             "redirect_url": "/azure/availability-zones/migrate-api-mgt",
@@ -800,12 +805,12 @@
         },
         {
             "source_path_from_root": "/articles/aks/dapr-troubleshooting.md",
-            "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-dapr-extension-installation-errors",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/aks/csi-secrets-store-troubleshooting.md",
-            "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-key-vault-csi-secrets-store-csi-driver",
             "redirect_document_id": false
         },
         {
@@ -5955,14 +5960,9 @@
         },
         {
             "source_path_from_root": "/articles/best-practices-availability-paired-regions.md",
-            "redirect_url": "/azure/availability-zones/cross-region-replication-azure",
+            "redirect_url": "/azure/reliability/cross-region-replication-azure",
             "redirect_document_id": true
         },
-        {
-            "source_path_from_root": "/articles/availability-zones/index.md",
-            "redirect_url": "/azure/availability-zones/az-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/fxt-edge-filer/fxt-add-nodes.md",
             "redirect_url": "/azure/fxt-edge-filer/add-nodes",
@@ -6353,6 +6353,11 @@
             "redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
             "redirect_document_id": false
         },
+        { 
+            "source_path_from_root": "/articles/storage/blobs/anonymous-read-access-client.md",
+            "redirect_url": "/azure/storage/blobs/anonymous-read-access-prevent",
+            "redirect_document_id": false
+        },
         { 
             "source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
             "redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
@@ -29296,12 +29301,12 @@
         },
         {
             "source_path_from_root": "/articles/app-service/environment/overview-zone-redundancy.md",
-            "redirect_url": "/azure/availability-zones/migrate-app-service-environment",
+            "redirect_url": "/azure/reliability/migrate-app-service-environment",
             "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/app-service/how-to-zone-redundancy.md",
-            "redirect_url": "/azure/availability-zones/migrate-app-service",
+            "redirect_url": "/azure/reliability/migrate-app-service",
             "redirect_document_id": true
         },
         {
@@ -29349,6 +29354,121 @@
             "redirect_url": "/azure/developer/java/ee/jboss-on-azure",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/availability-zones/az-overview.md",
+            "redirect_url": "/azure/reliability/availability-zones-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/index.yml",
+            "redirect_url": "/azure/reliability/index",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/az-region.md",
+            "redirect_URL": "/azure/reliability/availability-zones-service-support",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/business-continuity-management-program.md",
+            "redirect_URL": "/azure/reliability/business-continuity-management-program",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/cross-region-replication-azure.md",
+            "redirect_URL": "/azure/reliability/cross-region-replication-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/glossary.md",
+            "redirect_URL": "/azure/reliability/glossary",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-app-service-environment.md",
+            "redirect_URL": "/azure/reliability/migrate-app-service-environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-api-mgt.md",
+            "redirect_URL": "/azure/reliability/migrate-api-mgt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-app-configuration.md",
+            "redirect_URL": "/azure/reliability/migrate-app-configuration-mgt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-app-gateway-v2.md",
+            "redirect_URL": "/azure/reliability/migrate-app-gateway-v2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-container-instances.md",
+            "redirect_URL": "/azure/reliability/migrate-container-instances",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-functions.md",
+            "redirect_URL": "/azure/reliability/migrate-functions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-load-balancer.md",
+            "redirect_URL": "/azure/reliability/migrate-load-balancer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-monitor-log-analytics.md",
+            "redirect_URL": "/azure/reliability/migrate-monitor-log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-workload-aks-mysql.md",
+            "redirect_URL": "/azure/reliability/migrate-workload-aks-mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-search-service.md",
+            "redirect_URL": "/azure/reliability/migrate-search-service-balancer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-app-service.md",
+            "redirect_URL": "/azure/reliability/migrate-app-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-cache-redis.md",
+            "redirect_URL": "/azure/reliability/migrate-cache-redis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-recovery-services-vault.md",
+            "redirect_URL": "/azure/reliability/migrate-recovery-services-vault",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-storage.md",
+            "redirect_URL": "/azure/reliability/migrate-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/migrate-vm.md",
+            "redirect_URL": "/azure/reliability/migrate-vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/overview.md",
+            "redirect_URL": "/azure/reliability/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/availability-zones/region-types-service-categories-azure.md",
+            "redirect_URL": "/azure/reliability/availability-service-by-category",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/pytorch-enterprise/index.yml",
             "redirect_url": "/azure/databricks/machine-learning/train-model/pytorch",

.whatsnew/.application-management.json

@@ -17,7 +17,7 @@
     },
     "areas": [
         {
-            "name": ".",
+            "name": [ "."],
             "heading": "Azure Active Directory application management"
         }
     ]

articles/active-directory-b2c/aad-sspr-technical-profile.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/23/2020
+ms.date: 11/08/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -26,8 +26,6 @@ This technical profile:
 - Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
 - Validates an email address via a verification code.
 
-[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
-
 ## Protocol
 
 The **Name** attribute of the **Protocol** element needs to be set to `Proprietary`. The **handler** attribute must contain the fully qualified name of the protocol handler assembly that is used by Azure AD B2C:

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/27/2022
+ms.date: 11/08/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -22,7 +22,9 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
 ## Terms for features in public preview
 
 - We encourage you to use public preview features for evaluation purposes only.
+
 - [Service level agreements (SLAs)](https://azure.microsoft.com/support/legal/sla/active-directory-b2c) don't apply to public preview features.
+
 - Support requests for public preview features can be submitted through regular support channels.
 
 ## User flows
@@ -156,7 +158,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 | ------- | :--: | ----- |
 | [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | GA |  Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
 | [Phone factor authentication](phone-factor-technical-profile.md) | GA |  |
-| [Azure AD MFA authentication](multi-factor-auth-technical-profile.md) | Preview |  |
+| [Azure AD MFA authentication](multi-factor-auth-technical-profile.md) | GA |  |
 | [One-time password](one-time-password-technical-profile.md) | GA |  |
 | [Azure Active Directory](active-directory-technical-profile.md) as local directory | GA |  |
 | [Predicate validations](predicates.md) | GA | For example, password complexity. |

articles/active-directory-b2c/microsoft-graph-operations.md

@@ -39,7 +39,7 @@ To use MS Graph API, and interact with resources in your Azure AD B2C tenant, yo
 - [Update a user](/graph/api/user-update)
 - [Delete a user](/graph/api/user-delete)
 
-## User phone number management (beta)
+## User phone number management
 
 A phone number that can be used by a user to sign-in using [SMS or voice calls](sign-in-options.md#phone-sign-in), or [multifactor authentication](multi-factor-authentication.md). For more information, see [Azure AD authentication methods API](/graph/api/resources/phoneauthenticationmethod).
 
@@ -54,9 +54,9 @@ Note, the [list](/graph/api/authentication-list-phonemethods) operation returns
 ![Enable phone sign-in](./media/microsoft-graph-operations/enable-phone-sign-in.png)
 
 > [!NOTE]
-> In the current beta version, this API works only if the phone number is stored with a space between the country code and the phone number. The Azure AD B2C service doesn't currently add this space by default.
+> A correctly represented phone number is stored with a space between the country code and the phone number. The Azure AD B2C service doesn't currently add this space by default.
 
-## Self-service password reset email address (beta)
+## Self-service password reset email address
 
 An email address that can be used by a [username sign-in account](sign-in-options.md#username-sign-in) to reset the password. For more information, see [Azure AD authentication methods API](/graph/api/resources/emailauthenticationmethod).
 
@@ -66,7 +66,7 @@ An email address that can be used by a [username sign-in account](sign-in-option
 - [Update](/graph/api/emailauthenticationmethod-update)
 - [Delete](/graph/api/emailauthenticationmethod-delete)
 
-## Software OATH token authentication method (beta)
+## Software OATH token authentication method
 
  A software OATH token is a software-based number generator that uses the OATH time-based one-time password (TOTP) standard for multifactor authentication via an authenticator app. Use the Microsoft Graph API to manage a software OATH token registered to a user:
 
@@ -78,13 +78,14 @@ An email address that can be used by a [username sign-in account](sign-in-option
 
 Manage the [identity providers](add-identity-provider.md) available to your user flows in your Azure AD B2C tenant.
 
-- [List identity providers registered in the Azure AD B2C tenant](/graph/api/identityprovider-list)
-- [Create an identity provider](/graph/api/identityprovider-post-identityproviders)
-- [Get an identity provider](/graph/api/identityprovider-get)
-- [Update identity provider](/graph/api/identityprovider-update)
-- [Delete an identity provider](/graph/api/identityprovider-delete)
+- [List identity providers available in the Azure AD B2C tenant](/graph/api/identityproviderbase-availableprovidertypes)
+- [List identity providers configured in the Azure AD B2C tenant](/graph/api/iidentitycontainer-list-identityproviders)
+- [Create an identity provider](/graph/api/identitycontainer-post-identityproviders)
+- [Get an identity provider](/graph/api/identityproviderbase-get)
+- [Update identity provider](/graph/api/identityproviderbase-update)
+- [Delete an identity provider](/graph/api/identityproviderbase-delete)
 
-## User flow
+## User flow (beta)
 
 Configure pre-built policies for sign-up, sign-in, combined sign-up and sign-in, password reset, and profile update.
 
@@ -100,7 +101,7 @@ Choose a mechanism for letting users register via local accounts. Local accounts
 - [Get](/graph/api/b2cauthenticationmethodspolicy-get)
 - [Update](/graph/api/b2cauthenticationmethodspolicy-update)
 
-## Custom policies
+## Custom policies (beta)
 
 The following operations allow you to manage your Azure AD B2C Trust Framework policies, known as [custom policies](custom-policy-overview.md).
 
@@ -110,7 +111,7 @@ The following operations allow you to manage your Azure AD B2C Trust Framework p
 - [Update or create trust framework policy.](/graph/api/trustframework-put-trustframeworkpolicy)
 - [Delete an existing trust framework policy](/graph/api/trustframeworkpolicy-delete)
 
-## Policy keys
+## Policy keys (beta)
 
 The Identity Experience Framework stores the secrets referenced in a custom policy to establish trust between components. These secrets can be symmetric or asymmetric keys/values. In the Azure portal, these entities are shown as **Policy keys**.
 
@@ -169,15 +170,16 @@ For more information about accessing Azure AD B2C audit logs, see [Accessing Azu
 
 ## Conditional Access
 
-- [List all of the Conditional Access policies](/graph/api/conditionalaccessroot-list-policies?tabs=http)
+- [List the built-in templates for Conditional Access policy scenarios](/graph/api/conditionalaccessroot-list-templates)
+- [List all of the Conditional Access policies](/graph/api/conditionalaccessroot-list-policies)
 - [Read properties and relationships of a Conditional Access policy](/graph/api/conditionalaccesspolicy-get)
 - [Create a new Conditional Access policy](/graph/api/resources/application)
 - [Update a Conditional Access policy](/graph/api/conditionalaccesspolicy-update)
 - [Delete a Conditional Access policy](/graph/api/conditionalaccesspolicy-delete)
 
 ## Retrieve or restore deleted users and applications
 
-Deleted items can only be restored if they were deleted within the last 30 days.
+Deleted users and apps can only be restored if they were deleted within the last 30 days.
 
 - [List deleted items](/graph/api/directory-deleteditems-list)
 - [Get a deleted item](/graph/api/directory-deleteditems-get)

articles/active-directory-b2c/multi-factor-auth-technical-profile.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 12/09/2021
+ms.date: 11/08/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -18,7 +18,6 @@ ms.subservice: B2C
 
 Azure Active Directory B2C (Azure AD B2C) provides support for verifying a phone number by using a verification code, or verifying a Time-based One-time Password (TOTP) code.
 
-[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
 
 ## Protocol