Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI194292-servers-deploy

Author: ElazarK

articles/active-directory-b2c/media/partner-bindid/partner-TransmitSecurity-architecture-diagram.png renamed to articles/active-directory-b2c/media/partner-bindid/partner-transmit-security-architecture-diagram.png

@@ -23,7 +23,7 @@ In this tutorial, learn to integrate Azure Active Directory B2C (Azure AD B2C) a
 
 The following architecture diagram illustrates the implementation:
 
-![Diagram of the Transmit and Azure AD B2C architecture.](media/partner-bindid/partner-TransmitSecurity-architecture-diagram.png) 
+![Diagram of the Transmit and Azure AD B2C architecture.](media/partner-bindid/partner-transmit-security-architecture-diagram.png) 
 
 1. User opens the Azure AD B2C sign-in page, and signs in or signs up.
 2. Azure AD B2C redirects the user to Transmit Security using an OpenID Connect (OIDC) request.

articles/active-directory-b2c/partner-bindid.md

@@ -118,7 +118,7 @@ Create two sets of variables: the first set you change, the second set leave as
 
 ## Authenticate the client
 
-Create an [CognitiveServicesCredentials](/python/api/msrest/msrest.authentication.cognitiveservicescredentials) object with your key, and use it with your endpoint to create an [LUISAuthoringClient](/python/api/azure-cognitiveservices-language-luis/azure.cognitiveservices.language.luis.authoring.luisauthoringclient) object.
+Create an CognitiveServicesCredentials object with your key, and use it with your endpoint to create an [LUISAuthoringClient](/python/api/azure-cognitiveservices-language-luis/azure.cognitiveservices.language.luis.authoring.luisauthoringclient) object.
 
 [!code-python[Authenticate the client](~/cognitive-services-quickstart-code/python/LUIS/sdk-3x/authoring_and_predict.py?name=AuthoringCreateClient)]
 

articles/ai-services/LUIS/includes/sdk-python.md

@@ -86,7 +86,7 @@ These code snippets show you how to do the following tasks with the Content Mode
 
 ## Authenticate the client
 
-Instantiate a client with your endpoint and key. Create a [CognitiveServicesCredentials](/python/api/msrest/msrest.authentication.cognitiveservicescredentials) object with your key, and use it with your endpoint to create an [ContentModeratorClient](/python/api/azure-cognitiveservices-vision-contentmoderator/azure.cognitiveservices.vision.contentmoderator.content_moderator_client.contentmoderatorclient) object.
+Instantiate a client with your endpoint and key. Create a CognitiveServicesCredentials](/python/api/msrest/msrest.authentication.cognitiveservicescredentials object with your key, and use it with your endpoint to create an [ContentModeratorClient](/python/api/azure-cognitiveservices-vision-contentmoderator/azure.cognitiveservices.vision.contentmoderator.content_moderator_client.contentmoderatorclient) object.
 
 [!code-python[](~/cognitive-services-quickstart-code/python/ContentModerator/ContentModeratorQuickstart.py?name=snippet_client)]
 

articles/ai-services/content-moderator/includes/quickstarts/python-sdk.md

@@ -342,7 +342,7 @@ class PictureLaunchViewController: UIViewController, UINavigationControllerDeleg
                         self.cameraButton.isEnabled = true
 
                     }, onFailure: { error in
-                        print("An error occured launching the Immersive Reader: \(error)")
+                        print("An error occurred launching the Immersive Reader: \(error)")
                         self.spinner.stopAnimating()
                         self.activityIndicatorBackground.alpha = 0
                         self.photoButton.isEnabled = true
@@ -357,7 +357,7 @@ class PictureLaunchViewController: UIViewController, UINavigationControllerDeleg
                     self.cameraButton.isEnabled = true
 
                 }
