Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fresh

Author: HeidiSteen

articles/active-directory/manage-apps/datawiza-azure-ad-sso-oracle-jde.md

@@ -1,5 +1,5 @@
 ---
-title: Configure Azure AD Multi-Factor Authentication and SSO for an Oracle JD Edwards application using Datawiza Access Broker
+title: Configure Azure AD Multi-Factor Authentication and SSO for Oracle JD Edwards applications using Datawiza Access Broker
 description: Enable Azure Active Directory Multi-Factor Authentication and SSO for Oracle JD Edwards application using Datawiza Access Broker
 services: active-directory
 author: gargi-sinha

articles/active-directory/manage-apps/datawiza-with-azure-ad.md

@@ -123,6 +123,6 @@ DAB evaluates policies, calculates headers, and sends you to the upstream applic
 
 - [Configure Datawiza with Azure AD B2C](../../active-directory-b2c/partner-datawiza.md)
 
-- [Configure Azure AD SSO for an Oracle JD Edwards application using Datawiza Access Broker](datawiza-azure-ad-sso-oracle-jde.md)
+- [Configure Azure AD Multi-Factor Authentication and SSO for Oracle JDE applications using DAB](datawiza-azure-ad-sso-oracle-jde.md)
 
 - [Datawiza documentation](https://docs.datawiza.com)

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

@@ -166,7 +166,7 @@
         items:
         - name: Integrate Datawiza with Azure AD
           href: datawiza-with-azure-ad.md 
-        - name: Configure Oracle JD Edwards application with Azure AD using Datawiza Access Broker
+        - name: Configure Oracle JDE with Azure AD 
           href: datawiza-azure-ad-sso-oracle-jde.md
       - name: F5
         items:

articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-cosmos-db.md

@@ -152,71 +152,7 @@ The CURL response gives you the list of Keys.  For example, if you get the read-
 "secondaryReadonlyMasterKey":"38v5ns...7bA=="}
 ```
 
-Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account.  For a quick example, you can pass the access key to the Azure CLI.  You can get the `<COSMOS DB CONNECTION URL>` from the **Overview** tab on the Cosmos DB account blade in the Azure portal.  Replace the `<ACCESS KEY>` with the value you obtained above:
-
-```azurecli-interactive
-az cosmosdb collection show -c <COLLECTION ID> -d <DATABASE ID> --url-connection "<COSMOS DB CONNECTION URL>" --key <ACCESS KEY>
-```
-
-This CLI command returns details about the collection:
-
-```output
-{
-  "collection": {
-    "_conflicts": "conflicts/",
-    "_docs": "docs/",
-    "_etag": "\"00006700-0000-0000-0000-5a8271e90000\"",
-    "_rid": "Es5SAM2FDwA=",
-    "_self": "dbs/Es5SAA==/colls/Es5SAM2FDwA=/",
-    "_sprocs": "sprocs/",
-    "_triggers": "triggers/",
-    "_ts": 1518498281,
-    "_udfs": "udfs/",
-    "id": "Test",
-    "indexingPolicy": {
-      "automatic": true,
-      "excludedPaths": [],
-      "includedPaths": [
-        {
-          "indexes": [
-            {
-              "dataType": "Number",
-              "kind": "Range",
-              "precision": -1
-            },
-            {
-              "dataType": "String",
-              "kind": "Range",
-              "precision": -1
-            },
-            {
-              "dataType": "Point",
-              "kind": "Spatial"
-            }
-          ],
-          "path": "/*"
-        }
-      ],
-      "indexingMode": "consistent"
-    }
-  },
-  "offer": {
-    "_etag": "\"00006800-0000-0000-0000-5a8271ea0000\"",
-    "_rid": "f4V+",
-    "_self": "offers/f4V+/",
-    "_ts": 1518498282,
-    "content": {
-      "offerIsRUPerMinuteThroughputEnabled": false,
-      "offerThroughput": 400
-    },
-    "id": "f4V+",
-    "offerResourceId": "Es5SAM2FDwA=",
-    "offerType": "Invalid",
-    "offerVersion": "V2",
-    "resource": "dbs/Es5SAA==/colls/Es5SAM2FDwA=/"
-  }
-}
-```
+Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account.
 
 ## Next steps
 

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-cosmos-db.md

@@ -131,79 +131,13 @@ The response gives you the list of Keys.  For example, if you get read-only keys
 {"primaryReadonlyMasterKey":"bWpDxS...dzQ==",
 "secondaryReadonlyMasterKey":"38v5ns...7bA=="}
 ```
-Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account.  For a quick example, you can pass the access key to the Azure CLI.  You can get the `<COSMOS DB CONNECTION URL>` from the **Overview** tab on the Cosmos DB account blade in the Azure portal.  Replace the `<ACCESS KEY>` with the value you obtained above:
-
-```azurecli
-az cosmosdb collection show -c <COLLECTION ID> -d <DATABASE ID> --url-connection "<COSMOS DB CONNECTION URL>" --key <ACCESS KEY>
-```
-
-This CLI command returns details about the collection:
-
-```output
-{
-  "collection": {
-    "_conflicts": "conflicts/",
-    "_docs": "docs/",
-    "_etag": "\"00006700-0000-0000-0000-5a8271e90000\"",
-    "_rid": "Es5SAM2FDwA=",
-    "_self": "dbs/Es5SAA==/colls/Es5SAM2FDwA=/",
-    "_sprocs": "sprocs/",
-    "_triggers": "triggers/",
-    "_ts": 1518498281,
-    "_udfs": "udfs/",
-    "id": "Test",
-    "indexingPolicy": {
-      "automatic": true,
-      "excludedPaths": [],
-      "includedPaths": [
-        {
-          "indexes": [
-            {
-              "dataType": "Number",
-              "kind": "Range",
-              "precision": -1
-            },
-            {
-              "dataType": "String",
-              "kind": "Range",
-              "precision": -1
-            },
-            {
-              "dataType": "Point",
-              "kind": "Spatial"
-            }
-          ],
-          "path": "/*"
-        }
-      ],
-      "indexingMode": "consistent"
-    }
-  },
-  "offer": {
-    "_etag": "\"00006800-0000-0000-0000-5a8271ea0000\"",
-    "_rid": "f4V+",
-    "_self": "offers/f4V+/",
-    "_ts": 1518498282,
-    "content": {
-      "offerIsRUPerMinuteThroughputEnabled": false,
-      "offerThroughput": 400
-    },
-    "id": "f4V+",
-    "offerResourceId": "Es5SAM2FDwA=",
-    "offerType": "Invalid",
-    "offerVersion": "V2",
-    "resource": "dbs/Es5SAA==/colls/Es5SAM2FDwA=/"
-  }
-}
-```
 
+Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account.
 
 ## Disable
 
 [!INCLUDE [msi-tut-disable](../../../includes/active-directory-msi-tut-disable.md)]
 
-
-
 ## Next steps
 
 In this tutorial, you learned how to use a Windows VM system-assigned identity to access Cosmos DB.  To learn more about Cosmos DB see:

articles/availability-zones/TOC.yml

@@ -24,6 +24,8 @@
       href: migrate-app-service.md
     - name: Cache for Redis
       href: migrate-cache-redis.md
+    - name: Container instances
+      href: migrate-container-instances.md
     - name: Recovery Services vault
       href: migrate-recovery-services-vault.md
     - name: Storage accounts

articles/availability-zones/az-region.md

