Merge branch 'main' into release-preview-p2s

Author: v-alje

articles/active-directory-b2c/oauth2-error-technical-profile.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 05/07/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 
@@ -73,6 +73,43 @@ The following example shows a technical profile for `ReturnOAuth2Error`:
 </ClaimsProviders> -->
 ```
 
+## Define claims transformation to generate custom values of error code and error message
+
+Use these steps to generate custom values of error code and error message:
+
+1. Locate the `ClaimsTransformations` element, then add the following code inside it
+
+    ```xml
+    <!--
+     <ClaimsTransformations> -->
+    <ClaimsTransformation Id="GenerateErrorCode" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Error_001" />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorCode" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+          <ClaimsTransformation Id="GenerateErrorMessage" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Insert error description." />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorMessage" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+    <!--
+    </ClaimsTransformations> -->
+    ```
+
+1. Add the two claims transformations in the `OutputClaimsTransformations` element of any technical profile before Oauth2 technical that you define:
+
+    ```xml
+        <OutputClaimsTransformations>
+          <OutputClaimsTransformation ReferenceId="generateErrorCode" />
+          <OutputClaimsTransformation ReferenceId="generateErrorMessage" />
+        </OutputClaimsTransformations>
+    ```
 ## Input claims
 
 The **InputClaims** element contains a list of claims required to return OAuth2 error. 
@@ -123,6 +160,20 @@ In the following example:
 </UserJourney>
 ```
 
+Optionally, you can use preconditions to manipulate the Oauth2 error technical profile. For example, if there is no email claim, you can set to call Oauth2 error technical profile:
+
+```xml
+<OrchestrationStep Order="3" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="ReturnOAuth2Error">
+      <Preconditions>
+        <Precondition Type="ClaimsExist" ExecuteActionsIf="false">
+          <Value>email</Value>
+          <Action>SkipThisOrchestrationStep</Action>
+        </Precondition>
+      </Preconditions>
+    </OrchestrationStep>
+```
+
+
 ## Next steps
 
 Learn about [UserJourneys](userjourneys.md)

articles/ai-services/openai/concepts/model-retirements.md

@@ -66,9 +66,9 @@ These models are currently available for use in Azure OpenAI Service.
 | `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0314 | No earlier than July 13, 2024 |
 | `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |
-| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later **<sup>1</sup>** |
-| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later  **<sup>1</sup>**  |
-| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on June 10, 2024, or later  **<sup>1</sup>** |
+| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later **<sup>1</sup>** |
+| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later  **<sup>1</sup>**  |
+| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later  **<sup>1</sup>** |
 | `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
 | `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
 | `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |

articles/ai-services/openai/faq.yml

@@ -265,6 +265,7 @@ sections:
         answer: |
           * Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
           * If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
+          * File search is currently not billed. 
 
           For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
       - question: |

articles/ai-services/speech-service/captioning-concepts.md

@@ -27,7 +27,7 @@ The following are aspects to consider when using captioning:
 * Let your audience know that captions are generated by an automated service.
 * Center captions horizontally on the screen, in a large and prominent font. 
 * Consider whether to use partial results, when to start displaying captions, and how many words to show at a time. 
-* Learn about captioning protocols such as [SMPTE-TT](https://ieeexplore.ieee.org/document/7291854). 
+* Learn about captioning protocols such as [SMPTE-TT](https://pub.smpte.org/doc/st2052-1/20101203-pub/st2052-1-2010.pdf). 
 * Consider output formats such as SRT (SubRip Text) and WebVTT (Web Video Text Tracks). These can be loaded onto most video players such as VLC, automatically adding the captions on to your video.
 
 > [!TIP]

articles/ai-services/speech-service/includes/speech-studio-vnet.md

@@ -26,9 +26,9 @@ This section describes working with the different kind of Speech Studio projects
 1. In the **Resource Management** group in the left pane, select **Networking** > **Firewalls and virtual networks**. 
 1. Select one option from **All networks**, **Selected Networks and Private Endpoints**, or **Disabled**. 
 
-#### Custom speech
+#### Custom speech, Custom voice and Audio Content Creation
 
-The following table describes custom speech project accessibility per Speech resource **Networking** > **Firewalls and virtual networks** security setting.
+The following table describes custom speech/custom voice/audio content creation project accessibility per Speech resource **Networking** > **Firewalls and virtual networks** security setting.
 
 > [!NOTE]
 > If you allow only private endpoints via the **Networking** > **Private endpoint connections** tab, then you can't use Speech Studio with the Speech resource. You can still use the Speech resource outside of Speech Studio.  
@@ -47,6 +47,4 @@ To use custom speech without relaxing network access restrictions on your produc
 * Create another Speech resource for development that can be used on a public network. Prepare your custom model in Speech Studio on the development resource, and then copy the model to your production resource. See the [Models_CopyTo](/rest/api/speechtotext/models/copy-to) REST request with [Speech to text REST API](../rest-speech-to-text.md).
 * You have the option to not use Speech Studio for custom speech. Use the [Speech to text REST API](../rest-speech-to-text.md) for all custom speech operations. 
 
-#### Custom voice and Audio Content Creation
-
-You can use custom voice and Audio Content Creation Speech Studio projects only when the Speech resource network security setting is **All networks**.
+To use custom voice without relaxing network access restrictions on your production Speech resource, consider Use the [Custom voice REST API](/rest/api/speechapi/operation-groups?&preserve-view=true=rest-speechapi-2023-12-01-preview) for all custom voice operations.

articles/ai-services/translator/document-translation/reference/translate-document.md

@@ -72,7 +72,7 @@ Query string parameters:
 
 |Name |Description|Content Type|Condition|
 |---|---|---|---|
-|**document**| Source document to be translated.|Any one of the [supported document formats](../../language-support.md).|***Required***|
+|**document**| Source document to be translated.|Any one of the [supported document formats](../overview.md#synchronous-supported-document-formats).|***Required***|
 |**glossary**|Document containing a list of terms with definitions to use during the translation process.|Any one of the supported [glossary formats](get-supported-glossary-formats.md).|***Optional***|
 
 ## Next steps

articles/ai-services/translator/reference/v3-0-break-sentence.md

@@ -8,7 +8,7 @@ manager: nitinme
 
 ms.service: azure-ai-translator
 ms.topic: reference
-ms.date: 07/18/2023
+ms.date: 06/06/2024
 ms.author: lajanuar
 ---
 
@@ -41,9 +41,9 @@ Request headers include:
 
 | Headers | Description |
 | ------- | ----------- |
-| Authentication header(s) <img width=200/>  | **Required request header**.<br/>See <a href="v3-0-reference.md#authentication">available options for authentication</a>. |
+| Authentication headers <img width=200/>  | **Required request header**.<br/>See <a href="v3-0-reference.md#authentication">available options for authentication</a>. |
 | Content-Type | **Required request header**.<br/>Specifies the content type of the payload. Possible values are: `application/json`. |
-| Content-Length    | **Required request header**.<br/>The length of the request body.  |
+| Content-Length    | **Optional**.<br/>The length of the request body.  |
 | X-ClientTraceId   | **Optional**.<br/>A client-generated GUID to uniquely identify the request. You can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`.  |
 
 ## Request body
@@ -99,7 +99,7 @@ An example JSON response is:
 
 |Headers|Description|
 |--- |--- |
-|X-RequestId|Value generated by the service to identify the request. It's used for troubleshooting purposes.|
+|X-RequestId|Value generated by the service to identify the request and used for troubleshooting purposes.|
 
 ## Response status codes
 
@@ -110,8 +110,8 @@ The following are the possible HTTP status codes that a request returns.
 |200|Success.|
 |400|One of the query parameters is missing or not valid. Correct request parameters before retrying.|
 |401|The request couldn't be authenticated. Check that credentials are specified and valid.|
-|403|The request isn't authorized. Check the details error message. This response code often indicates that all free translations provided with a trial subscription have been used up.|
-|429|The server rejected the request because the client has exceeded request limits.|
+|403|The request isn't authorized. Check the details error message. This response code often indicates that all free translations provided with a trial subscription are used.|
+|429|The server rejected the request because the client exceeded request limits.|
 |500|An unexpected error occurred. If the error persists, report it with: date and time of the failure, request identifier from response header `X-RequestId`, and client identifier from request header `X-ClientTraceId`.|
 |503|Server temporarily unavailable. Retry the request. If the error persists, report it with: date and time of the failure, request identifier from response header `X-RequestId`, and client identifier from request header `X-ClientTraceId`.|
 

articles/ai-services/translator/reference/v3-0-detect.md

@@ -8,7 +8,7 @@ manager: nitinme
 
 ms.service: azure-ai-translator
 ms.topic: reference
-ms.date: 09/19/2023
+ms.date: 06/06/2024
 ms.author: lajanuar
 ---
 
@@ -40,10 +40,10 @@ Request headers include:
 
 | Headers | Description |
 | --- | --- |
