Merge pull request #261171 from MicrosoftDocs/main

12/13/2023 PM Publish

Author: Taojunshen

.openpublishing.redirection.defender-for-cloud.json

@@ -890,6 +890,16 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/agentless-container-registry-vulnerability-assessment.md",
+            "redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-azure",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerabilities-for-images-running-on-aks.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerabilities-for-images",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/attack-path-reference.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-manage-attack-path",

.openpublishing.redirection.json

@@ -4773,6 +4773,11 @@
             "redirect_url": "/azure/application-gateway/quick-create-cli",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/nodejs-use-node-modules-azure-apps.md",
+            "redirect_url": "/training/modules/create-nodejs-project-dependencies/",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/application-gateway/application-gateway-create-gateway-cli-nodejs.md",
             "redirect_url": "/azure/application-gateway/quick-create-cli",

articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-rest.md

@@ -25,7 +25,7 @@ To authenticate against the Image Analysis service, you need a Computer Vision k
 The SDK example assumes that you defined the environment variables `VISION_KEY` and `VISION_ENDPOINT` with your key and endpoint.
 
 
-Authentication is done by adding the HTTP request header **Ocp-Apim-Subscription-Key** and setting it to your vision key. The call is made to the URL `https://<endpoint>/computervision/imageanalysis:analyze&api-version=2023-10-01`, where `<endpoint>` is your unique computer vision endpoint URL. You add query strings based on your analysis options.
+Authentication is done by adding the HTTP request header **Ocp-Apim-Subscription-Key** and setting it to your vision key. The call is made to the URL `https://<endpoint>/computervision/imageanalysis:analyze?api-version=2023-10-01`, where `<endpoint>` is your unique computer vision endpoint URL. You add query strings based on your analysis options.
 
 
 ## Select the image to analyze

articles/ai-services/computer-vision/reference-video-search.md

@@ -334,6 +334,7 @@ Represents the create ingestion request model for the JSON document.
 | moderation | boolean | Gets or sets the moderation flag, indicating if the content should be moderated. | No |
 | generateInsightIntervals | boolean | Gets or sets the interval generation flag, indicating if insight intervals should be generated. | No |
 | filterDefectedFrames | boolean | Frame filter flag indicating frames will be evaluated and all defected (e.g. blurry, lowlight, overexposure) frames will be filtered out. | No |
+| includeSpeechTranscript | boolean | Gets or sets the transcript generation flag, indicating if transcript should be generated. | No |
 
 ### DatetimeFilterModel
 

articles/ai-services/document-intelligence/choose-model-feature.md

@@ -54,6 +54,7 @@ The following decision charts highlight the features of each **Document Intellig
 |**US Tax 1098 form**|You want to extract mortgage interest details such as principal, points, and tax.|[**US tax 1098 model**](concept-tax-document.md)|
 |**US Tax 1098-E form**|You want to extract student loan interest details such as lender and interest amount.|[**US tax 1098-E model**](concept-tax-document.md)|
 |**US Tax 1098T form**|You want to extract qualified tuition details such as scholarship adjustments, student status, and lender information.|[**US tax 1098-T model**](concept-tax-document.md)|
+|**US Tax 1099(Variations) form**|You want to extract information from 1099 forms and its variations (A, B, C, CAP, DIV, G, H, INT, K, LS, LTC, MISC, NEC, OID, PATR, Q, QA, R, S, SA, SB).|[**US tax 1099 model**](concept-tax-document.md)|
 |**Contract** (legal agreement between parties).|You want to extract contract agreement details such as parties, dates, and intervals.|[**Contract model**](concept-contract.md)|
 |**Health insurance card** or health insurance ID.| You want to extract key information such as insurer, member ID, prescription coverage, and group number.|[**Health insurance card model**](./concept-health-insurance-card.md)|
 |**Invoice** or billing statement.|You want to extract key information such as customer name, billing address, and amount due.|[**Invoice model**](concept-invoice.md)

articles/ai-services/document-intelligence/containers/configuration.md

@@ -8,14 +8,28 @@ ms.service: azure-ai-document-intelligence
 ms.custom:
   - ignite-2023
 ms.topic: how-to
-ms.date: 07/18/2023
+ms.date: 12/13/2023
 ms.author: lajanuar
-monikerRange: '<=doc-intel-3.0.0'
 ---
 
+
+
 # Configure Document Intelligence containers
 
