merge conflict

Author: dlepow

.openpublishing.redirection.container-registry.json

@@ -109,7 +109,7 @@
         },
         {
             "source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
-            "redirect_url": "/azure/container-registry/monitor-service"
+            "redirect_url": "/azure/container-registry/monitor-container-registry"
         },
         {
             "source_path_from_root": "/articles/container-registry/container-registry-managed-get-started-azure-cli.md",
@@ -155,6 +155,16 @@
             "source_path_from_root": "/articles/container-registry/github-action-scan.md",
             "redirect_url": "/azure/developer/github/",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service-reference.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry-reference",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.json

@@ -4878,6 +4878,13 @@
             "redirect_document_id": false
         },
         {
+
+            "source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-backup",
+            "redirect_document_id": false
+        },
+        {
+
            "source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
            "redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
            "redirect_document_id": false
@@ -4926,6 +4933,16 @@
             "source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
         }
 
     ]

articles/active-directory-b2c/custom-email-sendgrid.md

@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
     <!-- Claims-->
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
     <LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
     <!-- Email validation error messages-->
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>

articles/ai-services/openai/concepts/use-your-data.md

@@ -579,14 +579,18 @@ These estimates will vary based on the values set for the above parameters. For
 
 The estimates also depend on the nature of the documents and questions being asked. For example, if the questions are open-ended, the responses are likely to be longer. Similarly, a longer system message would contribute to a longer prompt that consumes more tokens, and if the conversation history is long, the prompt will be longer.
 