@@ -101,7 +101,7 @@ In the Product Catalog, always-available services are listed as "non-regional" s
 | [Azure Batch](../batch/create-pool-availability-zones.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure Cache for Redis](migrate-cache-redis.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
 | [Azure Cognitive Search](../search/search-performance-optimization.md#availability-zones) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
-| [Azure Container Instances](../container-instances/container-instances-region-availability.md) | ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
+| [Azure Container Instances](migrate-container-instances.md) | ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
 | [Azure Container Registry](../container-registry/zone-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure Data Explorer](/azure/data-explorer/create-cluster-database-portal) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure Data Factory](../data-factory/concepts-data-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |

articles/availability-zones/migrate-container-instances.md

@@ -0,0 +1,62 @@
+---
+title: Migrate Azure Container Instances to availability zone support 
+description: Learn how to migrate Azure Container Instances to availability zone support.
+author: anaharris-ms
+ms.service: azure
+ms.topic: conceptual
+ms.date: 07/22/2022
+ms.author: anaharris
+ms.reviewer: tomvcassidy
+ms.custom: references_regions
+---
+
+# Migrate Azure Container Instances to availability zone support
+ 
+This guide describes how to migrate Azure Container Instances from non-availability zone support to availability support.  
+
+
+## Prerequisites
+
+* If using Azure CLI, ensure version 2.30.0 or later
+* If using PowerShell, ensure version 2.1.1-preview or later
+* If using the Java SDK, ensure version 2.9.0 or later
+* ACI API version 09-01-2021
+* Make sure the region you're migrating to supports zonal container group deployments. To view a list of supported regions, see [Resource availability for Azure Container Instances in Azure regions](../container-instances/container-instances-region-availability.md).
+
+## Considerations
+
+The following container groups don't support availability zones, and don't offer any  migration guidance:
+
+- Container groups with GPU resources
+- Virtual Network injected container groups
+- Windows Server 2016 container groups
+
+## Downtime requirements
+
+Because ACI requires you to delete your existing deployment and recreate it with zonal support, the downtime is the time it takes to make a new deployment.
+
+## Migration guidance: Delete and redeploy container group
+
+To delete and redeploy a container group:
+
+1. Delete your current container group with one of the following tools:
+
+   - [Azure CLI](../container-instances/container-instances-quickstart.md#clean-up-resources)
+   - [PowerShell](../container-instances/container-instances-quickstart.md#clean-up-resources), 
+   - [Portal](../container-instances/container-instances-quickstart-portal.md#clean-up-resources).
+
+    >[!NOTE]
+    >Zonal support is not supported in the Azure portal. Even if you delete your container group through the portal, you'll still need to create your new container group using CLI or Powershell. 
+    
+1. Follow the steps in [Deploy an Azure Container Instances (ACI) container group in an availability zone (preview)](../container-instances/availability-zones.md).
+
+
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Regions and Availability Zones in Azure](az-overview.md)
+
+> [!div class="nextstepaction"]
+> [Azure Services that support Availability Zones](az-region.md)
+

articles/azure-app-configuration/TOC.yml

@@ -143,7 +143,7 @@
           href: overview-managed-identity.md
         - name: Security baseline
           href: /security/benchmark/azure/baselines/app-config-security-baseline?toc=/azure/azure-app-configuration/TOC.json
-        - name: Disable access key authentication (preview)
+        - name: Disable access key authentication
           href: howto-disable-access-key-authentication.md
         - name: Security controls by Azure Policy
           href: ./security-controls-policy.md
@@ -169,7 +169,7 @@
       href: howto-convert-to-the-new-spring-boot.md
     - name: Move a resource between Azure regions 
       href: howto-move-resource-between-regions.md
-    - name: Recover App Configuration stores (Preview)
+    - name: Recover App Configuration stores
       href: howto-recover-deleted-stores-in-azure-app-configuration.md
     - name: Disable public access
       href: howto-disable-public-access.md

articles/azure-app-configuration/howto-disable-access-key-authentication.md

@@ -1,15 +1,15 @@
 ---
-title: Disable access key authentication for an Azure App Configuration instance (preview)
+title: Disable access key authentication for an Azure App Configuration instance
 titleSuffix: Azure App Configuration
-description: Learn how to disable access key authentication for an Azure App Configuration instance (preview)
+description: Learn how to disable access key authentication for an Azure App Configuration instance
 ms.service: azure-app-configuration
 author: jimmyca15
 ms.author: jimmyca
 ms.topic: how-to
 ms.date: 5/14/2021
 ---
 
-# Disable access key authentication for an Azure App Configuration instance (preview)
+# Disable access key authentication for an Azure App Configuration instance
 
 Every request to an Azure App Configuration resource must be authenticated. By default, requests can be authenticated with either Azure Active Directory (Azure AD) credentials, or by using an access key. Of these two types of authentication schemes, Azure AD provides superior security and ease of use over access keys, and is recommended by Microsoft. To require clients to use Azure AD to authenticate requests, you can disable the usage of access keys for an Azure App Configuration resource.
 
@@ -96,7 +96,7 @@ Be careful to restrict assignment of these roles only to those who require the a
 
 ## Limitations
 
-The capability to disable access key authentication is available as a preview. The following limitations are currently in place.
+The capability to disable access key authentication has the following limitation:
 
 ### ARM template access