Merge pull request #301364 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 560ec22347ec · 2025-06-17T00:38:47.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/configure-ssl-certificate.md b/articles/app-service/configure-ssl-certificate.md
@@ -38,8 +38,7 @@ The following table lists the options for you to add certificates in App Service
 
 The [free App Service managed certificate](#create-a-free-managed-certificate) and the [App Service certificate](configure-ssl-app-service-certificate.md) already satisfy the requirements of App Service. If you choose to upload or import a private certificate to App Service, your certificate must meet the following requirements:
 
-* Be exported as a [password-protected .pfx file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions), encrypted by using triple DES.
-* Contain a private key at least 2,048 bits long.
+* Be exported as a [password-protected PFX file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions).
 * Contain all intermediate certificates and the root certificate in the certificate chain.
 
 If you want to help secure a custom domain in a TLS binding, the certificate must meet these extra requirements:
@@ -48,7 +47,7 @@ If you want to help secure a custom domain in a TLS binding, the certificate mus
 * Be signed by a trusted certificate authority.
 
 > [!NOTE]
-> *Elliptic curve cryptography (ECC) certificates* work with App Service but aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
+> **Elliptic Curve Cryptography (ECC) certificates** work with App Service when uploaded as a PFX, but currently cannot be imported from Key Vault. They aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
 
 After you add a private certificate to an app, the certificate is stored in a deployment unit that's bound to the App Service plan's resource group, region, and operating system (OS) combination. Internally, it's called a *webspace*. That way, the certificate is accessible to other apps in the same resource group, region, and OS combination. Private certificates uploaded or imported to App Service are shared with app services in the same deployment unit.
 
diff --git a/articles/app-service/manage-backup.md b/articles/app-service/manage-backup.md
@@ -31,7 +31,7 @@ There are two types of backups in App Service. If your app is in a supported pri
 | Backup size | 30 GB. | 10 GB, 4 GB of which can be the linked database. |
 | Linked database | Not backed up. | **[Starting 3/31/2028, Azure App Service custom backups will no longer support backing up linked databases.](#deprecation-of-linked-database-backups)** <br><br>The following linked databases can be backed up: [SQL Database](/azure/azure-sql/database/), [Azure Database for MySQL](/azure/mysql/), [Azure Database for PostgreSQL](/azure/postgresql/), [MySQL in-app](https://azure.github.io/AppService/2016/08/18/Announcing-MySQL-in-app-for-Web-Apps-(Windows).html). Note that Azure DB for MySQL - **Flexible Server** and Azure DB for PostgreSQL - **Flexible Server** aren't supported in custom backups. |
 | [Storage account](../storage/index.yml) required | No. | Yes. |
-| Backup frequency | Hourly, not configurable. | Configurable. |
+| Backup frequency | Hourly, not configurable. | Configurable (every 2 hours minimum, up to 12 backups per day (manual + scheduled)). |
 | Retention | 30 days, not configurable. <br><br> Days 1-3: hourly backups retained.<br><br> Days 4-14: every third hourly backup retained.<br><br> Days 15-30: every sixth hourly backup retained. | 0-30 days or indefinite. |
 | Downloadable | No. | Yes, as Azure Storage blobs. |
 | Partial backups | Not supported. | Supported. |
diff --git a/articles/app-service/routine-maintenance.md b/articles/app-service/routine-maintenance.md
@@ -48,6 +48,9 @@ From left to right, the example shows:
 - Selecting the **Impacted Resources** tab.
 - The **More info** option.
 
+> [!NOTE]
+> Manual initiation of maintenance is not supported for App Service Plans. However, App Service Environments (ASE) do support manual maintenance preferences.
+
 :::image type="content" source="./media/routine-maintenance/routine-maintenance-more.png" alt-text="Screenshot of more info for a maintenance event in the Azure portal." lightbox="media/routine-maintenance/routine-maintenance-more.png":::
 
 This example shows:
diff --git a/articles/application-gateway/multiple-site-overview.md b/articles/application-gateway/multiple-site-overview.md
@@ -31,7 +31,7 @@ For example, if you have 2 listeners with associated host names of `*.contoso.co
 
 The ordering of rules can be established by providing a **Priority** field value to the request routing rules associated with the listeners. You can specify an integer value from 1 to 20000 with 1 being the highest priority and 20000 being the lowest priority. If incoming client traffic matches with multiple listeners, the request routing rule with highest priority is used to serve the request. Each request routing rule must have a unique priority value.
 
-The priority field only impacts the order of evaluation of a request routing rule, this wont change the order of evaluation of path based rules within a `PathBasedRouting` request routing rule.
+The priority field only impacts the order of evaluation of a request routing rule, this won't change the order of evaluation of path based rules within a `PathBasedRouting` request routing rule.
 
 > [!NOTE]
 > To use rule priority, you must specify rule priority field values for all the existing request routing rules. Once the rule priority field is in use, any new routing rule that is created must have a rule priority field value as part of its configuration. 
diff --git a/articles/azure-web-pubsub/howto-configure-application-firewall.md b/articles/azure-web-pubsub/howto-configure-application-firewall.md
@@ -128,7 +128,7 @@ The application firewall rules only take effect when the access token contains t
 Below is an example to add userId and insert a unique placeholder in the access token:
 
 ```cs
-// The GUID role wont have any effect. But it ensures this token's uniqueness when using rule ThrottleByJwtSignatureRule.
+// The GUID role won't have any effect. But it ensures this token's uniqueness when using rule ThrottleByJwtSignatureRule.
 var url = service.GetClientAccessUri((userId: "user1" , roles: new string[] {  "webpubsub.joinLeaveGroup.group1", Guid.NewGuid().ToString()});
 ```
 
diff --git a/articles/batch/batch-docker-container-workloads.md b/articles/batch/batch-docker-container-workloads.md
@@ -138,7 +138,7 @@ More considerations for using a custom Linux image:
 
 To enable a Batch pool to run container workloads, you must specify [ContainerConfiguration](/dotnet/api/microsoft.azure.batch.containerconfiguration) settings in the pool's [VirtualMachineConfiguration](/dotnet/api/microsoft.azure.batch.virtualmachineconfiguration) object. This article provides links to the Batch .NET API reference. Corresponding settings are in the [Batch Python](/python/api/overview/azure/batch) API.
 
-You can create a container-enabled pool with or without prefetched container images, as shown in the following examples. The pull (or prefetch) process lets you preload container images from either Docker Hub or another container registry on the Internet. For best performance, use an [Azure container registry](/azure/container-registry/container-registry-intro) in the same region as the Batch account.
+You can create a container-enabled pool with or without prefetched container images, as shown in the following examples. The pull (or prefetch) process lets you preload container images from either Docker Hub or another container registry on the Internet. For best performance, use an [Azure Container Registry](/azure/container-registry/container-registry-intro) in the same region as the Batch account.
 
 The advantage of prefetching container images is that when tasks first start running, they don't have to wait for the container image to download. The container configuration pulls container images to the VMs when the pool is created. Tasks that run on the pool can then reference the list of container images and container run options.
 
@@ -275,7 +275,7 @@ pool.StartTask = startTaskContainer;
 
 ### Prefetch images from a private container registry
 
-You can also prefetch container images by authenticating to a private container registry server. In the following examples, the `ContainerConfiguration` and `VirtualMachineConfiguration` objects prefetch a private TensorFlow image from a private Azure container registry. The image reference is the same as in the previous example.
+You can also prefetch container images by authenticating to a private container registry server. In the following examples, the `ContainerConfiguration` and `VirtualMachineConfiguration` objects prefetch a private TensorFlow image from a private Azure Container Registry. The image reference is the same as in the previous example.
 
 ```python
 image_ref_to_use = batch.models.ImageReference(
diff --git a/articles/container-apps/faq.yml b/articles/container-apps/faq.yml
@@ -169,4 +169,10 @@ sections:
       - question: |
           How do I use `latest` or a static tag for my container image?
         answer: |
-          Avoid using static tags like `latest` for container images. Using static tags can lead to caching problems and can make your app difficult to troubleshoot. Instead, use unique tags for each deployment, such as a Git hash or date and time to ensure that updates are properly tracked and deployed.
+          Avoid using static tags like `latest` for container images. Using static tags can lead to caching problems and can make your app difficult to troubleshoot. Instead, use unique tags for each deployment, such as a Git hash or date and time to ensure that updates are properly tracked and deployed.
+  - name: OpenTelemetry
+    questions:
+      - question: |
+          What transport protocols does the OpenTelemetry managed agent support?
+        answer: |
+          The managed agent only supports gRPC.
diff --git a/articles/container-apps/log-options.md b/articles/container-apps/log-options.md
@@ -76,7 +76,7 @@ To create a new *diagnostic setting*:
 
 1. Select one or more **Destination details**:
     - **Send to Log Analytics workspace**: Select from existing Log Analytics workspaces.
-    - **Archive to a storage account**: This option is deprecated.
+    - **Archive to a storage account**: Select from Azure storage accounts.
     - **Stream to an event hub**: Select from Azure event hubs.
     - **Send to a partner solution**: Select from Azure partner solutions. 
 
diff --git a/articles/container-apps/opentelemetry-agents.md b/articles/container-apps/opentelemetry-agents.md
@@ -4,7 +4,7 @@ description: Learn to record and query data collected using OpenTelemetry in Azu
 services: container-apps
 author: craigshoemaker
 ms.service: azure-container-apps
-ms.date: 05/08/2025
+ms.date: 06/16/2025
 ms.author: cshoe
 ms.topic: how-to
 ms.custom:
@@ -779,6 +779,7 @@ See the destination service for their billing structure and terms. For example,
 - System data, such as system logs or Container Apps standard metrics, isn't available to be sent to the OpenTelemetry agent.
 - The Application Insights endpoint doesn't accept metrics.
 - Configuration settings live at the environment level. You can send different data types to different destinations, but you can't split up your data by app. For example, in the same app you can send metrics to Datadog, and traces to App Insights.
+- The managed agent only supports the gRPC transport protocol for telemetry data.
 
 ## Frequently asked questions
 
diff --git a/articles/container-apps/vnet-custom.md b/articles/container-apps/vnet-custom.md
@@ -25,7 +25,7 @@ You also have the option of deploying a private DNS for your Container Apps envi
 #### Create a virtual network
 
 > [!NOTE]
-> To use a VNet with Container Apps, the VNet must have a dedicated subnet with a CIDR range of `/23` or larger when using the Consumption only environemnt, or a CIDR range of `/27` or larger when using the workload profiles environment. To learn more about subnet sizing, see the [networking architecture overview](./networking.md#subnet).
+> To use a VNet with Container Apps, the VNet must have a dedicated subnet with a CIDR range of `/23` or larger when using the Consumption only environment, or a CIDR range of `/27` or larger when using the workload profiles environment. To learn more about subnet sizing, see the [networking architecture overview](./networking.md#subnet).
 
 1. Select the **Networking** tab.
 1. Select **Yes** next to *Use your own virtual network*.
diff --git a/articles/dev-box/how-to-generate-visual-studio-caches.md b/articles/dev-box/how-to-generate-visual-studio-caches.md
@@ -11,7 +11,7 @@ ms.author: rosemalcolm
 ms.date: 02/23/2025
 ms.topic: how-to
 
-#customer intent: As a platfrom engineer, I want to learn how to precache Visual Studio solutions for Microsoft Dev Boxes, so that developers can get strated on VS solutions more quickly.
+#customer intent: As a platform engineer, I want to learn how to precache Visual Studio solutions for Microsoft Dev Boxes, so that developers can get strated on VS solutions more quickly.
 ---
 
 # Optimize the Visual Studio experience on Microsoft Dev Box
diff --git a/articles/dev-box/how-to-manage-dev-box-definitions.md b/articles/dev-box/how-to-manage-dev-box-definitions.md
@@ -80,7 +80,7 @@ The following steps show you how to create a dev box definition by using an exis
    | **Name** | Enter a descriptive name for your dev box definition. | You can't change the dev box definition name after creation. |
    | **Image** | Select the base operating system for the dev box. You can select an image from Azure Marketplace or from Azure Compute Gallery. </br> If you're creating a dev box definition for testing purposes, consider using the **Visual Studio 2022 Enterprise on Windows 11 Enterprise + Microsoft 365 Apps 22H2** image or **Visual Studio 2022 Pro on Windows 11 Enterprise + Microsoft 365 Apps 22H2** image. | To access custom images when you create a dev box definition, you can use Azure Compute Gallery. For more information, see [Configure Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md). |
    | **Image version** | Select a specific, numbered version to ensure that all the dev boxes in the pool always use the same version of the image. Select **Latest** to ensure that new dev boxes use the latest image available. | Selecting the **Latest** image version enables the dev box pool to use the most recent version of your chosen image from the gallery. This approach ensures the created dev boxes stay up to date with the latest tools and code for your image. Existing dev boxes aren't modified when an image version is updated. |
-   | **Compute** | Select the compute combination for your dev box definition. | Dev boxes use Azure vitual machines for compute. |
+   | **Compute** | Select the compute combination for your dev box definition. | Dev boxes use Azure virtual machines for compute. |
    | **Storage** | Select the amount of storage for your dev box definition. | Dev boxes use Azure Premium SSDs for storage. |
    | **Enable hibernation**| Leave this checkbox unselected. | |
 
diff --git a/articles/event-hubs/event-hubs-dedicated-cluster-create-portal.md b/articles/event-hubs/event-hubs-dedicated-cluster-create-portal.md
@@ -7,7 +7,7 @@ ms.custom: mode-ui
 ---
 
 # Quickstart: Create a Dedicated Azure Event Hubs cluster using Azure portal 
-Event Hubs clusters offer **single-tenant deployments** for customers with the most demanding streaming needs. This offering has a guaranteed **99.99%** service level agreemnt (SLA), which is available only in our Dedicated pricing tier. An [Event Hubs cluster](event-hubs-dedicated-overview.md) can ingress millions of events per second with guaranteed capacity and subsecond latency. Namespaces and event hubs created within a cluster include all features of the premium offering and more, but without any ingress limits. The Dedicated offering also includes the popular [Event Hubs Capture](event-hubs-capture-overview.md) feature at no extra cost, allowing you to automatically batch and log data streams to [Azure Blob Storage](../storage/blobs/storage-blobs-introduction.md) or [Azure Data Lake Storage Gen 1](../data-lake-store/data-lake-store-overview.md).
+Event Hubs clusters offer **single-tenant deployments** for customers with the most demanding streaming needs. This offering has a guaranteed **99.99%** service level agreement (SLA), which is available only in our Dedicated pricing tier. An [Event Hubs cluster](event-hubs-dedicated-overview.md) can ingress millions of events per second with guaranteed capacity and subsecond latency. Namespaces and event hubs created within a cluster include all features of the premium offering and more, but without any ingress limits. The Dedicated offering also includes the popular [Event Hubs Capture](event-hubs-capture-overview.md) feature at no extra cost, allowing you to automatically batch and log data streams to [Azure Blob Storage](../storage/blobs/storage-blobs-introduction.md) or [Azure Data Lake Storage Gen 1](../data-lake-store/data-lake-store-overview.md).
 
 Dedicated clusters are provisioned and billed by **capacity units (CUs)**, a pre-allocated amount of CPU and memory resources. You can purchase up to 10 CUs for a cluster in the Azure portal. If you need a cluster larger than 10 CU, you can submit an Azure support request to scale up your cluster after its creation. In this quickstart, we walk you through creating a 1 CU Event Hubs cluster through the Azure portal.
 
diff --git a/articles/logic-apps/logic-apps-examples-and-scenarios.md b/articles/logic-apps/logic-apps-examples-and-scenarios.md
@@ -168,7 +168,7 @@ You can fully develop and deploy logic app resources with Azure DevOps or any ot
 ##### Monitor Standard workflows
 
 * [Monitor health for Standard workflows in Azure Logic Apps with Health Check](monitor-health-standard-workflows.md)
-* [Enable and view enhanced telemetry in Application Insights for Standard worklfows](enable-enhanced-telemetry-standard-workflows.md)
+* [Enable and view enhanced telemetry in Application Insights for Standard workflows](enable-enhanced-telemetry-standard-workflows.md)
 * [Monitor and track B2B transactions in Standard workflows](monitor-track-b2b-transactions-standard.md)
 
 ## Other integrations and capabilities
diff --git a/articles/logic-apps/power-automate-migration.md b/articles/logic-apps/power-automate-migration.md
@@ -177,7 +177,7 @@ This migration tool converts a Power Automate flow into the equivalent Standard
 
 However, due to security constraints, the migration tool can't automatically transfer the connections used by the Power Automate flow. While the tool automates most of the flow conversion, you must manually recreate the connections in the logic app workflow. This manual step is necessary to fully meet the security protocols and compliance standards for Azure Logic Apps.
 
-Despite this requirement, the migration tool offers significant time and resource savings by eliminating the need to manually recreate entire workflows. The tool's automated process drastically reduces any other necessary manual effort and shortens the overall migration timeline. With this automation, your team can focus energy on setting up and optmizing connections, not on rebuilding workflows.
+Despite this requirement, the migration tool offers significant time and resource savings by eliminating the need to manually recreate entire workflows. The tool's automated process drastically reduces any other necessary manual effort and shortens the overall migration timeline. With this automation, your team can focus energy on setting up and optimizing connections, not on rebuilding workflows.
 -->
 
 ### Migration testing and validation
diff --git a/articles/operator-nexus/howto-track-async-operations-cli.md b/articles/operator-nexus/howto-track-async-operations-cli.md
@@ -34,7 +34,7 @@ Using the value from before:
 az rest -m get -u "https://management.azure.com/subscriptions/.../providers/Microsoft.NetworkCloud/locations/EASTUS/operationStatuses/12312312-1231-1231-1231-123123123123*99399E995...?api-version=2022-12-12-preview"
 ```
 
-This request will return an operation status result that can be requeried using the same command until the status reaches a final state of `Succeeded` or `Failed`. At this point, the requested operation has ceased.
+This request will return an operation status result that can be required using the same command until the status reaches a final state of `Succeeded` or `Failed`. At this point, the requested operation has ceased.
 
 ```json
 {
diff --git a/articles/storage/blobs/blob-inventory-how-to.md b/articles/storage/blobs/blob-inventory-how-to.md
@@ -208,7 +208,7 @@ While you can disable individual reports, you can also prevent blob inventory fr
 
 ## Subscribe to blob inventory policy completed event
 
-You can suscribe to blob inventory completed event to receive information on the outcome of your inventory runs. This event gets triggered when the inventory run completes for a rule that is defined an inventory policy. This event also occurs if the inventory run fails with a user error before it starts to run. For example, an invalid policy, or an error that occurs when a destination container isn't present will trigger the event.
+You can subscribe to blob inventory completed event to receive information on the outcome of your inventory runs. This event gets triggered when the inventory run completes for a rule that is defined an inventory policy. This event also occurs if the inventory run fails with a user error before it starts to run. For example, an invalid policy, or an error that occurs when a destination container isn't present will trigger the event.
 
 1. Sign in to the [Azure portal](https://portal.azure.com/).
 
diff --git a/articles/storage/blobs/network-file-system-protocol-support-performance.md b/articles/storage/blobs/network-file-system-protocol-support-performance.md
diff --git a/articles/storage/container-storage/container-storage-aks-quickstart.md b/articles/storage/container-storage/container-storage-aks-quickstart.md
diff --git a/articles/storage/container-storage/install-container-storage-aks.md b/articles/storage/container-storage/install-container-storage-aks.md
diff --git a/articles/storage/file-sync/file-sync-deployment-guide.md b/articles/storage/file-sync/file-sync-deployment-guide.md
diff --git a/articles/virtual-network/ip-services/public-ip-upgrade-vm.md b/articles/virtual-network/ip-services/public-ip-upgrade-vm.md
diff --git a/includes/azure-websites-limits.md b/includes/azure-websites-limits.md