-[!INCLUDE [applies to v3.0 and v2.1](../includes/applies-to-v30-v21.md)]
+:::moniker range="doc-intel-2.1.0 || doc-intel-3.1.0||doc-intel-4.0.0"
+
+Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` only:
+
+* [REST API `2022-08-31 (GA)`](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2022-08-31/operations/AnalyzeDocument)
+* [SDKs targeting `REST API 2022-08-31 (GA)`](../sdk-overview-v3-0.md)
+
+See [**Configure Document Intelligence v3.0 containers**](?view=doc-intel-3.0.0&preserve-view=true) for supported container documentation.
+
+:::moniker-end
+
+:::moniker range="doc-intel-3.0.0"
+
+**This content applies to:** ![checkmark](../media/yes-icon.png) **v3.0 (GA)**
 
 With Document Intelligence containers, you can build an application architecture optimized to take advantage of both robust cloud capabilities and edge locality. Containers provide a minimalist, isolated environment that can be easily deployed on-premises and in the cloud. In this article, we show you how to configure the Document Intelligence container run-time environment by using the `docker compose` command arguments. Document Intelligence features are supported by six Document Intelligence feature containers—**Layout**, **Business Card**,**ID Document**,  **Receipt**, **Invoice**, **Custom**. These containers have both required and optional settings. For a few examples, see the [Example docker-compose.yml file](#example-docker-composeyml-file) section.
 
@@ -150,3 +164,5 @@ networks:
 > [Learn more about running multiple containers and the docker compose command](install-run.md)
 
 * [Azure container instance recipe](../../../ai-services/containers/azure-container-instance-recipe.md)
+
+:::moniker-end

articles/ai-services/document-intelligence/containers/disconnected.md

@@ -8,28 +8,27 @@ ms.custom:
 author: laujan
 manager: nitinme
 ms.topic: reference
-ms.date: 11/15/2023
+ms.date: 12/13/2023
 ms.author: lajanuar
 ---
 
 
-# Containers in disconnected environments
+# Containers in disconnected (offline) environments
 
-::: moniker range="doc-intel-4.0.0"
-[!INCLUDE [applies to v4.0](../includes/applies-to-v40.md)]
-::: moniker-end
+:::moniker range="doc-intel-2.1.0 || doc-intel-3.1.0||doc-intel-4.0.0"
 
-::: moniker range="doc-intel-3.1.0"
-[!INCLUDE [applies to v3.1](../includes/applies-to-v31.md)]
-::: moniker-end
+Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)`:
 
-::: moniker range="doc-intel-3.0.0"
-[!INCLUDE [applies to v3.0](../includes/applies-to-v30.md)]
-::: moniker-end
+* [REST API `2022-08-31 (GA)`](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2022-08-31/operations/AnalyzeDocument)
+* [SDKs targeting `REST API 2022-08-31 (GA)`](../sdk-overview-v3-0.md)
 
-::: moniker range="doc-intel-2.1.0"
-[!INCLUDE [applies to v2.1](../includes/applies-to-v21.md)]
-::: moniker-end
+See [**Document Intelligence v3.0 containers in disconnected environments**](?view=doc-intel-3.0.0&preserve-view=true) for supported container documentation.
+
+:::moniker-end
+
+:::moniker range="doc-intel-3.0.0"
+
+**This content applies to:** ![checkmark](../media/yes-icon.png) **v3.0 (GA)**
 
 ## What are disconnected containers?
 
@@ -89,24 +88,10 @@ Both the endpoint URL and API key are needed when you first run the container to
 
 Download the Docker container that is approved to run in a disconnected environment. For example:
 
-::: moniker range=">=doc-intel-3.0.0"
-
 |Docker pull command | Value |Format|
 |----------|-------|------|
 |&#9679; **`docker pull [image]`**</br></br> &#9679; **`docker pull [image]latest`**|The latest container image.|&#9679; `mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0:latest`</br>  </br>&#9679; `mcr.microsoft.com/azure-cognitive-services/form-recognizer/invoice-3.0:latest` |
 
-::: moniker-end
-
-::: moniker range="doc-intel-2.1.0"
-
-|Docker pull command | Value |Format|
-|----------|-------|------|
-|&bullet; **`docker pull [image]`**</br>&bullet; **`docker pull [image]:latest`**|The latest container image.|&bullet; mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout</br>  </br>&bullet; `mcr.microsoft.com/azure-cognitive-services/form-recognizer/invoice:latest` |
-|||
-|&bullet; **`docker pull [image]:[version]`** | A specific container image |dockers pull mcr.microsoft.com/azure-cognitive-services/form-recognizer/receipt:2.1-preview |
-
-::: moniker-end
-
 **Example Docker pull command**
 
 ```docker
@@ -199,8 +184,6 @@ Mounts:License={CONTAINER_LICENSE_DIRECTORY}
 Mounts:Output={CONTAINER_OUTPUT_DIRECTORY}
 ```
 