-| Authentication header(s) | <em>Required request header</em>.<br>See [available options for authentication](./v3-0-reference.md#authentication)</a>. |
-| Content-Type | *Required request header*.<br>Specifies the content type of the payload. Possible values are: `application/json`. |
-| Content-Length | *Required request header*.<br>The length of the request body. |
-| X-ClientTraceId | *Optional*.<br>A client-generated GUID to uniquely identify the request. You can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`. |
+| Authentication headers | <em>Required request header</em>.<br>See [available options for authentication](./v3-0-reference.md#authentication)</a>. |
+| Content-Type | _Required request header_.<br>Specifies the content type of the payload. Possible values are: `application/json`. |
+| Content-Length | _Optional_.<br>The length of the request body. |
+| X-ClientTraceId | _Optional_.<br>A client-generated GUID to uniquely identify the request. You can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`. |
 
 ## Request body
 
@@ -72,7 +72,7 @@ A successful response is a JSON array with one result for each string in the inp
 
 * `isTransliterationSupported`: A boolean value that is true if the detected language is one of the languages supported for transliteration.
 
-* `alternatives`: An array of other possible languages. Each element of the array is another object the following properties: `language`, `score`, `isTranslationSupported` and `isTransliterationSupported`.
+* `alternatives`: An array of other possible languages. Each element of the array is another object the following properties: `language`, `score`, `isTranslationSupported`, and `isTransliterationSupported`.
 
 An example JSON response is:
 
@@ -98,7 +98,7 @@ An example JSON response is:
 
 | Headers | Description |
 | --- | --- |
-| X-RequestId | Value generated by the service to identify the request. It's used for troubleshooting purposes. |
+| X-RequestId | Value generated by the service to identify the request and used for troubleshooting purposes. |
 
 ## Response status codes
 
@@ -109,8 +109,8 @@ The following are the possible HTTP status codes that a request returns.
 | 200 | Success. |
 | 400 | One of the query parameters is missing or not valid. Correct request parameters before retrying. |
 | 401 | The request couldn't be authenticated. Check that credentials are specified and valid. |
-| 403 | The request isn't authorized. Check the details error message. This code often indicates that all free translations provided with a trial subscription have been used up. |
-| 429 | The server rejected the request because the client has exceeded request limits. |
+| 403 | The request isn't authorized. Check the details error message. This code often indicates that all free translations provided with a trial subscription are used. |
+| 429 | The server rejected the request because the client exceeded request limits. |
 | 500 | An unexpected error occurred. If the error persists, report it with: date and time of the failure, request identifier from response header `X-RequestId`, and client identifier from request header `X-ClientTraceId`. |
 | 503 | Server temporarily unavailable. Retry the request. If the error persists, report it with: date and time of the failure, request identifier from response header `X-RequestId`, and client identifier from request header `X-ClientTraceId`. |
 

articles/ai-services/translator/reference/v3-0-dictionary-examples.md

@@ -8,7 +8,7 @@ manager: nitinme
 
 ms.service: azure-ai-translator
 ms.topic: reference
-ms.date: 09/19/2023
+ms.date: 06/06/2024
 ms.author: lajanuar
 ---
 <!-- markdownlint-disable MD033 -->
@@ -41,9 +41,9 @@ Request headers include:
 
 | Headers  | Description |
 | ------ | ----------- |
-| Authentication header(s) <img width=200/>  | **Required request header**.<br>See [Authentication](v3-0-reference.md#authentication)>available options for authentication</a>. |
+| Authentication headers <img width=200/>  | **Required request header**.<br>See [Authentication](v3-0-reference.md#authentication)>available options for authentication</a>. |
 | Content-Type | **Required request header**.<br>Specifies the content type of the payload. Possible values are: `application/json`. |
-| Content-Length   | **Required request header**.<br>The length of the request body. |
+| Content-Length   | **Optional**.<br>The length of the request body. |
 | X-ClientTraceId   | **Optional**.<br>A client-generated GUID to uniquely identify the request. You can omit this header if you include the trace ID in the query string using a query parameter named `ClientTraceId`. |
 
 ## Request body
@@ -77,11 +77,11 @@ A successful response is a JSON array with one result for each string in the inp
 
 * `examples`: A list of examples for the (source term, target term) pair. Each element of the list is an object with the following properties:
 
-* `sourcePrefix`: The string to concatenate _before_ the value of `sourceTerm` to form a complete example. Don't add a space character, since it's already there when it should be. This value may be an empty string.
+* `sourcePrefix`: The string to concatenate _before_ the value of `sourceTerm` to form a complete example. Don't add a space character, since it's already there when it should be. This value can be an empty string.
 
 * `sourceTerm`: A string equal to the actual term looked up. The string is added with `sourcePrefix` and `sourceSuffix` to form the complete example. Its value is separated so it can be marked in a user interface, for example, by bolding it.
 
-  * `sourceSuffix`: The string to concatenate _after_ the value of `sourceTerm` to form a complete example. Don't add a space character, since it's already there when it should be. This value may be an empty string.
+  * `sourceSuffix`: The string to concatenate _after_ the value of `sourceTerm` to form a complete example. Don't add a space character, since it's already there when it should be. This value can be an empty string.
 
   * `targetPrefix`: A string similar to `sourcePrefix` but for the target.