Merge remote-tracking branch 'upstream/main' into ci-monitor

Author: bwren

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/ai-studio/how-to/commitment-tier.md",
+      "redirect_url": "/azure/ai-services/commitment-tier.md",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/files/files-samples-dotnet-v11.md",
       "redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",

CODEOWNERS

@@ -16,6 +16,6 @@
 /articles/mysql @tynevi @thomps23
 /articles/managed-instance-apache-cassandra @tynevi @thomps23
 /articles/virtual-machines @jasonwhowell @thomps23
-/articles/virtual-machines-scale-set @jasonwhowell @thomps23
+/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23
 /articles/service-fabric @jasonwhowell @thomps23

articles/ai-services/language-service/personally-identifiable-information/concepts/conversations-entity-categories.md

@@ -16,8 +16,6 @@ ms.custom: language-service-pii, build-2024
 
 Use this article to find the entity categories that can be returned by the [conversational PII detection feature](../how-to-call-for-conversations.md). This feature runs a predictive model to identify, categorize, and redact sensitive information from an input conversation.
 
-The PII preview feature includes the ability to detect personal (`PII`) information from conversations.
-
 ## Entity categories
 
 The following entity categories are returned when you're sending API requests PII feature.

articles/ai-services/language-service/personally-identifiable-information/how-to-call-for-conversations.md

@@ -26,11 +26,11 @@ By default, this feature will use the latest available AI model on your input. Y
 
 ### Language support
 
-Currently the conversational PII preview API only supports English language.
+See the [PII Language Support page](language-support.md) for more details. Currently the conversational PII GA model only supports the English language. The preview model and API support the [same list languages](../concepts/language-support.md) as the other Language services.
 
 ### Region support
 
-Currently the conversational PII preview API supports all Azure regions supported by the Language service.
+The conversational PII API supports all Azure regions supported by the Language service.
 
 ## Submitting data
 
@@ -82,7 +82,7 @@ When you get results from PII detection, you can stream the results to an applic
 Use the following example if you have conversations transcribed using the Speech service's [speech to text](../../Speech-Service/speech-to-text.md) feature:
 
 ```bash
-curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
+curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
 -H "Content-Type: application/json" \
 -H "Ocp-Apim-Subscription-Key: your-key-here" \
 -d \
@@ -195,7 +195,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
             "taskName": "analyze 1",
             "kind": "ConversationalPIITask",
             "parameters": {
-                "modelVersion": "2022-05-15-preview",
+                "modelVersion": "2023-04-15-preview",
                 "redactionSource": "text",
                 "includeAudioRedaction": true,
                 "piiCategories": [
@@ -213,7 +213,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
 Use the following example if you have conversations that originated in text. For example, conversations through a text-based chat client.
 
 ```bash
-curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
+curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
 -H "Content-Type: application/json" \
 -H "Ocp-Apim-Subscription-Key: your-key-here" \
 -d \
@@ -251,7 +251,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
             "taskName": "analyze 1",
             "kind": "ConversationalPIITask",
             "parameters": {
-                "modelVersion": "2022-05-15-preview"
+                "modelVersion": "2023-04-15-preview"
             }
         }
     ]

articles/ai-services/language-service/personally-identifiable-information/language-support.md

@@ -102,7 +102,7 @@ Use this article to learn which natural languages are supported by the PII and c
 |Chinese-Simplified   |`zh-hans`    |`zh` also accepted|
 |Chinese-Traditional  |`zh-hant`    |                  |
 
-# [PII for conversations (preview)](#tab/conversations)
+# [PII for conversations](#tab/conversations)
 
 ## PII language support
 

articles/ai-studio/concepts/architecture.md

@@ -21,7 +21,7 @@ The top level AI Studio resources (hub and project) are based on Azure Machine L
 
 - **AI Studio hub**: The hub is the top-level resource in AI Studio. The Azure resource provider for a hub is `Microsoft.MachineLearningServices/workspaces`, and the kind of resource is `Hub`. It provides the following features:
     - Security configuration including a managed network that spans projects and model endpoints.
-    - Compute resources for interactive development, finetuning, open source, and serverless model deployments.
+    - Compute resources for interactive development, fine-tuning, open source, and serverless model deployments.
     - Connections to other Azure services such as Azure OpenAI, Azure AI services, and Azure AI Search. Hub-scoped connections are shared with projects created from the hub.
     - Project management. A hub can have multiple child projects.
     - An associated Azure storage account for data upload and artifact storage.
@@ -148,7 +148,6 @@ Azure monitor and Azure Log Analytics provide monitoring and logging for the und
 For more information on price and quota, use the following articles:
 
 - [Plan and manage costs](../how-to/costs-plan-manage.md)
-- [Commitment tier pricing](../how-to/commitment-tier.md)
 - [Quota management](../how-to/quota.md)
 
 ## Next steps

articles/ai-studio/how-to/commitment-tier.md

@@ -295,8 +295,6 @@ items:
       href: how-to/quota.md
     - name: Increase rate limit
       href: how-to/autoscale.md
-    - name: Use commitment tier pricing
-      href: how-to/commitment-tier.md
   - name: Infrastructure & security
     items:
     - name: Identity & access management

articles/ai-studio/toc.yml

@@ -219,6 +219,8 @@
       href: grpc-api.md
     - name: Azure OpenAI and LLM APIs
       items:
+      - name: GenAI gateway capabilities in API Management
+        href: genai-gateway-capabilities.md
       - name: Import Azure OpenAI API
         href: azure-openai-api-from-specification.md
       - name: Authenticate and authorize to Azure OpenAI