Merge remote-tracking branch 'upstream/main' into ADO-10115726-migrate-virtual-desktop

Author: garycentric

.openpublishing.redirection.json

@@ -7228,6 +7228,11 @@
        "source_path": "articles/private-5g-core/disconnected-mode.md",
        "redirect_url": "/azure/private-5g-core/azure-stack-edge-disconnects",
        "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/signups/startup-programs.md",
+      "redirect_url": "/azure/signups/overview",
+      "redirect_document_id": false
     }
   ]
 }

articles/api-management/TOC.yml

@@ -246,14 +246,14 @@
       href: openai-compatible-llm-api.md
     - name: Import Google Gemini API
       href: openai-compatible-google-gemini-api.md
+    - name: Import Amazon Bedrock API
+      href: amazon-bedrock-passthrough-llm-api.md
   - name: Expose REST API as MCP server
     href: export-rest-mcp-server.md
   - name: Semantic caching for Azure OpenAI API requests
     href: azure-openai-enable-semantic-caching.md
   - name: Authenticate and authorize to Azure OpenAI
     href: api-management-authenticate-authorize-azure-openai.md
-  - name: Protect Azure OpenAI keys
-    href: /semantic-kernel/deploy/use-ai-apis-with-api-management?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
 - name: Manage APIs with policies
   items:
   - name: API Management policies overview

articles/api-management/amazon-bedrock-passthrough-llm-api.md

@@ -165,4 +165,3 @@ Following are high level steps to restrict API access to users or apps that are
 
 * Learn more about [Microsoft Entra ID and OAuth2.0](../active-directory/develop/authentication-vs-authorization.md).  
 * [Authenticate requests to Azure AI services](/azure/ai-services/authentication)
-* [Protect Azure OpenAI keys with API Management](/semantic-kernel/deploy/use-ai-apis-with-api-management?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

articles/api-management/api-management-authenticate-authorize-azure-openai.md

@@ -29,7 +29,7 @@ API Management supports two types of language model APIs for this scenario. Choo
 
     For an OpenAI-compatible LLM, API Management configures a chat completions endpoint. 
 
-* **Passthrough** - Other language model endpoints that aren't compatible with OpenAI's API. Examples include models deployed in [Amazon Bedrock](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html) or other providers.
+* **Passthrough** - Other language model endpoints that aren't compatible with OpenAI's API. Examples include models deployed in [Amazon Bedrock](amazon-bedrock-passthrough-llm-api.md) or other providers.
 
     API Management configures wildcard operations for common HTTP verbs. Clients can append paths to the wildcard operations, and API Management passes requests to the backend.  
 

articles/api-management/media/amazon-bedrock-passthrough-llm-api/configure-api.png

@@ -23,7 +23,7 @@ Each App Service plan defines:
 - Region (West US, East US, and so on)
 - Number of virtual machine (VM) instances
 - Size of VM instances (small, medium, large)
-- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, PremiumV3, IsolatedV2)
+- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 IsolatedV2)
 
 ## Pricing tiers
 
@@ -32,7 +32,7 @@ The pricing tier of an App Service plan determines what App Service features you
 | Category | Tiers | Description |
 |:-|:-|:-|
 | Shared compute | Free, Shared | Free and Shared, the two base tiers, run an app on the same Azure VM as other App Service apps, including apps of other customers. These tiers allocate CPU quotas to each app that runs on the shared resources. The resources can't scale out. These tiers are intended for only development and testing purposes. |
-| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3 | The Basic, Standard, Premium, PremiumV2, and PremiumV3 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
+| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
 | Isolated | IsolatedV2 | The IsolatedV2 tier runs dedicated Azure VMs on dedicated Azure virtual networks. This tier provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities. |
 
 Each tier also provides a specific subset of App Service features. These features include custom domains and TLS/SSL certificates, autoscaling, deployment slots, backups, Azure Traffic Manager integration, and more. The higher the tier, the more features that are available. To find out which features are supported in each pricing tier, see the [App Service plan details](https://azure.microsoft.com/pricing/details/app-service/windows/#pricing).
@@ -41,29 +41,7 @@ You can find more comparisons of plans in [App Service limits](../azure-resource
 
 <a name="new-pricing-tier-premiumv3"></a>
 
-### PremiumV3 pricing tier
-
-The PremiumV3 pricing tier provides machines with faster processors (minimum 195 [Azure Compute Units](/azure/virtual-machines/acu) per virtual CPU), SSD storage, memory-optimized options, and quadruple memory-to-core ratio compared to the Standard tier.
-
-PremiumV3 also supports higher scale by using increased instance count, while it still provides the advanced capabilities in the Standard tier. PremiumV3 includes all features available in the PremiumV2 tier.
-
-Multiple VM sizes are available for this tier, including 4-to-1 and 8-to-1 memory-to-core ratios:
-
-| App Service plan | Cores (vCPU) | Memory (GiB) |
-|:-|:-|:-|
-| P0v3 | 1 | 4 |
-| P1v3 | 2 | 8 |
-| P1mv3 | 2 | 16 |
-| P2v3 | 4 | 16 |
-| P2mv3 | 4 | 32 |
-| P3v3 | 8 | 32 |
-| P3mv3 | 8 | 64 |
-| P4mv3 | 16 | 128 |
-| P5mv3 | 32 | 256 |
-
-For PremiumV3 pricing information, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
-
-To get started with the PremiumV3 pricing tier, see [Configure PremiumV3 tier for Azure App Service](app-service-configure-premium-tier.md).
+For pricing information, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
 
 ## Considerations for running and scaling an app
 
@@ -88,7 +66,7 @@ This section describes how App Service apps are billed. For detailed, region-spe
 Except for the Free tier, an App Service plan carries a charge on the compute resources that it uses:
 
 - **Shared tier**: Each app receives a quota of CPU minutes, so *each app* is charged for the CPU quota.
-- **Dedicated compute tiers (Basic, Standard, Premium, PremiumV2, PremiumV3)**: The App Service plan defines the number of VM instances that the apps are scaled to, so *each VM instance* in the App Service plan is charged. These VM instances are charged the same, regardless of how many apps are running on them. To avoid unexpected charges, see [Delete an App Service plan](app-service-plan-manage.md#delete-an-app-service-plan).
+- **Dedicated compute tiers (Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4)**: The App Service plan defines the number of VM instances that the apps are scaled to, so *each VM instance* in the App Service plan is charged. These VM instances are charged the same, regardless of how many apps are running on them. To avoid unexpected charges, see [Delete an App Service plan](app-service-plan-manage.md#delete-an-app-service-plan).
 - **IsolatedV2 tier**: The App Service Environment defines the number of isolated workers that run your apps, and *each worker* is charged.
 
 You aren't charged for using the App Service features that are available to you. These features include configuring custom domains, TLS/SSL certificates, deployment slots, and backups. The exceptions are:
@@ -129,12 +107,12 @@ Isolate your app in a new App Service plan when:
   | B1, S1, P1v2, I1v1 | 8 |
   | B2, S2, P2v2, I2v1 | 16 |
   | B3, S3, P3v2, I3v1 | 32 |
-  | P0v3 | 8 |
-  | P1v3, I1v2 | 16 |
-  | P2v3, I2v2, P1mv3 | 32 |
-  | P3v3, I3v2, P2mv3 | 64 |
+  | P0v3, P0v4 | 8 |
+  | P1v3, P1v4, I1v2 | 16 |
+  | P2v3, P2v4, I2v2, P1mv3, P1mv4 | 32 |
+  | P3v3, P3v4, I3v2, P2mv3 | 64 |
   | I4v2, I5v2, I6v2 | Maximum density bound by vCPU usage |
-  | P3mv3, P4mv3, P5mv3 | Maximum density bound by vCPU usage |
+  | P3mv3, P3mv4, P4mv3, P4mv4, P5mv3, P5mv4 | Maximum density bound by vCPU usage |
 - You want to scale the app independently from the other apps in the existing plan.
 - The app needs resources in a different geographical region. This way, you can allocate a new set of resources for your app and gain greater control of your apps.