Merge pull request #291601 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 308d8a03f75f · 2024-12-07T06:50:35.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/app-service/tutorial-python-postgresql-app.md b/articles/app-service/tutorial-python-postgresql-app.md
@@ -289,6 +289,22 @@ The creation wizard generated the connectivity variables for you already as [app
     :::column:::
     :::column-end:::
 :::row-end:::
+:::row:::
+    :::column span="2":::
+        **Step 4:** Back in the **Configuration** page, select **New application setting**. Name the setting `SECRET_KEY`. Paste the value from the previous value. Select **OK**.
+    :::column-end:::
+    :::column:::
+        :::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png" alt-text="A screenshot showing how to set the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png":::
+    :::column-end:::
+:::row-end:::
+:::row:::
+    :::column span="2":::
+        **Step 5:** Select **Save**.
+    :::column-end:::
+    :::column:::
+        :::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png" alt-text="A screenshot showing how to save the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png":::
+    :::column-end:::
+:::row-end:::
 
 ### [Django](#tab/django)
 
diff --git a/articles/azure-cache-for-redis/cache-how-to-scale.md b/articles/azure-cache-for-redis/cache-how-to-scale.md
@@ -120,7 +120,7 @@ For more information on scaling with PowerShell, see [To scale an Azure Cache fo
 
 #### Scale up and down using Azure CLI
 
-To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capcity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
+To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capacity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
 
 ```azurecli
 az redis update --cluster-name myCache --resource-group myGroup --set "sku.capacity"="2"
diff --git a/articles/azure-cache-for-redis/cache-how-to-upgrade.md b/articles/azure-cache-for-redis/cache-how-to-upgrade.md
@@ -86,7 +86,7 @@ To defer upgrades to your cache, navigate to the **Advanced Settings** on the Re
 
 ## Considerations before upgrading Redis versions
 
-Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibilty as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
+Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibility as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
 
 ### Client version
 
diff --git a/articles/azure-cache-for-redis/cache-insights-overview.md b/articles/azure-cache-for-redis/cache-insights-overview.md
@@ -38,7 +38,7 @@ Azure Cache for Redis insights are based on the [workbooks feature of Azure Moni
 - **Azure Cache For Redis Resource Overview** combines many of the most commonly used metrics so that the health and performance of the cache instance can be viewed at a glance.
     :::image type="content" source="media/cache-how-to-monitor/cache-monitoring-resource-overview.png" alt-text="Screenshot of graphs showing a resource overview for the cache.":::
 
-- **Geo-Replication Dashboard** pulls geo-replication health and status metrics from both the geo-primary and geo-secondary cache instances to give a complete picture of geo-replcation health. Using this dashboard is recommended, as some geo-replication metrics are only emitted from either the geo-primary or geo-secondary.
+- **Geo-Replication Dashboard** pulls geo-replication health and status metrics from both the geo-primary and geo-secondary cache instances to give a complete picture of geo-replication health. Using this dashboard is recommended, as some geo-replication metrics are only emitted from either the geo-primary or geo-secondary.
     :::image type="content" source="media/cache-how-to-monitor/cache-monitoring-geo-dashboard.png" alt-text="Screenshot showing the geo-replication dashboard with a geo-primary and geo-secondary cache set.":::
 
 ### Overview
diff --git a/articles/azure-cache-for-redis/cache-monitor-diagnostic-settings.md b/articles/azure-cache-for-redis/cache-monitor-diagnostic-settings.md
@@ -225,7 +225,7 @@ az monitor diagnostic-settings create
     --event-hub-rule /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/microsoft.eventhub/namespaces/{eventHubNamespace}/authorizationrule/{ruleName}
     --storage-account /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{storageAccountName}
     --workspace /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsWorkspaceName}
-    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/proviers/Microsoft.Datadog/monitors/mydatadog
+    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/providers/Microsoft.Datadog/monitors/mydatadog
 ```
 
 ### [Azure CLI with Enterprise and Enterprise Flash tiers](#tab/enterprise-enterprise-flash)
@@ -241,7 +241,7 @@ az monitor diagnostic-settings create
     --event-hub-rule /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/microsoft.eventhub/namespaces/{eventHubNamespace}/authorizationrule/{ruleName}
     --storage-account /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{storageAccountName}
     --workspace /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsWorkspaceName}
-    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/proviers/Microsoft.Datadog/monitors/mydatadog
+    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/providers/Microsoft.Datadog/monitors/mydatadog
 ```
 
 ---
diff --git a/articles/azure-cache-for-redis/cache-private-link.md b/articles/azure-cache-for-redis/cache-private-link.md
@@ -39,7 +39,7 @@ You can restrict public access to the private endpoint of your cache by disablin
 >
 
 > [!IMPORTANT]
-> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to autenticate to the storage account](cache-managed-identity.md).
+> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to authenticate to the storage account](cache-managed-identity.md).
 > For more information, see [What if I have firewall enabled on my storage account?](cache-how-to-import-export-data.md#what-if-i-have-firewall-enabled-on-my-storage-account)
 >
 
diff --git a/articles/azure-cache-for-redis/cache-remove-tls-10-11.md b/articles/azure-cache-for-redis/cache-remove-tls-10-11.md
@@ -29,7 +29,7 @@ TLS versions 1.0 and 1.1 also don't support the modern encryption methods and ci
 As a part of this effort, you can expect the following changes to Azure Cache for Redis:
 
 - _Phase 1_: Azure Cache for Redis stops offering TLS 1.0/1.1 as an option for _MinimumTLSVersion_ setting for new cache creates. Existing cache instances won't be updated at this point. You can't set the _MinimumTLSVersion_ to 1.0 or 1.1 for your existing cache.
-- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting March 1, 2025. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service remains available while we update the _MinimumTLSVerion_ for all caches to 1.2.
+- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting March 1, 2025. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service remains available while we update the _MinimumTLSVersion_ for all caches to 1.2.
 
 | Date             | Description                                                                                                                                                                                                                                                                    |
 | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
diff --git a/articles/azure-cache-for-redis/cache-tutorial-vector-similarity.md b/articles/azure-cache-for-redis/cache-tutorial-vector-similarity.md
@@ -204,7 +204,7 @@ Next, you'll read the csv file into a pandas DataFrame.
    ```
 
    > [!Important]
-   > Refer to [Azure OpenAI Service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) to caculate the cost of generating embeddings based on the number of tokens required.
+   > Refer to [Azure OpenAI Service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) to calculate the cost of generating embeddings based on the number of tokens required.
 
 ## Load DataFrame into LangChain
 
diff --git a/articles/azure-cache-for-redis/cache-web-app-arm-with-redis-cache-provision.md b/articles/azure-cache-for-redis/cache-web-app-arm-with-redis-cache-provision.md
@@ -122,7 +122,7 @@ Notice that the web app is configured with app setting properties that enable it
 
 
 ### Web app (RedisEnterprise)
-<!--cawa - should this section be renamed to AMR and the section at the top remoeved altogether? -->
+<!--cawa - should this section be renamed to AMR and the section at the top removed altogether? -->
 For RedisEnterprise, because the resource types are slightly different, the way to do **listKeys** is different:
 
 ```json
diff --git a/articles/azure-cache-for-redis/cache-whats-new.md b/articles/azure-cache-for-redis/cache-whats-new.md
@@ -46,7 +46,7 @@ You are able to manually trigger an upgrade to the latest version of Redis softw
 
 | **Tier**         | Basic, Standard, Premium                                | Enterprise, Enterprise Flash |
 |:--------------------------|:----------------------------------------------:|:----------------------------:|
-| **Lastest Redis Version** | Redis 6.0 (GA)                                 | Redis 6.0 (GA) / Redis 7.2 (Preview)|
+| **Latest Redis Version** | Redis 6.0 (GA)                                 | Redis 6.0 (GA) / Redis 7.2 (Preview)|
 | **Upgrade Policy** | Manual upgrade to newer version     | Automatic upgrade to latest GA version         |
 
 ### Enterprise tier E1 (preview) SKU
@@ -131,7 +131,7 @@ To meet the industry-wide push toward the exclusive use of Transport Layer Secur
 As a part of this effort, you can expect the following changes to Azure Cache for Redis:
 
 - _Phase 1_: Azure Cache for Redis stops offering TLS 1.0/1.1 as an option for MinimumTLSVersion setting for new cache creates. Existing cache instances won't be updated at this point. You can still use the Azure portal or other management APIs to [change the minimum TLS version](cache-configure.md#access-ports) to 1.0 or 1.1 for backward compatibility.
-- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting October 1, 2024. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service is expected to be available while we update the MinimumTLSVerion for all caches to 1.2.
+- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting October 1, 2024. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service is expected to be available while we update the MinimumTLSVersion for all caches to 1.2.
 
 For more information, see [Remove TLS 1.0 and 1.1 from use with Azure Cache for Redis](cache-remove-tls-10-11.md).
 
diff --git a/articles/azure-cache-for-redis/includes/managed-redis-create.md b/articles/azure-cache-for-redis/includes/managed-redis-create.md
@@ -20,7 +20,7 @@ ms.custom:
    | **Resource group** | Drop down and select a resource group, or select **Create new** and enter a new resource group name. | Name for the resource group in which to create your cache and other resources. By putting all your app resources in one resource group, you can easily manage or delete them together. |
    | **DNS name** | Enter a name that is unique in the region. | The cache name must be a string between 1 and 63 characters when _combined with the cache's region name_ that contain only numbers, letters, or hyphens. (If the cache name is fewer than 45 characters long it should work in all currently available regions.) The name must start and end with a number or letter, and can't contain consecutive hyphens. Your cache instance's _host name_ is `\<DNS name\>.\<Azure region\>.redis.azure.net`. |
    | **Location** | Drop down and select a location. | Azure Managed Redis is available in selected Azure regions. |
-   | **Cache type** | Drop down and select the performance tier and cache size. |  The tier determines the performance of the Redis instance, while the cache size determines the memory available to store data. For guidance on choosing the right performance tier, see [Chosing the right tier](../managed-redis/managed-redis-overview.md#choosing-the-right-tier) |
+   | **Cache type** | Drop down and select the performance tier and cache size. |  The tier determines the performance of the Redis instance, while the cache size determines the memory available to store data. For guidance on choosing the right performance tier, see [Choosing the right tier](../managed-redis/managed-redis-overview.md#choosing-the-right-tier) |
 
    :::image type="content" source="media/managed-redis-create/managed-redis-new-cache-basics.png" alt-text="Screenshot showing the Azure Managed Redis Basics tab.":::
 
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-active-geo-replication.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-active-geo-replication.md
@@ -46,7 +46,7 @@ There are a few restrictions when using active geo replication:
 - On the _Flash Optimized_ tier, only the _No Eviction_ eviction policy can be used. All eviction policies are supported on the other tiers.
 - Data persistence isn't supported because active geo-replication provides a superior experience.
 - All caches within a geo-replication group must have the same configuration. For example, all caches must have the same SKU, capacity, eviction policy, clustering policy, modules, and TLS setting.
-- If one instance in a geo-repliation group is scaled, the other instances in that group must be scaled to the same size before any additional scaling can occur. See [Scaling instances in a geo-replication group](#scaling-instances-in-a-geo-replication-group) for more information.
+- If one instance in a geo-replication group is scaled, the other instances in that group must be scaled to the same size before any additional scaling can occur. See [Scaling instances in a geo-replication group](#scaling-instances-in-a-geo-replication-group) for more information.
 - You can't use the `FLUSHALL` and `FLUSHDB` Redis commands when using active geo-replication. Prohibiting the commands prevents unintended deletion of data. Use the [flush operation](#flush-operation) instead.
 
 ## Create or join an active geo-replication group
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-persistence.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-persistence.md
@@ -15,7 +15,7 @@ ms.date: 11/15/2024
 
 > [!IMPORTANT]
 >
-> Data persistence is meant to provide resilience for unexpected Redis node failures, but it is not a data backup or point in time recovery (PITR) feature. If corrupted data is writen to the Redis instance this data will also be persisted. To make backups of your Redis instance, use the [export feature](managed-redis-how-to-import-export-data.md).  
+> Data persistence is meant to provide resilience for unexpected Redis node failures, but it is not a data backup or point in time recovery (PITR) feature. If corrupted data is written to the Redis instance this data will also be persisted. To make backups of your Redis instance, use the [export feature](managed-redis-how-to-import-export-data.md).  
 >
 
 ## Scope of availability
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-scale.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-scale.md
@@ -3,7 +3,7 @@ title: Scale an Azure Managed Redis (preview) instance
 description: Learn how to scale your Azure Managed Redis instances using the Azure portal, and tools such as Azure PowerShell, and Azure CLI
 
 
-ms.servic: azure
+ms.service: azure
 ms.topic: conceptual
 ms.date: 11/15/2024
 ms.devlang: csharp
@@ -170,7 +170,7 @@ For more information on how Azure Managed Redis handles sharding, see [Sharding
 
 ### Are there scaling limitations with geo-replication?
 
-With [active geo-replication](managed-redis-how-to-active-geo-replication.md) configured, you can't mix and match cache sizes in a geo-replication group. As a result, scaling the caches in a geo-repliation group requires a few more steps. See [Scaling instances in a geo-replication group](managed-redis-how-to-active-geo-replication.md#scaling-instances-in-a-geo-replication-group) for instructions.
+With [active geo-replication](managed-redis-how-to-active-geo-replication.md) configured, you can't mix and match cache sizes in a geo-replication group. As a result, scaling the caches in a geo-replication group requires a few more steps. See [Scaling instances in a geo-replication group](managed-redis-how-to-active-geo-replication.md#scaling-instances-in-a-geo-replication-group) for instructions.
 
 ### How long does scaling take?
 
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-upgrade.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-upgrade.md
@@ -72,7 +72,7 @@ To defer upgrades to your cache, navigate to the **Advanced Settings** on the Re
 
 ## Considerations before upgrading Redis versions
 
-Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibilty as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
+Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibility as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
 
 ### Client version
 
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-monitor-diagnostic-settings.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-monitor-diagnostic-settings.md
@@ -136,7 +136,7 @@ az monitor diagnostic-settings create
     --event-hub-rule /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/microsoft.eventhub/namespaces/{eventHubNamespace}/authorizationrule/{ruleName}
     --storage-account /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{storageAccountName}
     --workspace /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsWorkspaceName}
-    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/proviers/Microsoft.Datadog/monitors/mydatadog
+    --marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/providers/Microsoft.Datadog/monitors/mydatadog
 ```
 
 ## Contents of the Connection Logs
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-overview.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-overview.md
@@ -56,7 +56,7 @@ Three tiers are for in-memory data:
 - **Compute Optimized** Designed for performance-intensive workloads requiring maximum throughput, with a low memory-to-vCPU (2:1) ratio. It's ideal for applications that demand the highest performance.
 
 One tier stores data both in-memory and on-disk:
-<!--Kyle [umanag] should On-disk section callout the difference from Persistance which uses attached managed disk too -->
+<!--Kyle [umanag] should On-disk section callout the difference from Persistence which uses attached managed disk too -->
 
 - **Flash Optimized** Enables Redis clusters to automatically move less frequently accessed data from memory (RAM) to NVMe storage. This reduces performance, but allows for cost-effective scaling of caches with large datasets.
 
diff --git a/articles/azure-cache-for-redis/managed-redis/managed-redis-private-link.md b/articles/azure-cache-for-redis/managed-redis/managed-redis-private-link.md
@@ -43,7 +43,7 @@ You can restrict public access to the private endpoint of your cache by disablin
 >
 
 > [!IMPORTANT]
-> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to autenticate to the storage account](../cache-managed-identity.md).
+> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to authenticate to the storage account](../cache-managed-identity.md).
 > For more information, see [What if I have firewall enabled on my storage account?](managed-redis-how-to-import-export-data.md#what-if-i-have-firewall-enabled-on-my-storage-account)
 >
 
diff --git a/articles/azure-cache-for-redis/monitor-cache.md b/articles/azure-cache-for-redis/monitor-cache.md
diff --git a/articles/azure-cache-for-redis/scripts/create-manage-cache.md b/articles/azure-cache-for-redis/scripts/create-manage-cache.md
diff --git a/articles/azure-resource-manager/management/move-support-resources.md b/articles/azure-resource-manager/management/move-support-resources.md
diff --git a/articles/baremetal-infrastructure/workloads/nc2-on-azure/architecture.md b/articles/baremetal-infrastructure/workloads/nc2-on-azure/architecture.md
diff --git a/articles/reliability/migrate-cache-redis.md b/articles/reliability/migrate-cache-redis.md

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ You can restrict public access to the private endpoint of your cache by disablin`
`39`	`39`	`>`
`40`	`40`
`41`	`41`	`> [!IMPORTANT]`
`42`		`-> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to autenticate to the storage account](cache-managed-identity.md).`
	`42`	`+> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to authenticate to the storage account](cache-managed-identity.md).`
`43`	`43`	`> For more information, see [What if I have firewall enabled on my storage account?](cache-how-to-import-export-data.md#what-if-i-have-firewall-enabled-on-my-storage-account)`
`44`	`44`	`>`
`45`	`45`