Merge pull request #208106 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: ttorble

.openpublishing.redirection.json

@@ -18303,6 +18303,16 @@
     "redirect_url":  "/connectors/bingsearch",
     "redirect_document_id":  false
 },
+{
+  "source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
+  "redirect_url": "/connectors/twilio",
+  "redirect_document_id": false
+},
+{
+  "source_path_from_root":  "/articles/connectors/connectors-schema-migration.md",
+  "redirect_url":  "/azure/logic-apps/update-consumption-workflow-schema",
+  "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/logic-apps/logic-apps-scenario-error-and-exception-handling.md",
     "redirect_url":  "/azure/logic-apps/logic-apps-exception-handling",

articles/active-directory/develop/TOC.yml

@@ -417,6 +417,8 @@
       items:
         - name: Scopes for web API accepting v1.0 tokens
           href: msal-v1-app-scopes.md
+        - name: Spring Cloud Azure
+          href: /azure/developer/java/spring-framework/spring-cloud-azure?toc=/azure/active-directory/develop/toc.json#spring-security-support
 - name: Desktop
   items:
     - name: Desktop app authentication documentation

articles/active-directory/develop/index-web-app.yml

@@ -42,6 +42,8 @@ landingContent:
             url: tutorial-blazor-server.md
           - text: Node.js with Express
             url: tutorial-v2-nodejs-webapp-msal.md
+          - text: Spring
+            url: /azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-active-directory
   - title: "Web apps in depth"
     linkLists:
       - linkListType: how-to-guide

articles/active-directory/develop/sample-v2-code.md

@@ -87,7 +87,7 @@ The following samples show public client desktop applications that access the Mi
 
 ## Mobile
 
-The following samples show public client mobile applications that access the Microsoft Graph API, or your own web API in the name of the user. These client applications use the Microsoft Authentication Library (MSAL).
+The following samples show public client mobile applications that access the Microsoft Graph API. These client applications use the Microsoft Authentication Library (MSAL).
 
 > [!div class="mx-tdCol2BreakAll"]
 > | Language/<br/>Platform | Code sample(s) <br/> on GitHub |Auth<br/> libraries |Auth flow |

articles/active-directory/hybrid/migrate-from-federation-to-cloud-authentication.md

@@ -94,6 +94,9 @@ Existing Legacy clients (Exchange ActiveSync, Outlook 2010/2013) aren't affected
 
 Modern authentication clients (Office 2016 and Office 2013, iOS, and Android apps) use a valid refresh token to obtain new access tokens for continued access to resources instead of returning to AD FS. These clients are immune to any password prompts resulting from the domain conversion process. The clients will continue to function without extra configuration.
 
+>[!NOTE] 
+>When you migrate from federated to cloud authentication, the process to convert the domain from federated to managed may take up to 60 minutes. During this process, users might not be prompted for credentials for any new logins to Azure portal or other browser based applications protected with Azure AD. We recommend that you include this delay in your maintenance window.
+
 ### Plan for rollback
 
 > [!TIP]

articles/api-management/TOC.yml

@@ -114,6 +114,7 @@
             - name: Compute platform
               href: compute-infrastructure.md
             - name: Set up DR using backup/restore
+              displayName: disaster, recovery
               href: api-management-howto-disaster-recovery-backup-restore.md
             - name: Use role-based access control
               href: api-management-role-based-access-control.md

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

@@ -9,7 +9,7 @@ ms.topic: how-to
 ms.date: 08/20/2021
 ms.author: danlep
 ms.custom: subject-moving-resources
-#cusomerintent: As an Azure service administrator, I want to move my service resources to another Azure region.
+#customerintent: As an Azure service administrator, I want to move my service resources to another Azure region.
 ---
 
 # How to move Azure API Management across regions
@@ -43,19 +43,19 @@ To move API Management instances from one Azure region to another, use the servi
 ### Option 1: Use a different API Management instance name
 
 1. In the target region, create a new API Management instance with the same pricing tier as the source API Management instance. Use a different name for the new instance.
-1. [Back up](api-management-howto-disaster-recovery-backup-restore.md#-back-up-an-api-management-service) the existing API Management instance to the storage account. 
-1. [Restore](api-management-howto-disaster-recovery-backup-restore.md#-restore-an-api-management-service) the source instance's backup to the new API Management instance.
+1. [Back up](api-management-howto-disaster-recovery-backup-restore.md#back-up-an-api-management-service) the existing API Management instance to the storage account. 
+1. [Restore](api-management-howto-disaster-recovery-backup-restore.md#restore-an-api-management-service) the source instance's backup to the new API Management instance.
 1. If you have a custom domain pointing to the source region API Management instance, update the custom domain CNAME to point to the new API Management instance. 
 
 ### Option 2: Use the same API Management instance name
 
 > [!WARNING]
 > This option deletes the original API Management instance and results in downtime during the migration. Ensure that you have a valid backup before deleting the source instance.
 
-1. [Back up](api-management-howto-disaster-recovery-backup-restore.md#-back-up-an-api-management-service) the existing API Management instance to the storage account. 
+1. [Back up](api-management-howto-disaster-recovery-backup-restore.md#back-up-an-api-management-service) the existing API Management instance to the storage account. 
 1. Delete the API Management instance in the source region. 
 1. Create a new API Management instance in the target region with the same name as the one in the source region.
-1. [Restore](api-management-howto-disaster-recovery-backup-restore.md#-restore-an-api-management-service) the source instance's backup to the new API Management instance in the target region.  
+1. [Restore](api-management-howto-disaster-recovery-backup-restore.md#restore-an-api-management-service) the source instance's backup to the new API Management instance in the target region.  
 
 ## Verify
 

articles/api-management/api-management-howto-migrate.md

@@ -69,20 +69,19 @@ Use the Azure CLI for creating a new cache and geo-replication group, or to add
 
 #### Create new Enterprise instance in a new geo-replication group using Azure CLI
 
-This example creates a new Azure Cache for Redis Enterprise E10 cache instance called _Cache1_ in the East US region. Then, the cache is added to a new active geo-replication group called `replicationGroup`:
+This example creates a new Azure Cache for Redis Enterprise E10 cache instance called _Cache1_ in the East US region. Then, the cache is added to a new active geo-replication group called _replicationGroup_:
 
 ```azurecli-interactive
 az redisenterprise create --location "East US" --cluster-name "Cache1" --sku "Enterprise_E10" --resource-group "myResourceGroup" --group-nickname "replicationGroup" --linked-databases id="/subscriptions/34b6ecbd-ab5c-4768-b0b8-bf587aba80f6/resourceGroups/myResourceGroup/providers/Microsoft.Cache/redisEnterprise/Cache1/databases/default"
 ```
 
 To configure active geo-replication properly, the ID of the cache instance being created must be added with the `--linked-databases` parameter. The ID is in the format:
 
-`/subscriptions/\<your-subscription-ID>/resourceGroups/\<your-resource-group-name>/providers/Microsoft.Cache/redisEnterprise/\<your-cache-name>/databases/default`
+`/subscriptions/<your-subscription-ID>/resourceGroups/<your-resource-group-name>/providers/Microsoft.Cache/redisEnterprise/<your-cache-name>/databases/default`
 
 #### Create new Enterprise instance in an existing geo-replication group using Azure CLI
 
 This example creates a new Cache for Redis Enterprise E10 instance called _Cache2_ in the West US region. Then, the cache is added to the `replicationGroup` active geo-replication group created above. This way, it's linked in an active-active configuration with Cache1.
-<!-- love the simple, declarative sentences. I am once again add the full product name -->
 
 ```azurecli-interactive
 az redisenterprise create --location "West US" --cluster-name "Cache2" --sku "Enterprise_E10" --resource-group "myResourceGroup" --group-nickname "replicationGroup" --linked-databases id="/subscriptions/34b6ecbd-ab5c-4768-b0b8-bf587aba80f6/resourceGroups/myResourceGroup/providers/Microsoft.Cache/redisEnterprise/Cache1/databases/default" --linked-databases id="/subscriptions/34b6ecbd-ab5c-4768-b0b8-bf587aba80f6/resourceGroups/myResourceGroup/providers/Microsoft.Cache/redisEnterprise/Cache2/databases/default"
@@ -96,15 +95,15 @@ Use Azure PowerShell to create a new cache and geo-replication group, or to add
 
 #### Create new Enterprise instance in a new geo-replication group using PowerShell
 
-This example creates a new Azure Cache for Redis Enterprise E10 cache instance called "Cache1" in the East US region. Then, the cache is added to a new active geo-replication group called `replicationGroup`:
+This example creates a new Azure Cache for Redis Enterprise E10 cache instance called "Cache1" in the East US region. Then, the cache is added to a new active geo-replication group called _replicationGroup_:
 
 ```powershell-interactive
 New-AzRedisEnterpriseCache -Name "Cache1" -ResourceGroupName "myResourceGroup" -Location "East US" -Sku "Enterprise_E10" -GroupNickname "replicationGroup" -LinkedDatabase '{id:"/subscriptions/34b6ecbd-ab5c-4768-b0b8-bf587aba80f6/resourceGroups/myResourceGroup/providers/Microsoft.Cache/redisEnterprise/Cache1/databases/default"}'
 ```
 
 To configure active geo-replication properly, the ID of the cache instance being created must be added with the `-LinkedDatabase` parameter. The ID is in the format:
 
-`id:"/subscriptions/\<your-subscription-ID>/resourceGroups/\<your-resource-group-name>/providers/Microsoft.Cache/redisEnterprise/\<your-cache-name>/databases/default`
+`/subscriptions/<your-subscription-ID>/resourceGroups/<your-resource-group-name>/providers/Microsoft.Cache/redisEnterprise/<your-cache-name>/databases/default`
 
 #### Create new Enterprise instance in an existing geo-replication group using PowerShell