Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us297322-content-curation

Author: asudbring

.openpublishing.redirection.azure-app-configuration.json

@@ -27,7 +27,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
-            "redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
+            "redirect_url": "/azure/azure-app-configuration/push-kv-github-action",
             "redirect_document_id": false
         }
     ]

articles/ai-services/document-intelligence/concept-custom-neural.md

@@ -286,9 +286,12 @@ Starting with version `2024-07-31-preview`, you can train your custom neural mod
 You can choose to spend all of 10 free hours on a single model build with a large set of data, or utilize it across multiple builds by adjusting the maximum duration value for the `build` operation by specifying `maxTrainingHours`:
 
 ```bash
+POST https://{endpoint}/documentintelligence/documentModels:build?api-version=2024-07-31-preview
 
-POST /documentModels:build
 {
+  "modelId": "string",
+  "description": "string",
+  "buildMode": "neural",
   ...,
   "maxTrainingHours": 10
 }
@@ -299,7 +302,7 @@ POST /documentModels:build
 > * If you would like to train additional neural models or train models for a longer time period that **exceed 10 hours**, billing charges apply. For details on the billing charges, refer to the [pricing page](https://azure.microsoft.com/pricing/details/ai-document-intelligence/).
 > * You can opt in for this paid training service by setting the `maxTrainingHours` to the desired maximum number of hours. API calls with no budget but with the `maxTrainingHours` set as over 10 hours will fail.
 > * As each build takes different amount of time depending on the type and size of the training dataset, billing is calculated for the actual time spent training the neural model, with a minimum of 30 minutes per training job.
-> * This paid billing structure enables you to train larger data sets for longer durations with flexibility in the training hours.
+> * This paid training feature enables you to train larger data sets for longer durations with flexibility in the training hours.
 
 ```bash
 
@@ -321,7 +324,11 @@ GET /documentModels/{myCustomModel}
 
 ## Billing
 
