links, corrections, v2 feature adds

dlepow · dlepow · commit c71acd57c8cd · 2024-03-29T13:13:55.000-07:00
diff --git a/articles/api-management/api-management-features.md b/articles/api-management/api-management-features.md
@@ -14,7 +14,7 @@ ms.author: danlep
 
 [!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
-Each API Management [pricing tier](https://aka.ms/apimpricing) offers a distinct set of features and per unit [capacity](api-management-capacity.md). The following table summarizes the key features available in each of the tiers. Some features might work differently or have different capabilities depending on the tier. In such cases the differences are called out in the documentation articles describing these individual features.
+Each API Management [pricing tier](api-management-key-concepts.md#api-management-tiers) offers a distinct set of features and per unit [capacity](api-management-capacity.md). The following table summarizes the key features available in each of the tiers. Some features might work differently or have different capabilities depending on the tier. In such cases the differences are called out in the documentation articles describing these individual features.
 
 > [!IMPORTANT]
 > * The Developer tier is for non-production use cases and evaluations. It doesn't offer SLA.
@@ -53,4 +53,4 @@ Each API Management [pricing tier](https://aka.ms/apimpricing) offers a distinct
 <sup>1</sup> Enables the use of Microsoft Entra ID (and Azure AD B2C) as an identity provider for user sign in on the developer portal.<br/>
 <sup>2</sup> Including related functionality such as users, groups, issues, applications, and email templates and notifications.<br/>
 <sup>3</sup> See [Gateway overview](api-management-gateways-overview.md#feature-comparison-managed-versus-self-hosted-gateways) for a feature comparison of managed versus self-hosted gateways. In the Developer tier self-hosted gateways are limited to a single gateway node. <br/>
-<sup>4</sup> See [Gateway overview](api-management-gateways-overview.md#policies) for differences in policy support in the dedicated, consumption, and self-hosted gateways. <br/>
+<sup>4</sup> See [Gateway overview](api-management-gateways-overview.md#policies) for differences in policy support in the classic, v2, consumption, and self-hosted gateways. <br/>
diff --git a/articles/api-management/api-management-gateways-overview.md b/articles/api-management/api-management-gateways-overview.md
@@ -20,7 +20,9 @@ Related information:
 
 * For an overview of API Management scenarios, components, and concepts, see [What is Azure API Management?](api-management-key-concepts.md)
 
-* For more information about the API Management service tiers and features, see [Feature-based comparison of the Azure API Management tiers](api-management-features.md).
+* For more information about the API Management service tiers and features, see:
+    * [API Management tiers](api-management-key-concepts.md#api-management-tiers)
+    * [Feature-based comparison of the Azure API Management tiers](api-management-features.md).
 
 ## Role of the gateway
 
diff --git a/articles/api-management/compute-infrastructure.md b/articles/api-management/compute-infrastructure.md
@@ -1,6 +1,6 @@
 ---
 title: Azure API Management compute platform
-description: Learn about the compute platform used to host your API Management service instance. Instances in the dedicated service tiers of API Management are hosted on the stv1 or stv2 compute platform.
+description: Learn about the compute platform used to host your API Management service instance. Instances in the classic service tiers of API Management are hosted on the stv1 or stv2 compute platform.
 author: dlepow
 ms.service: api-management
 ms.topic: conceptual
diff --git a/articles/api-management/credentials-overview.md b/articles/api-management/credentials-overview.md
@@ -139,7 +139,7 @@ All underlying connections and access policies are also deleted.
 
 ### Are the access tokens cached by API Management?
 
-In the dedicated service tiers, the access token is cached by the API Management instance until 3 minutes before the token expiration time. If the access token is less than 3 minutes away from expiration, the cached time will be until the access token expires.
+In the classic and v2 service tiers, the access token is cached by the API Management instance until 3 minutes before the token expiration time. If the access token is less than 3 minutes away from expiration, the cached time will be until the access token expires.
 
 Access tokens aren't cached in the Consumption tier.
 
diff --git a/articles/api-management/developer-portal-basic-authentication.md b/articles/api-management/developer-portal-basic-authentication.md
@@ -23,8 +23,6 @@ For an overview of options to secure the developer portal, see [Secure access to
 
 - Complete the [Create an Azure API Management instance](get-started-create-service-instance.md) quickstart.
 
-[!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)]
 
 
diff --git a/articles/api-management/developer-portal-self-host.md b/articles/api-management/developer-portal-self-host.md
@@ -4,14 +4,14 @@ titleSuffix: Azure API Management
 description: Learn how to self-host the developer portal for Azure API Management.
 author: dlepow
 ms.author: danlep
-ms.date: 06/07/2022
+ms.date: 03/29/2024
 ms.service: api-management
 ms.topic: how-to
 ---
 
 # Self-host the API Management developer portal
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
+[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
 
 This tutorial describes how to self-host the [API Management developer portal](api-management-howto-developer-portal.md). Self-hosting is one of several options to [extend the functionality](developer-portal-extend-custom-functionality.md) of the developer portal. For example, you can self-host multiple portals for your API Management instance, with different features. When you self-host a portal, you become its maintainer and you're responsible for its upgrades. 
 
@@ -26,8 +26,6 @@ This tutorial describes how to self-host the [API Management developer portal](a
 
 If you have already uploaded or modified media files in the managed portal, see [Move from managed to self-hosted](#move-from-managed-to-self-hosted-developer-portal), later in this article.
 
-[!INCLUDE [premium-dev-standard-basic.md](../../includes/api-management-availability-premium-dev-standard-basic.md)]
-
 ## Prerequisites
 
 To set up a local development environment, you need to have:
diff --git a/articles/api-management/how-to-deploy-self-hosted-gateway-azure-arc.md b/articles/api-management/how-to-deploy-self-hosted-gateway-azure-arc.md
@@ -22,8 +22,6 @@ Deploying the API Management gateway on an Azure Arc-enabled Kubernetes cluster
 > [!NOTE]
 > You can also deploy the self-hosted gateway [directly to Kubernetes](./how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md).
 
-[!INCLUDE [api-management-availability-premium-dev](../../includes/api-management-availability-premium-dev.md)]
-
 ## Prerequisites
 
 * [Connect your Kubernetes cluster](../azure-arc/kubernetes/quickstart-connect-cluster.md) within a supported Azure Arc region.
diff --git a/articles/api-management/how-to-server-sent-events.md b/articles/api-management/how-to-server-sent-events.md
@@ -26,7 +26,7 @@ This article provides guidelines for configuring an API in API Management that i
 
 Follow these guidelines when using API Management to reach a backend API that implements SSE. 
 
-* **Choose service tier for long-running HTTP connections** - SSE relies on a long-running HTTP connection. Long-running connections are supported in the dedicated API Management tiers, but not in the Consumption tier.
+* **Choose service tier for long-running HTTP connections** - SSE relies on a long-running HTTP connection that is supported in certain API Management [service tiers](api-management-key-concepts.md#api-management-tiers). Long-running connections are supported in the Classic and V2 API Management tiers, but not in the Consumption tier.
 
 * **Keep idle connections alive** - If a connection between client and backend could be idle for 4 minutes or longer, implement a mechanism to keep the connection alive. For example, enable a TCP keepalive signal at the backend of the connection, or send traffic from the client side at least once per 4 minutes. 
 
diff --git a/articles/api-management/howto-protect-backend-frontend-azure-ad-b2c.md b/articles/api-management/howto-protect-backend-frontend-azure-ad-b2c.md
@@ -199,7 +199,7 @@ Open the Azure AD B2C blade in the portal and do the following steps.
    >
    > We still have no IP security applied, if you have a valid key and OAuth2 token, anyone can call this from anywhere - ideally we want to force all requests to come via API Management.
    >
-   > If you're using the API Management Consumption, Basic v2, and Standard v2 tiers then [there isn't a dedicated Azure API Management Virtual IP](./api-management-howto-ip-addresses.md#ip-addresses-of-consumption-basic-v2-and-standard-v2-tier-api-management-service) to allow-list with the functions access-restrictions. In the Azure API Management dedicated tiers [the VIP is single tenant and for the lifetime of the resource](./api-management-howto-ip-addresses.md#changes-to-the-ip-addresses). For the tiers that run on shared infrastructure, you can lock down your API calls via the shared secret function key in the portion of the URI you copied above. Also, for these tiers - steps 12-17 below do not apply.
+   > If you're using the API Management Consumption, Basic v2, and Standard v2 tiers then [there isn't a dedicated Azure API Management Virtual IP](./api-management-howto-ip-addresses.md#ip-addresses-of-consumption-basic-v2-and-standard-v2-tier-api-management-service) to allow-list with the functions access-restrictions. In the Azure API Management classic (dedicated) tiers [the VIP is single tenant and for the lifetime of the resource](./api-management-howto-ip-addresses.md#changes-to-the-ip-addresses). For the tiers that run on shared infrastructure, you can lock down your API calls via the shared secret function key in the portion of the URI you copied above. Also, for these tiers - steps 12-17 below do not apply.
 
 1. Close the 'Authentication' blade from the App Service / Functions portal.
 1. Open the *API Management blade of the portal*, then open *your instance*.
diff --git a/articles/api-management/plan-manage-costs.md b/articles/api-management/plan-manage-costs.md
@@ -58,8 +58,6 @@ As you use Azure resources with API Management, you incur costs, or billable met
 
 ### How you're charged for API Management
 
-[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
-
 When you create or use Azure resources with API Management, you'll get charged based on tiers you're working in. Learn more about [choosing the best tier](./api-management-features.md) for you.
 
 | Tiers | Description |
diff --git a/articles/api-management/v2-service-tiers-overview.md b/articles/api-management/v2-service-tiers-overview.md
@@ -11,11 +11,11 @@ ms.author: danlep
 ms.custom: references_regions
 ---
 
-# New Azure API Management tiers
+# Azure API Management v2 tiers
 
 [!INCLUDE [api-management-availability-basicv2-standardv2](../../includes/api-management-availability-basicv2-standardv2.md)]
 
-We're introducing a new set of pricing tiers (SKUs) for Azure API Management: the *v2 tiers*. The new tiers are built on a new, more reliable and scalable platform and are designed to make API Management accessible to a broader set of customers and offer flexible options for a wider variety of scenarios.
+We're introducing a new set of pricing tiers (SKUs) for Azure API Management: the *v2 tiers*. The new tiers are built on a new, more reliable and scalable platform and are designed to make API Management accessible to a broader set of customers and offer flexible options for a wider variety of scenarios. The v2 tiers are in addition to the existing classic tiers (Developer, Basic, Standard, and Premium) and the Consumption tier. [Learn more](api-management-key-concepts.md#api-management-tiers).
 
 The following v2 tiers are generally available:
 
@@ -44,19 +44,22 @@ The Standard v2 tier supports VNet integration to allow your API Management inst
 The v2 tiers are supported in API Management API version **2023-05-01-preview** or later.
 
 ### Supported regions
-
 The v2 tiers are available in the following regions:
-
 * South Central US
 * West US
 * France Central
+* Germany West Central
 * North Europe
 * West Europe
 * UK South
+* UK West
 * Brazil South
+* Australia Central
 * Australia East
 * Australia Southeast
 * East Asia
+* Southeast Asia
+* Korea Central
 
 ### Feature availability
 
@@ -86,6 +89,7 @@ The following API Management capabilities are currently unavailable in the v2 ti
 * Delegation of user registration and product subscription
 * Reports
 * Custom HTML code widget and custom widget
+* Self-hosted developer portal
 
 **Gateway**
 * Self-hosted gateway
@@ -140,4 +144,5 @@ A: Yes, a Premium v2 preview is planned and will be announced separately.
 ## Related content
 
 * Compare the API Management [tiers](api-management-features.md).
+* Learn more about the [API Management gateways](api-management-gateways-overview.md)
 * Learn about [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/).
diff --git a/articles/api-management/workspaces-overview.md b/articles/api-management/workspaces-overview.md
@@ -17,9 +17,6 @@ ms.custom:
 
 In API Management, *workspaces* allow decentralized API development teams to manage and productize their own APIs, while a central API platform team maintains the API Management infrastructure. Each workspace contains APIs, products, subscriptions, and related entities that are accessible only to the workspace collaborators. Access is controlled through Azure role-based access control (RBAC). 
 
-[!INCLUDE [api-management-availability-premium](../../includes/api-management-availability-premium.md)]
-
-
 > [!NOTE]
 > * Workspaces are a preview feature of API Management and subject to certain [limitations](#preview-limitations).
 > * Workspaces are supported in API Management REST API version 2022-09-01-preview or later.

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ Open the Azure AD B2C blade in the portal and do the following steps.`
`199`	`199`	`>`
`200`	`200`	`> We still have no IP security applied, if you have a valid key and OAuth2 token, anyone can call this from anywhere - ideally we want to force all requests to come via API Management.`
`201`	`201`	`>`
`202`		- > If you're using the API Management Consumption, Basic v2, and Standard v2 tiers then [there isn't a dedicated Azure API Management Virtual IP](./api-management-howto-ip-addresses.md#ip-addresses-of-consumption-basic-v2-and-standard-v2-tier-api-management-service) to allow-list with the functions access-restrictions. In the Azure API Management dedicated tiers [the VIP is single tenant and for the lifetime of the resource](./api-management-howto-ip-addresses.md#changes-to-the-ip-addresses). For the tiers that run on shared infrastructure, you can lock down your API calls via the shared secret function key in the portion of the URI you copied above. Also, for these tiers - steps 12-17 below do not apply.
	`202`	+ > If you're using the API Management Consumption, Basic v2, and Standard v2 tiers then [there isn't a dedicated Azure API Management Virtual IP](./api-management-howto-ip-addresses.md#ip-addresses-of-consumption-basic-v2-and-standard-v2-tier-api-management-service) to allow-list with the functions access-restrictions. In the Azure API Management classic (dedicated) tiers [the VIP is single tenant and for the lifetime of the resource](./api-management-howto-ip-addresses.md#changes-to-the-ip-addresses). For the tiers that run on shared infrastructure, you can lock down your API calls via the shared secret function key in the portion of the URI you copied above. Also, for these tiers - steps 12-17 below do not apply.
`203`	`203`
`204`	`204`	`1. Close the 'Authentication' blade from the App Service / Functions portal.`
`205`	`205`	`1. Open the API Management blade of the portal, then open your instance.`