-                print("An error occured retrieving the token: \(error)")
+                print("An error occurred retrieving the token: \(error)")
             })
 
         }, onFailure: { error in
@@ -375,7 +375,7 @@ class PictureLaunchViewController: UIViewController, UINavigationControllerDeleg
     ///     -onSuccess: A closure that gets called when the token is successfully recieved using Azure Active Directory authentication.
     ///     -theToken: The token for the Immersive Reader recieved using Azure Active Directory authentication.
     ///     -onFailure: A closure that gets called when the token fails to be obtained from the Azure Active Directory Authentication.
-    ///     -theError: The error that occured when the token fails to be obtained from the Azure Active Directory Authentication.
+    ///     -theError: The error that occurred when the token fails to be obtained from the Azure Active Directory Authentication.
     func getToken(onSuccess: @escaping (_ theToken: String) -> Void, onFailure: @escaping ( _ theError: String) -> Void) {
 
         let tokenForm = "grant_type=client_credentials&resource=https://cognitiveservices.azure.com/&client_id=" + Constants.clientId + "&client_secret=" + Constants.clientSecret

articles/ai-services/immersive-reader/tutorial-ios-picture-immersive-reader.md

@@ -22,7 +22,7 @@ The PII preview feature includes the ability to detect personal (`PII`) informat
 
 The following entity categories are returned when you're sending API requests PII feature.
 
-## Category: Name
+## Category: Person
 
 This category contains the following entity:
 
@@ -38,7 +38,9 @@ This category contains the following entity:
 
         All first, middle, last or full name is considered PII regardless of whether it is the speaker’s name, the agent’s name, someone else’s name or a different version of the speaker’s full name (Chris vs. Christopher). 
 
-        To get this entity category, add `Name` to the `pii-categories` parameter. `Name` will be returned in the API response if detected.
+        To get this entity category, add `Person` to the `pii-categories` parameter. `Person` will be returned in the API response if detected. 
+        > [!NOTE]
+        > As of the 2023-04-15-preview API onwards, this category is 'Person' instead of 'Name'.
       
     :::column-end:::
 

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

@@ -84,7 +84,7 @@ GPT-4 version 0314 is the first version of the model released.  Version 0613 is
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-4 deployments.
 
 > [!NOTE]
-> Version `0314` of `gpt-4` and `gpt-4-32k` will be retired no earlier than July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
+> Version `0613` of `gpt-4` and `gpt-4-32k` will be retired on June 13, 2024.  Version `0314` of `gpt-4` and `gpt-4-32k` will be retired on July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
 
 |  Model ID  | Max Request (tokens) | Training Data (up to)  |
 |  --- |  :--- | :---: |
@@ -121,7 +121,7 @@ GPT-3.5 Turbo version 0301 is the first version of the model released.  Version
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-3.5 Turbo deployments.
 
 > [!NOTE]
-> Version `0301` of `gpt-35-turbo` will be retired no earlier than July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
+> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired on June 13, 2024. Version `0301` of `gpt-35-turbo` will be retired on July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
 
 ### GPT-3.5-Turbo model availability
 

articles/ai-services/openai/concepts/models.md

@@ -311,7 +311,7 @@ Follow these steps to set up a video retrieval system and integrate it with your
         {
             "type": "AzureComputerVisionVideoIndex",
             "parameters": {
-                "computerVisionBaseUrl": "<your_computer_vision_endpoint>",
+                "endpoint": "<your_computer_vision_endpoint>",
                 "computerVisionApiKey": "<your_computer_vision_key>",
                 "indexName": "<name_of_your_index>",
                 "videoUrls": ["<your_video_SAS_URL>"]
@@ -328,12 +328,7 @@ Follow these steps to set up a video retrieval system and integrate it with your
                         {
                             "type": "text",
                             "text": "Describe this video:"
-                        }
-                    ]
-            },
-            {
-                "role": "user",
-                "content": [
+                        },
                         {
                             "type": "acv_document_id",
                             "acv_document_id": "<your_video_ID>"

articles/ai-services/openai/how-to/gpt-with-vision.md

@@ -77,7 +77,7 @@ POST https://{your-resource-name}.openai.azure.com/openai/deployments/{deploymen
 | ```logprobs``` | integer | Optional | null | Include the log probabilities on the logprobs most likely tokens, as well the chosen tokens. For example, if logprobs is 10, the API will return a list of the 10 most likely tokens. the API will always return the logprob of the sampled token, so there might be up to logprobs+1 elements in the response. This parameter cannot be used with `gpt-35-turbo`. |
 | ```suffix```| string | Optional | null | The suffix that comes after a completion of inserted text. |
 | ```echo``` | boolean | Optional | False | Echo back the prompt in addition to the completion. This parameter cannot be used with `gpt-35-turbo`. |
-| ```stop``` | string or array | Optional | null | Up to four sequences where the API will stop generating further tokens. The returned text won't contain the stop sequence. |
+| ```stop``` | string or array | Optional | null | Up to four sequences where the API will stop generating further tokens. The returned text won't contain the stop sequence. For GPT-4 Turbo with Vision, up to two sequences are supported. |
 | ```presence_penalty``` | number | Optional | 0 | Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics. |
 | ```frequency_penalty``` | number | Optional | 0 | Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim. |
 | ```best_of``` | integer | Optional | 1 | Generates best_of completions server-side and returns the "best" (the one with the lowest log probability per token). Results can't be streamed. When used with n, best_of controls the number of candidate completions and n specifies how many to return – best_of must be greater than n. Note: Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for max_tokens and stop. This parameter cannot be used with `gpt-35-turbo`. |

articles/ai-services/openai/reference.md

@@ -94,7 +94,7 @@ By adding up reward scores, your final reward may be outside the expected score
 
 ## Reward wait time
 
-Personalizer will correlate the information of a Rank call with the rewards sent in Reward calls to train the model, which may come at different times. Personalizer waits for the reward score for a defined limited time, starting when the corresponding Rank call occured. This is done even if the Rank call was made using deferred activation](concept-active-inactive-events.md).
+Personalizer will correlate the information of a Rank call with the rewards sent in Reward calls to train the model, which may come at different times. Personalizer waits for the reward score for a defined limited time, starting when the corresponding Rank call occurred. This is done even if the Rank call was made using deferred activation](concept-active-inactive-events.md).
 
 If the **Reward Wait Time** expires and there has been no reward information, a default reward is applied to that event for training. You can select a reward wait time of 10 minutes, 4 hours, 12 hours, or 24 hours. If your scenario requires longer reward wait times (e.g., for marketing email campaigns) we are offering a private preview of longer wait times. Open a support ticket in the Azure portal to get in contact with team and see if you qualify and it can be offered to you.