resolve conflict

Author: b-ahibbard

.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/index.yml

@@ -13,7 +13,7 @@ metadata:
   ms.author: eur
   manager: nitinme
   ms.custom: ignite-2023
-  ms.date: 3/19/2024
+  ms.date: 8/20/2024
 highlightedContent:
 # itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
   items:
@@ -23,9 +23,9 @@ highlightedContent:
     - title: What is Azure AI Studio?
       itemType: overview
       url: ../ai-studio/what-is-ai-studio.md
-    - title: Azure AI Studio copilot tutorial
+    - title: Build your own copilot with Azure AI SDKs
       itemType: tutorial
-      url: ../ai-studio/tutorials/deploy-copilot-ai-studio.md
+      url: ../ai-studio/tutorials/copilot-sdk-build-rag.md
     - title: Responsible use of AI
       itemType: concept
       url: responsible-use-of-ai-overview.md

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-services/language-service/summarization/region-support.md

@@ -26,6 +26,10 @@ Some summarization features are only available in limited regions. More regions
 |East US           |✅                           |✅                                        |✅             |
 |East US 2         |✅                           |✅                                        |❌            |
 |West US           |✅                           |✅                                        |❌            |
+|USNat West        |✅                           |✅                                        |❌            |
+|USNat East        |✅                           |✅                                        |❌            |
+|USSec West        |✅                           |✅                                        |❌            |
+|USSec East        |✅                           |✅                                        |❌            |
 |South UK          |✅                           |✅                                        |❌            |
 |Southeast Asia    |✅                           |✅                                        |❌            |
 |Australia East    |✅                           |✅                                        |❌            |

articles/ai-services/language-support.md

@@ -2,12 +2,11 @@
 title: Language support
 titleSuffix: Azure AI services
 description: Azure AI services enable you to build applications that see, hear, speak with, and understand your users.
-#services: cognitive-services
 author: laujan
 manager: nitinme
 ms.service: azure-ai-services
 ms.topic: conceptual
-ms.date: 07/08/2024
+ms.date: 8/20/2024
 ms.author: lajanuar
 ---
 

articles/ai-services/multi-service-resource.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: azure-ai-services
 ms.custom: devx-track-azurecli, devx-track-azurepowershell, build-2024
 ms.topic: quickstart
-ms.date: 8/1/2024
+ms.date: 8/20/2024
 ms.author: eur
 zone_pivot_groups: programming-languages-portal-cli-ps
 ---
@@ -17,7 +17,7 @@ zone_pivot_groups: programming-languages-portal-cli-ps
 
 Learn how to create and manage an Azure AI services resource. An Azure AI services resource allows you to access multiple Azure AI services with a single set of credentials. 
 
-You can access Azure AI services through two different resources: 
+You can access Azure AI services through two different resource kinds: 
 
 * Azure AI services multi-service resource:
     * Access multiple Azure AI services with a single set of credentials.

articles/ai-services/personalizer/index.yml

@@ -91,9 +91,9 @@ landingContent:
         - text: Code Samples
           url: https://github.com/Azure-Samples/cognitive-services-personalizer-samples
         - text: REST API (1.0)
-          url: https://westus2.dev.cognitive.microsoft.com/docs/services/personalizer-api/operations/Rank
+          url: https://personalizer-api-docs.developer.azure-api.net/api-details#api=personalizer-client-v1-0&operation=Rank
         - text: REST APIs (v1.1 Preview)
-          url: https://westus2.dev.cognitive.microsoft.com/docs/services/personalizer-api-v1-1-preview-3/operations/Rank
+          url: https://personalizer-api-docs.developer.azure-api.net/api-details#api=personalizer-client-v1-1-preview-3&operation=Rank
   - title: About Reinforcement learning
     linkLists:
       - linkListType: overview