-For Document Intelligence versions `v3.1 (2023-07-31) and v3.0 (2022-08-31)`, you receive a maximum 30 minutes of training duration per model, and a maximum of 20 trainings for free per month. If you would like to train more than 20 model instances, you can create an [Azure support ticket](service-limits.md#create-and-submit-support-request) to increase in the training limit. For the Azure support ticket, enter in the `summary` section a phrase such as `Increase Document Intelligence custom neural training (TPS) limit`. A ticket can only apply at a resource-level, not a subscription level. You can request a training limit increase for a single Document Intelligence resource by specifying your resource ID and region in the support ticket.
+For Document Intelligence versions `v3.1 (2023-07-31) and v3.0 (2022-08-31)`, you receive a maximum 30 minutes of training duration per model, and a maximum of 20 trainings for free per month. If you would like to train more than 20 model instances, you can create an [Azure support ticket](service-limits.md#create-and-submit-support-request) to increase in the training limit. For Azure support ticket, enter in the `summary` field: `Increase Document Intelligence custom neural training (TPS) limit`. 
+
+> [!IMPORTANT]
+> * When increasing the training limit, note that 2 custom neural model training sessions will be considered as 1 training hour. For more details on the pricing for increasing the number of training sessions, refer to the [pricing page](https://azure.microsoft.com/pricing/details/ai-document-intelligence/).
+> * Azure support ticket for training limit increase can only apply at a **resource-level**, not a subscription level. You can request a training limit increase for a single Document Intelligence resource by specifying your resource ID and region in the support ticket.
 
 If you want to train models for longer durations than 30 minutes, we support **paid training** with our newest version, `v4.0 (2024-07-31-preview)`. Using the latest version, you can train your model for a longer duration to process larger documents. For more information about paid training, *see* [Billing v4.0](service-limits.md#billing).
 
@@ -331,7 +338,11 @@ If you want to train models for longer durations than 30 minutes, we support **p
 
 ## Billing
 
-For Document Intelligence versions `v3.1 (2023-07-31) and v3.0 (2022-08-31)`, you receive a maximum 30 minutes of training duration per model, and a maximum of 20 trainings for free per month. If you would like to train more than 20 model instances, you can create an [Azure support ticket](service-limits.md#create-and-submit-support-request) to increase in the training limit. For the Azure support ticket, enter in the `summary` section a phrase such as `Increase Document Intelligence custom neural training (TPS) limit`. A ticket can only apply at a resource-level, not a subscription level. You can request a training limit increase for a single Document Intelligence resource by specifying your resource ID and region in the support ticket.
+For Document Intelligence versions `v3.1 (2023-07-31) and v3.0 (2022-08-31)`, you receive a maximum 30 minutes of training duration per model, and a maximum of 20 trainings for free per month. If you would like to train more than 20 model instances, you can create an [Azure support ticket](service-limits.md#create-and-submit-support-request) to increase in the training limit. For Azure support ticket, enter in the `summary` field: `Increase Document Intelligence custom neural training (TPS) limit`. 
+
+> [!IMPORTANT]
+> * When increasing the training limit, note that 2 custom neural model training sessions will be considered as 1 training hour. For more details on the pricing for increasing the number of training sessions, refer to the [pricing page](https://azure.microsoft.com/pricing/details/ai-document-intelligence/).
+> * Azure support ticket for training limit increase can only apply at a **resource-level**, not a subscription level. You can request a training limit increase for a single Document Intelligence resource by specifying your resource ID and region in the support ticket.
 
 If you want to train models for longer durations than 30 minutes, we support **paid training** with our newest version, `v4.0 (2024-07-31)`. Using the latest version, you can train your model for a longer duration to process larger documents. For more information about paid training, *see* [Billing v4.0](service-limits.md#billing).
 

articles/ai-services/document-intelligence/faq.yml

@@ -291,15 +291,15 @@ sections:
     - question: |
         Am I charged when training a custom models?
       answer: |
-        **Yes**
+        **Yes.**
 
-        Although training is free for all custom generative and custom template models, creating the training dataset for all models requires running the Layout model on the training documents. Customers are responsible for this cost. 
+        Training is free for all custom generative and custom template models. However, creating the training dataset for all models requires running the Layout model on the training documents. Customers are responsible for this cost. 
         
         Custom generative models also rely on the auto label feature to speed up the generation of the labeled dataset. There's a cost associated with this action. While the build operation for template and generative models is free, creating the labeled dataset can result in some minimal costs.
 
-        Custom neural models have a limit on the number of models/the amount of time that models can be trained for free. The first 10 hours of training are free. If training a single model for longer than 10 hours or training multiple models that exceed the 10 hour limit, you need to enable paid training by setting a training budget. See [training a custom neural model](concept-custom-neural.md) for details. 
+        For `v4.0 2024-07-31-preview`, custom neural models can be trained for free for a **maximum of 10 hours**. Whether you are training a single model for the 10 hours, or training multiple models for the total of 10 hours, you won't be charged for the first 10 hours. After using up the free 10 hours, you will be **automatically charged by the extra training hour**. For details on the prices, refer to the [pricing page](https://azure.microsoft.com/pricing/details/ai-document-intelligence/). This new paid training feature enables training models for an extended duration to process larger documents. For more information on this paid training feature, check [custom neural model billing section](concept-custom-neural.md#billing).
         
-        For v3.0 or v3.1 models the paid training tier only applies to added models, the training time per model isn't configurable.
+        For `v3.0 2022-08-31` or `v3.1 2023-07-31`, custom neural models can be trained for free for a maximum of 20 training sessions, with each session capped at 30 minutes of training duration. Once you use up all of the 20 training sessions, you can submit Azure support ticket to increase the training session limit. For increasing the limit, 2 training sessions will be considered as 1 training hour, and you will be charged per 2 sessions / 1 training hour. For details on the prices, refer to the [pricing page]. For more information on ways to increase the limit, check [custom neural model billing section](concept-custom-neural.md#billing). **Note that for `v3.0` and `v3.1`, paid training feature is unavailable. Paid training feature for custom neural model is only available on `v4.0`.**
 
   - name: Storage account
     questions:

articles/api-management/api-management-howto-aad-b2c.md

@@ -14,7 +14,7 @@ ms.custom: engagement-fy23
 
 # How to authorize developer accounts by using Azure Active Directory B2C in Azure API Management
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
+[!INCLUDE [premium-dev-standard-standardv2-basicv2.md](../../includes/api-management-availability-premium-dev-standard-standardv2-basicv2.md)]
 
 Azure Active Directory B2C is a cloud identity management solution for consumer-facing web and mobile applications. You can use it to manage access to your API Management developer portal. 
 

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

@@ -13,6 +13,9 @@ ms.custom: engagement-fy23, devx-track-azurecli
 
 # Authorize developer accounts by using Microsoft Entra ID in Azure API Management
 
+[!INCLUDE [premium-dev-standard-standardv2-basicv2.md](../../includes/api-management-availability-premium-dev-standard-standardv2-basicv2.md)]
+
+
 In this article, you'll learn how to:
 > [!div class="checklist"]
 > * Enable access to the developer portal for users from Microsoft Entra ID.
@@ -33,8 +36,6 @@ For an overview of options to secure the developer portal, see [Secure access to
 
 [!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
 
-[!INCLUDE [premium-dev-standard.md](../../includes/api-management-availability-premium-dev-standard.md)]
-
 [!INCLUDE [api-management-navigate-to-instance.md](../../includes/api-management-navigate-to-instance.md)]
 
 

articles/azure-arc/resource-bridge/network-requirements.md

@@ -19,16 +19,7 @@ Arc resource bridge communicates outbound securely to Azure Arc over TCP port 44
 
 > [!NOTE]
 > The URLs listed here are required for Arc resource bridge only. Other Arc products (such as Arc-enabled VMware vSphere) may have additional required URLs. For details, see [Azure Arc network requirements](../network-requirements-consolidated.md#azure-arc-enabled-vmware-vsphere).
-
-## Designated IPs used by Arc resource bridge
-
-When Arc resource bridge is deployed, there are designated IPs used exclusively by the appliance VM for the Kubernetes pods and services. These IPs can only be used for Arc resource bridge and can’t be used by any other service. If another service already uses an IP address within these ranges, please submit a support ticket.
-
-
-| Service|Designated Arc resource bridge IPs|
-| -------- | -------- |
-|Arc resource bridge Kubernetes pods   |10.244.0.0/16 |
-| Arc resource bridge Kubernetes services| 10.96.0.0/12  |
+> 
 
 ## SSL proxy configuration
 

articles/azure-monitor/agents/data-collection-log-text.md

@@ -132,35 +132,35 @@ Use the following ARM template to create or modify a DCR for collecting text log
             "type": "string",
             "metadata": {
               "description": "Unique name for the DCR. "
-            },
+            }
         },
         "location": {
             "type": "string",
             "metadata": {
               "description": "Region for the DCR. Must be the same location as the Log Analytics workspace. "
-            },
+            }
         },
         "filePatterns": {
             "type": "string",
             "metadata": {
               "description": "Path on the local disk for the log file to collect. May include wildcards.Enter multiple file patterns separated by commas (AMA version 1.26 or higher required for multiple file patterns on Linux)."
-            },
+            }
         },
         "tableName": {
             "type": "string",
             "metadata": {
               "description": "Name of destination table in your Log Analytics workspace. "
-            },
+            }
         },
         "workspaceResourceId": {
             "type": "string",
             "metadata": {
               "description": "Resource ID of the Log Analytics workspace with the target table."
-            },
+            }
         }
     },
     "variables": {
-      "tableOutputStream": "['Custom-',concat(parameters('tableName'))]"
+      "tableOutputStream": "[concat('Custom-', parameters('tableName'))]"
     },
     "resources": [
         {

articles/batch/quick-create-portal.md

@@ -1,7 +1,8 @@
 ---
 title: 'Quickstart: Use the Azure portal to create a Batch account and run a job'
 description: Follow this quickstart to use the Azure portal to create a Batch account, a pool of compute nodes, and a job that runs basic tasks on the pool.
-ms.date: 06/13/2024
+ms.date: 07/30/2024
+ms.service: azure-batch
 ms.topic: quickstart
 ms.custom: mvc, mode-ui
 ---

articles/cdn/migrate-tier.md

@@ -1,5 +1,5 @@
 ---
-title: Migrate Azure CDN from Microsoft (classic) to Azure Front Door Standard or Premium tier (preview)
+title: Migrate Azure CDN from Microsoft (classic) to Azure Front Door Standard or Premium tier
 description: This article provides step-by-step instructions on how to migrate from an Azure CDN from Microsoft (classic) profile to an Azure Front Door Standard or Premium tier profile.
 services: cdn
 author: duongau
@@ -9,11 +9,7 @@ ms.date: 06/25/2024
 ms.author: duau
 ---
 
-# Migrate Azure CDN from Microsoft (classic) to Standard/Premium tier (preview)
-
-> [!IMPORTANT]
-> Azure CDN from Microsoft to Azure Front Door migration is currently in PREVIEW.
-> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
+# Migrate Azure CDN from Microsoft (classic) to Standard/Premium tier
 
 Azure Front Door Standard and Premium tier bring the latest cloud delivery network features to Azure. With enhanced security features and an all-in-one service, your application content is secured and closer to your end users using the Microsoft global network. This article guides you through the migration process to move your Azure CDN from Microsoft (classic) profile to either a Standard or Premium tier profile.