Merge branch 'main' into Release_Archive_main_2025-01-24-20-56-56

Author: halkazwini

.openpublishing.redirection.json

@@ -8,6 +8,13 @@
     {
       "source_path": "articles/network-watcher/network-watcher-packet-capture-manage-powershell-vmss.md",
       "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-packet-capture-manage-powershell-vmss",
+      "source_path": "articles/network-watcher/network-watcher-nsg-auditing-powershell.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-nsg-auditing-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/view-relative-latencies.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/view-relative-latencies",
       "redirect_document_id": false
     },
     {
@@ -2000,6 +2007,11 @@
       "redirect_url": "/azure/cdn/monitoring-and-access-log",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/cdn/cdn-features.md",
+      "redirect_url": "/azure/frontdoor/front-door-cdn-comparison",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/chef/chef-automation.md",
       "redirect_url": "/azure/developer/chef/windows-vm-configure",

articles/api-management/api-management-howto-add-products.md

@@ -53,7 +53,7 @@ In this tutorial, you learn how to:
     | State                    | Select **Published** if you want to publish the product to the developer portal. Before the APIs in a product can be discovered by developers, the product must be published. By default, new products are unpublished.                                                                                      |
     | Requires subscription    | Select if a user is required to subscribe to use the product (the product is *protected*) and a subscription key must be used to access the product's APIs. If a subscription isn't required (the product is *open*), a subscription key isn't required to access the product's APIs. See [Access to product APIs](#access-to-product-apis) later in this article.                                                                                                                                                                                                   |
     | Requires approval        | Select if you want an administrator to review and accept or reject subscription attempts to this product. If not selected, subscription attempts are auto-approved.                                                                                                                         |
-    | Subscription count limit | Optionally limit the count of multiple simultaneous subscriptions.                                                                                                                                                                                                                                |
+    | Subscription count limit | Optionally limit the count of multiple simultaneous subscriptions. Minimum value: 1                                                                                                                                                                                                                                |
     | Legal terms              | You can include the terms of use for the product which subscribers must accept in order to use the product.                                                                                                                                                                                                             |
     | APIs                     | Select one or more APIs. You can also add APIs after creating the product. For more information, see [Add APIs to a product](#add-apis-to-a-product) later in this article. <br/><br/>If the product is open (doesn't require a subscription), you can only add an API that isn't associated with another open product.                |
 

articles/api-management/automate-portal-deployments.md

@@ -11,7 +11,7 @@ ms.topic: how-to
 
 # Automate developer portal deployments
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2.md)]
+[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
 
 The API Management developer portal supports programmatic access to content. It allows you to import data to or export from an API Management service through the [content management REST API](/rest/api/apimanagement/). The REST API access works for both managed and self-hosted portals.
 
@@ -22,6 +22,9 @@ You can use the API to automate migration of content between two API Management
 > [!WARNING]
 > The script removes contents of the developer portal in your destination API Management service. If you're concerned about it, make sure you perform a backup.
 
+> [!NOTE]
+> Using the script to migrate developer portal content between an API Management instance in a classic tier (for example, Standard) and an instance in a v2 tier (for example, Standard v2) isn't currently supported. Migration of portal content between instances in the v2 tiers is also not supported.
+
 > [!NOTE]
 > If you're using a self-hosted portal with an explicitly defined custom storage account to host media files (i.e., you define the `blobStorageUrl` setting in the `config.design.json` configuration file), you need to use the original `scripts/migrate.js` [script](https://github.com/Azure/api-management-developer-portal/blob/master/scripts.v2/migrate.js). The original script doesn't work for managed or self-hosted portals with the media storage account managed by API Management. In that case, use the script from the `/scripts.v3` folder instead.
 
@@ -42,4 +45,4 @@ After the script is successfully executed, the target API Management service sho
 Learn more about the developer portal:
 
 - [Azure API Management developer portal overview](api-management-howto-developer-portal.md)
-- [Self-host the developer portal](developer-portal-self-host.md)
+- [Self-host the developer portal](developer-portal-self-host.md)

articles/api-management/inject-vnet-v2.md

@@ -43,9 +43,9 @@ If you want to enable *public* inbound access to an API Management instance in t
 
 * The virtual network must be in the same region and Azure subscription as the API Management instance.
 
-### Subnet requirements
+### Dedicated subnet
 
-* The subnet for the API Management instance can't be shared with another Azure resource.
+* The subnet used for virtual network injection can only be used by a single API Management instance. It can't be shared with another Azure resource.
 
 ### Subnet size 
 

articles/api-management/integrate-vnet-outbound.md

@@ -37,9 +37,9 @@ If you want to inject a Premium v2 API Management instance into a virtual networ
 
 * The virtual network must be in the same region and Azure subscription as the API Management instance.
 
-### Subnet requirements
+### Dedicated subnet
 
-* The subnet can't be shared with another Azure resource.
+* The subnet used for virtual network integration can only be used by a single API Management instance. It can't be shared with another Azure resource.
 
 ### Subnet size 
 

articles/api-management/private-endpoint.md

@@ -256,6 +256,8 @@ To optionally limit incoming traffic to the API Management instance only to priv
 > [!NOTE] 
 > Public network access can only be disabled in API Management instances configured with a private endpoint, not with other networking configurations.
 
+#### [Classic](#tab/classic)
+
 To disable the public network access property using the Azure CLI, run the following [az apim update](/cli/azure/apim#az-apim-update) command, substituting the names of your API Management instance and resource group:
 
 ```azurecli
@@ -264,6 +266,22 @@ az apim update --name my-apim-service --resource-group my-resource-group --publi
 
 You can also use the [API Management Service - Update](/rest/api/apimanagement/api-management-service/update) REST API to disable public network access, by setting the `publicNetworkAccess` property to `Disabled`.
 
+#### [Standard v2](#tab/v2)
+
+To disable the public network access property in a Standard v2 instance using the Azure CLI, run the following [az rest](/cli/azure/reference-index#az-rest) command.
+
+
+```azurecli
+SUBSCRIPTION_ID=<your-subscription-id>
+RESOURCE_GROUP=<your-resource-group>
+SERVICE_NAME=<your-api-management-service-name>
+
+az rest --method patch \
+    --uri "https://management.azure.com/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.ApiManagement/service/$SERVICE_NAME?api-version=2024-05-01" \
+    --body "{ \"properties\": { \"publicNetworkAccess\": \"Disabled\" } }"
+```
+---
+
 ## Validate private endpoint connection
 
 After the private endpoint is created, confirm its DNS settings in the portal:

articles/api-management/virtual-network-workspaces-resources.md

@@ -27,9 +27,9 @@ For information about networking options in API Management, see [Use a virtual n
 
 * The virtual network must be in the same region and Azure subscription as the API Management instance.
 
-## Subnet requirements
+### Dedicated subnet
 
-* The subnet can't be shared with another Azure resource, including another workspace gateway.
+* The subnet used for virtual network integration can only be used by a single workspace gateway. It can't be shared with another Azure resource.
 
 ## Subnet size