Merge pull request #271080 from MicrosoftDocs/main

4/3/2024 PM Publish

Author: Taojunshen

articles/ai-services/content-safety/concepts/groundedness.md

@@ -57,7 +57,7 @@ The maximum character limit for the grounding sources is 55,000 characters per A
 
 To use this API, you must create your Azure AI Content Safety resource in the supported regions. Currently, it's available in the following Azure regions:
 - East US 2
-- East US (only for non-reasoning)
+- East US 
 - West US
 - Sweden Central
 
@@ -75,4 +75,4 @@ If you need a higher rate, [contact us](mailto:[email protected]
 Follow the quickstart to get started using Azure AI Content Safety to detect groundedness.
 
 > [!div class="nextstepaction"]
-> [Groundedness detection quickstart](../quickstart-groundedness.md)
+> [Groundedness detection quickstart](../quickstart-groundedness.md)

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/rest-api.md

@@ -15,7 +15,7 @@ ms.author: lajanuar
 >
 > This project uses cURL command-line tool to execute REST API calls.
 
-[Document Intelligence REST API](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP) | [Azure client libraries](https://azure.github.io/azure-sdk/releases/latest/index.html) | [Supported client libraries](../../../sdk-overview-v3-1.md)
+| [Document Intelligence REST API](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2024-02-29-preview&preserve-view=true&tabs=HTTP) | [Supported Azure SDKS](../../../sdk-overview-v4-0.md)
 
 ## Prerequisites
 
@@ -62,26 +62,26 @@ Use the following table as a reference. Replace *\<modelId>* and *\<document-url
 Open a console window and run the following cURL command. The commands include the endpoint and key environment variables previously created in the set environment variables section. Replace those variables if your variable names differ. Remember to replace the *\<modelId>* and *\<document-url>* parameters.
 
 ```console
-curl -i -X POST "%FR_ENDPOINT%formrecognizer/documentModels/<modelId>:analyze?api-version=2023-07-31" -H "Content-Type: application/json" -H "Ocp-Apim-Subscription-Key: %FR_KEY%" --data-ascii "{'urlSource': '<document-url>'}"
+curl -i -X POST "%DI_ENDPOINT%/documentintelligence/documentModels/{modelId}:analyze?api-version=2024-02-29-preview" -H "Content-Type: application/json" -H "Ocp-Apim-Subscription-Key: %DI_KEY%" --data-ascii "{'urlSource': '<document-url>'}"
 ```
 
-To enable add-on capabilities, use the `features` query parameter in the POST request. There are four add-on capabilities available with the `2023-07-31` (GA) release: *ocr.highResolution*, *ocr.formula*, *ocr.font*, and *queryFields.premium*. To learn more about each of the capabilities, see [Custom models](../../../concept-accuracy-confidence.md).
+To enable add-on capabilities, use the `features` query parameter in the POST request. There are four add-on capabilities available with the `2023-07-31` (GA) and later releases: *ocr.highResolution*, *ocr.formula*, *ocr.font*, and *queryFields.premium*. To learn more about each of the capabilities, see [Custom models](../../../concept-accuracy-confidence.md).
 
 You can only call the *highResolution*, *formula*, and *font* capabilities for the Read and Layout model, and the *queryFields* capability for the General Documents model. The following example shows how to call the *highResolution*, *formula*, and *font* capabilities for the Layout model.
 
 ```bash
-curl -i -X POST "%FR_ENDPOINT%formrecognizer/documentModels/prebuilt-layout:analyze?features=ocr.highResolution,ocr.formula,ocr.font?api-version=2023-07-31" -H "Content-Type: application/json" -H "Ocp-Apim-Subscription-Key: %FR_KEY%" --data-ascii "{'urlSource': '<document-url>'}"
+curl -i -X POST "%DI_ENDPOINT%documentintelligence/documentModels/prebuilt-layout:analyze?features=ocr.highResolution,ocr.formula,ocr.font?api-version=2024-02-29-preview" -H "Content-Type: application/json" -H "Ocp-Apim-Subscription-Key: %DI_KEY%" --data-ascii "{'urlSource': '<document-url>'}"
 ```
 
 ### POST response
 
 You receive a `202 (Success)` response that includes an `Operation-location` header. Use the value of this header to retrieve the response results.
 
-:::image type="content" source="../../../media/how-to/rest-get-response.png" alt-text="Screenshot shows a POST response with the operation location highlighted.":::
+:::image type="content" source="../../../media/quickstarts/operation-location-result-id.png" alt-text="Screenshot shows a POST response with the operation location highlighted.":::
 
 ### Get analyze result (GET Request)
 
-After you call the [`Analyze document`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP) API, call the [`Get analyze` result}(/rest/api/aiservices/document-models/get-analyze-result?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP) API to get the status of the operation and the extracted data.
+After you call the [`Analyze document`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2024-02-29-preview&preserve-view=true&tabs=HTTP) API, call the [`Get analyze` result}(/rest/api/aiservices/document-models/get-analyze-result?view=rest-aiservices-2024-02-29-preview&preserve-view=true&tabs=HTTP) API to get the status of the operation and the extracted data.
 
 <!-- markdownlint-disable MD024 -->
 
@@ -100,7 +100,7 @@ Use the NodeJS *json tool* as a JSON formatter for cURL. If you don't have [Node
 1. Pretty print the JSON output by including the pipe character `| json` with your GET requests.
 
    ```console
-   curl -i -X GET "<endpoint>formrecognizer/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2023-07-31"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json
+   curl -i -X GET "<endpoint>documentintelligence/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2024-02-29-preview"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json
    ```
 
 #### [macOS](#tab/macOS)
@@ -110,7 +110,7 @@ The *json_pp* command tool ships with macOS and can be used as a JSON formatter
 - Pretty print the JSON output by including `| json_pp` with your GET requests.
 
   ```console
-  curl -i -X GET "{endpoint}formrecognizer/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2023-07-31"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json_pp
+  curl -i -X GET "{endpoint}documentintelligence/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2024-02-29-preview"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json_pp
   ```
 
 #### [Linux](#tab/linux)
@@ -120,7 +120,7 @@ The *json_pp* command line tool is preinstalled in most Linux distributions. If
 - Pretty print the JSON output by including `| json_pp` with your `GET` requests.
 
   ```console
-  curl -i -X GET "<endpoint>formrecognizer/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2023-07-31"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json_pp
+  curl -i -X GET "<endpoint>documentintelligence/documentModels/prebuilt-read/analyzeResults/0e49604a-2d8e-4b15-b6b8-bb456e5d3e0a?api-version=2024-02-29-preview"-H "Ocp-Apim-Subscription-Key: <subscription key>" | json_pp
   ```
 
 ---
@@ -130,11 +130,11 @@ The *json_pp* command line tool is preinstalled in most Linux distributions. If
 Before you run the following command, make these changes:
 
 - Replace *\<POST response>* with the `Operation-location` header from the [POST response](#post-response).
-- Replace *\<FR_KEY* with the variable for your environment variable if it differs from the name in the code.
+- Replace *\<DI_KEY* with the variable for your environment variable if it differs from the name in the code.
 - Replace *\<json-tool> with your JSON formatting tool.
 
 ```console
-curl -i -X GET "<POST response>" -H "Ocp-Apim-Subscription-Key: %FR_KEY%" | `<json-tool>`
+curl -i -X GET "<POST response>" -H "Ocp-Apim-Subscription-Key: %DI_KEY%" | `<json-tool>`
 ```
 
 ### Examine the response

articles/ai-services/document-intelligence/media/quickstarts/operation-location-result-id.png

@@ -1,17 +1,21 @@
 ---
-title: "Quickstart: Document Intelligence (formerly Form Recognizer) REST API v3.0 | v3.0"
+title: "Quickstart: Document Intelligence (formerly Form Recognizer) REST API"
 titleSuffix: Azure AI services
 description: Form and document processing, data extraction, and analysis using Document Intelligence REST API v3.0
 author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 03/28/2024
+ms.date: 04/02/2024
 ms.author: lajanuar
 ---
 
 <!-- markdownlint-disable MD036 -->
 
+:::moniker range="doc-intel-4.0.0"
+| [Document Intelligence REST API](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2024-02-29-preview&preserve-view=true&tabs=HTTP) | [Supported Azure SDKS](../../sdk-overview-v4-0.md)
+:::moniker-end
+
 :::moniker range="doc-intel-3.1.0"
 | [Document Intelligence REST API](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP) | [Supported Azure SDKS](../../sdk-overview-v3-1.md) |
 :::moniker-end
@@ -195,8 +199,8 @@ You receive a `200 (Success)` response with JSON output. The first field, `"stat
 ```json
 {
     "status": "succeeded",
-    "createdDateTime": "2023-11-25T19:31:37Z",
-    "lastUpdatedDateTime": "2023-11-25T19:31:43Z",
+    "createdDateTime": "2024-03-25T19:31:37Z",
+    "lastUpdatedDateTime": "2024-03-25T19:31:43Z",
     "analyzeResult": {
         "apiVersion": "2024-02-29-preview",
         "modelId": "prebuilt-invoice",

articles/ai-services/document-intelligence/quickstarts/includes/rest-api.md

@@ -10,7 +10,7 @@ ms.topic: include
 ms.date: 03/05/2024
 ---
 
-[Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/)
+[Reference documentation](/dotnet/api/overview/azure/ai.openai.assistants-readme?context=/azure/ai-services/openai/context/context) |  [Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/)
 
 ## Prerequisites
 

articles/ai-services/openai/includes/assistants-csharp.md

@@ -10,7 +10,7 @@ ms.topic: include
 ms.date: 02/01/2024
 ---
 
-<a href="https://github.com/openai/openai-python" target="_blank">Library source code</a> | <a href="https://pypi.org/project/openai/" target="_blank">Package (PyPi)</a> |
+[Reference documentation](/java/api/overview/azure/ai-openai-assistants-readme?context=/azure/ai-services/openai/context/context) | <a href="https://github.com/openai/openai-python" target="_blank">Library source code</a> | <a href="https://pypi.org/project/openai/" target="_blank">Package (PyPi)</a> |
 
 ## Prerequisites
 

articles/ai-services/openai/includes/assistants-python.md

@@ -59,21 +59,19 @@ The following steps guide you to create a Liberty runtime on AKS. After completi
    1. Create a new resource group. Because resource groups must be unique within a subscription, pick a unique name. An easy way to have unique names is to use a combination of your initials, today's date, and some identifier. For example, `ejb0913-java-liberty-project-rg`.
    1. Select *East US* as **Region**.
 
-    Create environment variables in your shell for the resource group name for the cluster.
- 
-    ### [Bash](#tab/in-bash)
- 
-    ```bash
-    export RESOURCE_GROUP_NAME=<your-resource-group-name>
-    ```
- 
-    ### [PowerShell](#tab/in-powershell)
- 
-    ```powershell
-    $Env:RESOURCE_GROUP_NAME="<your-resource-group-name>"
-    ```
- 
-    ---
+   1. Create environment variables in your shell for the resource group name for the cluster.
+
+      ### [Bash](#tab/in-bash)
+
+      ```bash
+      export RESOURCE_GROUP_NAME=<your-resource-group-name>
+      ```
+
+      ### [PowerShell](#tab/in-powershell)
+
+      ```powershell
+      $Env:RESOURCE_GROUP_NAME="<your-resource-group-name>"
+      ```
 
 1. Select **Next**, enter the **AKS** pane. This pane allows you to select an existing AKS cluster and Azure Container Registry (ACR), instead of causing the deployment to create a new one, if desired. This capability enables you to use the sidecar pattern, as shown in the [Azure architecture center](/azure/architecture/patterns/sidecar). You can also adjust the settings for the size and number of the virtual machines in the AKS node pool. For our purposes, just keep all the defaults on this pane.
 
@@ -118,12 +116,12 @@ If you navigated away from the **Deployment is in progress** page, the following
 
     ---
 
-These values are used later in this article. Note that several other useful commands are listed in the outputs.
+   These values are used later in this article. Note that several other useful commands are listed in the outputs.
 
-> [!NOTE]
-> You may notice a similar output named **appDeploymentYaml**. The difference between output *appDeploymentTemplateYaml* and *appDeploymentYaml* is:
-> * *appDeploymentTemplateYaml* is populated if and only if the deployment **does not include** an application.
-> * *appDeploymentYaml* is populated if and only if the deployment **does include** an application.
+   > [!NOTE]
+   > You may notice a similar output named **appDeploymentYaml**. The difference between output *appDeploymentTemplateYaml* and *appDeploymentYaml* is:
+   > * *appDeploymentTemplateYaml* is populated if and only if the deployment **does not include** an application.
+   > * *appDeploymentYaml* is populated if and only if the deployment **does include** an application.
 
 ## Create an Azure SQL Database
 
@@ -213,7 +211,6 @@ Now that you gathered the necessary properties, you can build the application. T
 
 #### [Bash](#tab/in-bash)
 
-
 ```bash
 cd $BASE_DIR/java-app
 # The following variables are used for deployment file generation into target.

articles/aks/howto-deploy-java-liberty-app.md

@@ -12,6 +12,8 @@
       href: api-management-key-concepts.md
     - name: API Management features availability
       href: api-management-features.md
+    - name: API Management gateways
+      href: api-management-gateways-overview.md  
     - name: v2 service tiers
       href: v2-service-tiers-overview.md
     - name: Terminology
@@ -106,6 +108,8 @@
     items:
     - name: Networking options
       href: virtual-network-concepts.md
+    - name: VNet injection - network requirements
+      href: virtual-network-injection-resources.md
     - name: Deploy to a VNet - external
       href: api-management-using-with-vnet.md
     - name: Deploy to a VNet - internal
@@ -279,8 +283,6 @@
     href: configure-graphql-resolver.md
 - name: Manage APIs on-premises and in other clouds
   items:
-  - name: API Management gateway overview
-    href: api-management-gateways-overview.md
   - name: Self-hosted gateway overview
     href: self-hosted-gateway-overview.md
   - name: Deploy the gateway

articles/api-management/TOC.yml

@@ -14,6 +14,8 @@ ms.custom: fasttrack-edit, devdivchpfy22
 
 # Add an API manually
 
+[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
+
 This article shows steps to add an API manually to the API Management instance. When you want to mock the API, you can create a blank API or define it manually. For details about mocking an API, see [Mock API responses](mock-api-responses.md).
 
 If you want to import an existing API, see [related topics](#related-topics) section.

articles/api-management/add-api-manually.md

@@ -13,6 +13,8 @@ ms.author: danlep
 
 # API import restrictions and known issues
 
+[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
+
 When importing an API, you might encounter some restrictions or need to identify and rectify issues before you can successfully import. In this article, you'll learn:
 
 * API Management's behavior during OpenAPI import.