-| Model | Max tokens for system message | Max tokens for model response |
-|--|--|--|
-| GPT-35-0301 | 400 | 1500 |
-| GPT-35-0613-16K | 1000 | 3200 |
-| GPT-4-0613-8K | 400 | 1500 |
-| GPT-4-0613-32K | 2000 | 6400 |
-
-The table above shows the maximum number of tokens that can be used for the [system message](#system-message) and the model response. Additionally, the following also consume tokens:
+| Model | Max tokens for system message | 
+|--|--|
+| GPT-35-0301 | 400 |
+| GPT-35-0613-16K | 1000 |
+| GPT-4-0613-8K | 400 |
+| GPT-4-0613-32K | 2000 |
+| GPT-35-turbo-0125 | 2000 |
+| GPT-4-turbo-0409 | 4000 |
+| GPT-4o | 4000 |
+| GPT-4o-mini | 4000 |
+
+The table above shows the maximum number of tokens that can be used for the [system message](#system-message). To see the maximum tokens for the model response, see the [models article](./models.md#gpt-4-and-gpt-4-turbo-models). Additionally, the following also consume tokens:
 
 
 

articles/ai-services/openai/how-to/deployment-types.md

@@ -55,11 +55,9 @@ Standard deployments are optimized for low to medium volume workloads with high
 > [!IMPORTANT]
 > Data might be processed outside of the resource's Azure geography, but data storage remains in its Azure geography. [Learn more about data residency](https://azure.microsoft.com/explore/global-infrastructure/data-residency/).
 
-Global deployments are available in the same Azure OpenAI resources as non-global offers but allow you to leverage Azure's global infrastructure to dynamically route traffic to the data center with best availability for each request.  Global standard will provide the highest default quota for new models and eliminates the need to load balance across multiple resources.  
+Global deployments are available in the same Azure OpenAI resources as non-global deployment types but allow you to leverage Azure's global infrastructure to dynamically route traffic to the data center with best availability for each request.  Global standard provides the highest default quota and eliminates the need to load balance across multiple resources.  
 
-The deployment type is optimized for low to medium volume workloads with high burstiness. Customers with high consistent volume may experience greater latency variability. The threshold is set per model. See the [quotas page to learn more](./quota.md).  
-
-For customers that require the lower latency variance at large workload usage, we recommend purchasing provisioned throughput.
+Customers with high consistent volume may experience greater latency variability. The threshold is set per model. See the [quotas page to learn more](./quota.md).  For applications that require the lower latency variance at large workload usage, we recommend purchasing provisioned throughput.
 
 ### How to disable access to global deployments in your subscription
 

articles/ai-services/openai/quotas-limits.md

@@ -61,7 +61,7 @@ The following sections provide you with a quick guide to the default quotas and
 
 |Tier| Quota Limit in tokens per minute (TPM) | Requests per minute |
 |---|:---:|:---:|
-|Enterprise agreement | 30 M | 60 K |
+|Enterprise agreement | 30 M | 180 K |
 |Default | 450 K | 2.7 K |
 
 M = million | K = thousand

articles/ai-services/speech-service/text-to-speech-avatar/avatar-gestures-with-ssml.md

@@ -11,9 +11,7 @@ ms.author: eur
 author: eric-urban
 ---
 
-# Customize text to speech avatar gestures with SSML (preview)
-
-[!INCLUDE [Text to speech avatar preview](../includes/text-to-speech-avatar-preview.md)]
+# Customize text to speech avatar gestures with SSML
 
 The [Speech Synthesis Markup Language (SSML)](../speech-synthesis-markup-structure.md) with input text determines the structure, content, and other characteristics of the text to speech output. Most SSML tags can also work in text to speech avatar. Furthermore, text to speech avatar batch mode provides avatar gestures insertion ability by using the SSML bookmark element with the format `<bookmark mark='gesture.*'/>`. 
 

articles/ai-services/speech-service/text-to-speech-avatar/batch-synthesis-avatar-properties.md

@@ -11,9 +11,7 @@ ms.author: eur
 author: eric-urban
 ---
 
-# Batch synthesis properties for text to speech avatar (preview)
-
-[!INCLUDE [Text to speech avatar preview](../includes/text-to-speech-avatar-preview.md)]
+# Batch synthesis properties for text to speech avatar
 
 Batch synthesis properties can be grouped as: avatar related properties, batch job related properties, and text to speech related properties,  which are described in the following tables.
 

articles/ai-services/speech-service/text-to-speech-avatar/batch-synthesis-avatar.md

@@ -11,11 +11,9 @@ ms.author: eur
 author: eric-urban
 ---
 
-# How to use batch synthesis for text to speech avatar (preview)
+# How to use batch synthesis for text to speech avatar
 
-[!INCLUDE [Text to speech avatar preview](../includes/text-to-speech-avatar-preview.md)]
-
-The batch synthesis API for text to speech avatar (preview) allows for the asynchronous synthesis of text into a talking avatar as a video file. Publishers and video content platforms can utilize this API to create avatar video content in a batch. That approach can be suitable for various use cases such as training materials, presentations, or advertisements.
+The batch synthesis API for text to speech avatar allows for the asynchronous synthesis of text into a talking avatar as a video file. Publishers and video content platforms can utilize this API to create avatar video content in a batch. That approach can be suitable for various use cases such as training materials, presentations, or advertisements.
 
 The synthetic avatar video will be generated asynchronously after the system receives text input. The generated video output can be downloaded in batch mode synthesis. You submit text for synthesis, poll for the synthesis status, and download the video output when the status indicates success. The text input formats must be plain text or Speech Synthesis Markup Language (SSML) text. 
 
@@ -27,10 +25,10 @@ To perform batch synthesis, you can use the following REST API operations.
 
 | Operation            | Method  | REST API call                                      |
 |----------------------|---------|---------------------------------------------------|
-| [Create batch synthesis](#create-a-batch-synthesis-request) | PUT    | avatar/batchsyntheses/{SynthesisId}?api-version=2024-04-15-preview |
-| [Get batch synthesis](#get-batch-synthesis)    | GET     | avatar/batchsyntheses/{SynthesisId}?api-version=2024-04-15-preview |
-| [List batch synthesis](#list-batch-synthesis)   | GET     | avatar/batchsyntheses/?api-version=2024-04-15-preview |
-| [Delete batch synthesis](#delete-batch-synthesis) | DELETE  | avatar/batchsyntheses/{SynthesisId}?api-version=2024-04-15-preview |
+| [Create batch synthesis](#create-a-batch-synthesis-request) | PUT    | avatar/batchsyntheses/{SynthesisId}?api-version=2024-08-01 |
+| [Get batch synthesis](#get-batch-synthesis)    | GET     | avatar/batchsyntheses/{SynthesisId}?api-version=2024-08-01 |
+| [List batch synthesis](#list-batch-synthesis)   | GET     | avatar/batchsyntheses/?api-version=2024-08-01 |
+| [Delete batch synthesis](#delete-batch-synthesis) | DELETE  | avatar/batchsyntheses/{SynthesisId}?api-version=2024-08-01 |
 
 You can refer to the code samples on [GitHub](https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/samples/batch-avatar).
 
@@ -67,7 +65,7 @@ curl -v -X PUT -H "Ocp-Apim-Subscription-Key: YourSpeechKey" -H "Content-Type: a
         "talkingAvatarCharacter": "lisa",
         "talkingAvatarStyle": "graceful-sitting"
     }
-}'  "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/my-job-01?api-version=2024-04-15-preview"
+}'  "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/my-job-01?api-version=2024-08-01"
 ```
 
 You should receive a response body in the following format:
@@ -106,7 +104,7 @@ To retrieve the status of a batch synthesis job, make an HTTP GET request using
 Replace `YourSynthesisId` with your batch synthesis ID, `YourSpeechKey` with your Speech resource key, and `YourSpeechRegion` with your Speech resource region.
 
 ```azurecli-interactive
-curl -v -X GET "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/YourSynthesisId?api-version=2024-04-15-preview" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
+curl -v -X GET "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/YourSynthesisId?api-version=2024-08-01" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
 ```
 
 You should receive a response body in the following format:
@@ -157,7 +155,7 @@ To list all batch synthesis jobs for your Speech resource, make an HTTP GET requ
 Replace `YourSpeechKey` with your Speech resource key and `YourSpeechRegion` with your Speech resource region. Optionally, you can set the `skip` and `top` (page size) query parameters in the URL. The default value for `skip` is 0, and the default value for `maxpagesize` is 100.
 
 ```azurecli-interactive
-curl -v -X GET "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses?skip=0&maxpagesize=2&api-version=2024-04-15-preview" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
+curl -v -X GET "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses?skip=0&maxpagesize=2&api-version=2024-08-01" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
 ```
 
 You receive a response body in the following format:
@@ -232,7 +230,7 @@ You receive a response body in the following format:
             }
         }
     ],
-    "nextLink": "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/?api-version=2024-04-15-preview&skip=2&maxpagesize=2"
+    "nextLink": "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/?api-version=2024-08-01&skip=2&maxpagesize=2"
 }
 ```
 
@@ -283,7 +281,7 @@ After you have retrieved the audio output results and no longer need the batch s
 To delete a batch synthesis job, make an HTTP DELETE request using the following URI format. Replace `YourSynthesisId` with your batch synthesis ID, `YourSpeechKey` with your Speech resource key, and `YourSpeechRegion` with your Speech resource region.
 
 ```azurecli-interactive
-curl -v -X DELETE "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/YourSynthesisId?api-version=2024-04-15-preview" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
+curl -v -X DELETE "https://YourSpeechRegion.api.cognitive.microsoft.com/avatar/batchsyntheses/YourSynthesisId?api-version=2024-08-01" -H "Ocp-Apim-Subscription-Key: YourSpeechKey"
 ```
 
 The response headers include `HTTP/1.1 204 No Content` if the delete request was successful.

articles/ai-services/speech-service/text-to-speech-avatar/custom-avatar-create.md

@@ -11,9 +11,7 @@ ms.author: eur
 author: eric-urban
 ---
 
-# How to create a custom text to speech avatar (preview)
-
-[!INCLUDE [Text to speech avatar preview](../includes/text-to-speech-avatar-preview.md)]
+# How to create a custom text to speech avatar
 
 Getting started with a custom text to speech avatar is a straightforward process. All it takes are a few of video files. If you'd like to train a [custom neural voice](../custom-neural-voice.md) for the same actor, you can do so separately.