-::: moniker range=">=doc-intel-3.0.0"
-
 Starting a disconnected container is similar to [starting a connected container](install-run.md). Disconnected containers require an added license parameter. Here's a sample docker-compose.yml file for starting a custom container in disconnected mode. Add the CUSTOM_LICENSE_MOUNT_PATH environment variable with a value set to the folder containing the downloaded license file, and the `OUTPUT_MOUNT_PATH` environment variable with a value set to the folder that holds the usage logs.
 
 ```yml
@@ -285,8 +268,6 @@ services:
   user: "1000:1000" # echo $(id -u):$(id -g)
 ```
 
-::: moniker-end
-
 ## Other parameters and commands
 
 Here are a few more parameters and commands you need to run the container.
@@ -368,3 +349,5 @@ Run the container with an output mount and logging enabled. These settings enabl
 
 * [Deploy the Sample Labeling tool to an Azure Container Instance (ACI)](../deploy-label-tool.md#deploy-with-azure-container-instances-aci)
 * [Change or end a commitment plan](../../../ai-services/containers/disconnected-containers.md#purchase-a-commitment-plan-to-use-containers-in-disconnected-environments)
+
+:::moniker-end

articles/ai-services/document-intelligence/containers/image-tags.md

@@ -8,36 +8,33 @@ ms.service: azure-ai-document-intelligence
 ms.custom:
   - ignite-2023
 ms.topic: reference
-ms.date: 11/15/2023
+ms.date: 12/13/2023
 ms.author: lajanuar
 ---
 
 # Document Intelligence container tags
 
 <!-- markdownlint-disable MD051 -->
 
-::: moniker range="doc-intel-4.0.0"
-[!INCLUDE [applies to v4.0](../includes/applies-to-v40.md)]
-::: moniker-end
+:::moniker range="doc-intel-2.1.0 || doc-intel-3.1.0||doc-intel-4.0.0"
 
-::: moniker range="doc-intel-3.1.0"
-[!INCLUDE [applies to v3.1](../includes/applies-to-v31.md)]
-::: moniker-end
+Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` only:
+
+* [REST API `2022-08-31 (GA)`](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2022-08-31/operations/AnalyzeDocument)
+* [SDKs targeting `REST API 2022-08-31 (GA)`](../sdk-overview-v3-0.md)
+
+See [**Document Intelligence container image tags**](?view=doc-intel-3.0.0&preserve-view=true) for supported container documentation.
+
+:::moniker-end
 
 ::: moniker range="doc-intel-3.0.0"
-[!INCLUDE [applies to v3.0](../includes/applies-to-v30.md)]
-::: moniker-end
 
-::: moniker range="doc-intel-2.1.0"
-[!INCLUDE [applies to v2.1](../includes/applies-to-v21.md)]
-::: moniker-end
+**This content applies to:** ![checkmark](../media/yes-icon.png) **v3.0 (GA)**
 
 ## Microsoft container registry (MCR)
 
 Document Intelligence container images can be found within the [**Microsoft Artifact Registry** (also know as Microsoft Container Registry(MCR))](https://mcr.microsoft.com/catalog?search=document%20intelligence), the primary registry for all Microsoft published container images.
 
-:::moniker range=">=doc-intel-3.0.0"
-
 The following containers support DocumentIntelligence v3.0 models and features:
 
 | Container name |image |
@@ -52,7 +49,7 @@ The following containers support DocumentIntelligence v3.0 models and features:
 | [**Read 3.0**](https://mcr.microsoft.com/product/azure-cognitive-services/form-recognizer/read-3.0/tags) |`mcr.microsoft.com/azure-cognitive-services/form-recognizer/read-3.0:latest`|
 | [**Receipt 3.0**](https://mcr.microsoft.com/product/azure-cognitive-services/form-recognizer/receipt-3.0/tags) |`mcr.microsoft.com/azure-cognitive-services/form-recognizer/receipt-3.0:latest`|
 
-:::moniker-end
+::: moniker-end
 
 :::moniker range="doc-intel-2.1.0"
 
@@ -78,9 +75,9 @@ Document Intelligence containers support the following features:
 > [!IMPORTANT]
 > The Document Intelligence v1.0 container is retired.
 
-:::moniker-end
 
 ## Next steps
 
 > [!div class="nextstepaction"]
 > [Install and run Document Intelligence containers](install-run.md)
+:::moniker-end