Merge pull request #276946 from MicrosoftDocs/main

Publish to live, Sunday 4 AM PST, 6/2

Author: ttorble

.openpublishing.redirection.json

@@ -1,6 +1,26 @@
 {
     "redirections": [
     {
+      "source_path": "articles/application-gateway/scripts/create-vmss-waf-cli.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/scripts/create-vmss-waf-powershell.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/powershell-samples.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/powershell-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/scripts/traffic-manager-cli-websites-high-availability.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-cli-websites-high-availability",
+      "redirect_document_id": false
+     },
+     {
       "source_path": "articles/network-watcher/network-watcher-security-group-view-powershell.md",
       "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-powershell",
       "redirect_document_id": false
@@ -34,7 +54,7 @@
       "source_path": "articles/germany/index.yml",
       "redirect_url": "/previous-versions/azure/germany/index",
       "redirect_document_id": false
-    },
+     },
         {
             "source_path_from_root": "/articles/internet-analyzer/internet-analyzer-cli.md",
             "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,20 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
+            "redirect_url": "/azure/sentinel/create-analytics-rule-from-template",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/detect-threats-built-in.md",
+            "redirect_url": "/azure/sentinel/threat-detection",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/detect-threats-custom.md",
+            "redirect_url": "/azure/sentinel/create-analytics-rules",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/automate-responses-with-playbooks.md#azure-logic-apps-basic-concepts",
             "redirect_url": "/azure/sentinel/playbooks/logic-apps-playbooks",

articles/ai-services/computer-vision/how-to/call-analyze-image-40.md

@@ -8,7 +8,7 @@ author: PatrickFarley
 ms.author: pafarley
 ms.service: azure-ai-vision
 ms.topic: how-to
-ms.date: 08/01/2023
+ms.date: 06/01/2024
 ms.custom: references_regions, devx-track-python, devx-track-extended-java, devx-track-js
 zone_pivot_groups: programming-languages-computer-vision
 ---
@@ -55,6 +55,5 @@ This article demonstrates how to call the Image Analysis 4.0 API to return infor
     - [C#](https://aka.ms/azsdk/image-analysis/samples/csharp)
     - [Python](https://aka.ms/azsdk/image-analysis/samples/python)
     - [Java](https://aka.ms/azsdk/image-analysis/samples/java)
-    - [JavaScript](https://aka.ms/azsdk/image-analysis/samples/js)
-    
+    - [JavaScript](https://aka.ms/azsdk/image-analysis/samples/js)   
 * See the [REST API reference](https://aka.ms/vision-4-0-ref) to learn more about the API functionality.

articles/ai-services/computer-vision/how-to/shelf-modify-images.md

@@ -6,12 +6,12 @@ author: PatrickFarley
 manager: nitinme
 ms.service: azure-ai-vision
 ms.topic: how-to
-ms.date: 07/10/2023
-ms.author: ginle
+ms.date: 06/01/2024
+ms.author: pafarley
 ms.custom: references_regions, build-2023
 ---
 
-# Shelf Image Composition (preview)
+# Shelf image composition (preview)
 
 Part of the Product Recognition workflow involves fixing and modifying the input images so the service can perform correctly. 
 
@@ -59,7 +59,7 @@ To run the image stitching operation on a set of images, follow these steps:
 1. Open a command prompt window.
 1. Paste your edited `curl` command from the text editor into the command prompt window, and then run the command.
 
-## Examine the stitching response
+### Examine the stitching response
 
 The API returns a `200` response, and the new file is downloaded to the location you specified.
 
@@ -108,15 +108,12 @@ To correct the perspective distortion in the composite image, follow these steps
 
        :::image type="content" source="../media/shelf/rectify.png" alt-text="Photo of a shelf with its four corners outlined.":::
 
-       > [!NOTE]
-       > The brands shown in the images are not affiliated with Microsoft and do not indicate any form of endorsement of Microsoft or Microsoft products by the brand owners, or an endorsement of the brand owners or their products by Microsoft.
-
     1. Replace `<your_filename>` with the name and extension of the file where you'd like to get the result (for example, `download.jpg`).
 1. Open a command prompt window.
 1. Paste your edited `curl` command from the text editor into the command prompt window, and then run the command.
 
 
-## Examine the rectification response
+### Examine the rectification response
 
 The API returns a `200` response, and the new file is downloaded to the location you specified.
 

articles/ai-services/computer-vision/includes/environment-variables.md

@@ -23,23 +23,23 @@ To set the environment variable for your key and endpoint, open a console window
 #### [Windows](#tab/windows)
 
 ```console
-setx VISION_KEY your-key
+setx VISION_KEY <your_key>
 ```
 
 ```console
-setx VISION_ENDPOINT your-endpoint
+setx VISION_ENDPOINT <your_endpoint>
 ```
 
 After you add the environment variables, you may need to restart any running programs that will read the environment variables, including the console window.
 
 #### [Linux](#tab/linux)
 
 ```bash
-export VISION_KEY=your-key
+export VISION_KEY=<your_key>
 ```
 
 ```bash
-export VISION_ENDPOINT=your-endpoint
+export VISION_ENDPOINT=<your_endpoint>
 ```
 
 After you add the environment variables, run `source ~/.bashrc` from your console window to make the changes effective.

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

@@ -45,7 +45,10 @@ Alternatively, you can pass in the image as a data array. For example, read from
 
 ## Select visual features
 
-The Analysis 4.0 API gives you access to all of the service's image analysis features. Choose which operations to do based on your own use case. See the [overview](/azure/ai-services/computer-vision/overview-image-analysis) for a description of each feature. The example in this section adds all of the available visual features, but for practical usage you likely need fewer. 
+The Analysis 4.0 API gives you access to all of the service's image analysis features. Choose which operations to do based on your own use case. See the [Overview](/azure/ai-services/computer-vision/overview-image-analysis) for a description of each feature. The example in this section adds all of the available visual features, but for practical usage you likely need fewer. 
+
+> [!IMPORTANT]
+> The visual features [Captions](/java/api/com.azure.ai.vision.imageanalysis.models.visualfeatures#com-azure-ai-vision-imageanalysis-models-visualfeatures-caption) and [DenseCaptions](/java/api/com.azure.ai.vision.imageanalysis.models.visualfeatures#com-azure-ai-vision-imageanalysis-models-visualfeatures-dense-captions) are only supported in the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
 
 [!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/4-0/how-to.js?name=snippet_features)]
 

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

@@ -10,10 +10,10 @@ ms.author: pafarley
 
 ## Prerequisites
 
-This guide assumes you have followed the steps mentioned in the [quickstart](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library-40). This means:
+This guide assumes you've followed the steps of the [quickstart](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library-40). This means:
 
-* You have <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="created a Computer Vision resource"  target="_blank">created a Computer Vision resource </a> and obtained a key and endpoint URL.
-* You have the appropriate SDK package installed and you have a running [quickstart](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library-40) application. You can modify this quickstart application based on the code examples here.
+* You've <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="Created a Computer Vision resource"  target="_blank">created a Computer Vision resource </a> and obtained a key and endpoint URL.
+* You've installed the appropriate SDK package and have a working [quickstart](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library-40) application. You can modify this quickstart application based on the code examples here.
 
 ## Create and authenticate the client
 
@@ -27,7 +27,7 @@ To authenticate against the Image Analysis service, you need a Computer Vision k
 
 Start by creating an [ImageAnalysisClient](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.imageanalysisclient) object using one of the constructors. For example:
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_client)]
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_client)]
 
 
 ## Select the image to analyze
@@ -38,20 +38,23 @@ You can select an image by providing a publicly accessible image URL, or by read
 
 You can use the following sample image URL.
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_url)]
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_url)]
 
 
 ### Image buffer
 
 Alternatively, you can pass in the image as [bytes](https://docs.python.org/3/library/stdtypes.html#bytes-objects) object. For example, read from a local image file you want to analyze.
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_file)]
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_file)]
 
 ## Select visual features
 
 The Analysis 4.0 API gives you access to all of the service's image analysis features. Choose which operations to do based on your own use case. See the [overview](/azure/ai-services/computer-vision/overview-image-analysis) for a description of each feature. The example in this section adds all of the [available visual features](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.models.visualfeatures), but for practical usage you likely need fewer.
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_features)]
+> [!IMPORTANT]
+> The visual features [Captions](/java/api/com.azure.ai.vision.imageanalysis.models.visualfeatures#com-azure-ai-vision-imageanalysis-models-visualfeatures-caption) and [DenseCaptions](/java/api/com.azure.ai.vision.imageanalysis.models.visualfeatures#com-azure-ai-vision-imageanalysis-models-visualfeatures-dense-captions) are only supported in the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
+
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_features)]
 
 <!--
 ### Set model name when using a custom model
@@ -65,9 +68,9 @@ To use a custom model, create the [ImageAnalysisOptions](/python/api/azure-ai-vi
 
 ## Call the analyze_from_url method with options
 
-The following code calls the [analyze_from_url](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.imageanalysisclient#azure-ai-vision-imageanalysis-imageanalysisclient-analyzefromurl) method on the client with the features you selected above and additional options, defined below. To analyze from an image buffer instead of URL, call the method [analyze](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.imageanalysisclient#azure-ai-vision-imageanalysis-imageanalysisclient-analyze) instead, with `image_data=image_data` as the first argument.
+The following code calls the [analyze_from_url](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.imageanalysisclient#azure-ai-vision-imageanalysis-imageanalysisclient-analyzefromurl) method on the client with the features you selected above and other options, defined below. To analyze from an image buffer instead of URL, call the method [analyze](/python/api/azure-ai-vision-imageanalysis/azure.ai.vision.imageanalysis.imageanalysisclient#azure-ai-vision-imageanalysis-imageanalysisclient-analyze) instead, with `image_data=image_data` as the first argument.
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_call)]
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_call)]
 
 ### Select smart cropping aspect ratios
 
@@ -87,7 +90,7 @@ You can specify the language of the returned data. The language is optional, wit
 
 The following code shows you how to parse the results from the **analyze_from_url** or **analyze** operations.
 
-[!code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_result)]
+[!Code-python[](~/cognitive-services-quickstart-code/python/ComputerVision/4-0/how-to.py?name=snippet_result)]
 
 
 <!--
@@ -124,7 +127,7 @@ Reason: PermissionDenied
 Message: Access denied due to invalid subscription key or wrong API endpoint. Make sure to provide a valid key for an active subscription and use a correct regional API endpoint for your resource.
 ```
 
-Or when you provide an image URL that does not exist or not accessible:
+Or when you provide an image URL that doesn't exist or is not accessible:
 ```
 Status code: 400
 Reason: Bad Request
@@ -161,7 +164,7 @@ handler.setFormatter(formatter)
 
 <!-- END SNIPPET -->
 
-By default logs redact the values of URL query strings, the values of some HTTP request and response headers (including `Ocp-Apim-Subscription-Key` which holds the key), and the request and response payloads. To create logs without redaction, set the method argument `logging_enable = True` when you create `ImageAnalysisClient`, or when you call `analyze` on the client. 
+By default logs redact the values of URL query strings, the values of some HTTP request and response headers (including `Ocp-Apim-Subscription-Key`, which holds the key), and the request and response payloads. To create logs without redaction, set the method argument `logging_enable = True` when you create `ImageAnalysisClient`, or when you call `analyze` on the client. 
 
 <!-- SNIPPET:sample_analyze_all_image_file.create_client_with_logging -->
 

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

@@ -32,9 +32,10 @@ Authentication is done by adding the HTTP request header **Ocp-Apim-Subscription
 
 The code in this guide uses remote images referenced by URL. You may want to try different images on your own to see the full capability of the Image Analysis features.
 
-
+### Image URL
 When analyzing a remote image, you specify the image's URL by formatting the request body like this: `{"url":"https://learn.microsoft.com/azure/cognitive-services/computer-vision/images/windows-kitchen.jpg"}`. The **Content-Type** should be `application/json`.
 
+### Image file
 To analyze a local image, you'd put the binary image data in the HTTP request body. The **Content-Type** should be `application/octet-stream` or `multipart/form-data`.
 
 

articles/ai-services/computer-vision/includes/identity-curl-quickstart.md

@@ -24,6 +24,8 @@ Get started with facial recognition using the Face REST API. The Face service pr
     * You'll need the key and endpoint from the resource you create to connect your application to the Face API. You'll paste your key and endpoint into the code below later in the quickstart.
     * You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
 * [PowerShell version 6.0+](/powershell/scripting/install/installing-powershell-core-on-windows), or a similar command-line application.
+* [cURL](https://curl.haxx.se/) installed.
+
 
 
 

articles/ai-services/computer-vision/includes/quickstarts-sdk/identity-csharp-sdk.md

@@ -13,7 +13,7 @@ ms.date: 05/03/2022
 ms.author: pafarley
 ---
 
-Get started with facial recognition using the Face client library for .NET. The Face service provides you with access to advanced algorithms for detecting and recognizing human faces in images. Follow these steps to install the package and try out the example code for basic face identification using remote images.
+Get started with facial recognition using the Face client library for .NET. The Azure AI Face service provides you with access to advanced algorithms for detecting and recognizing human faces in images. Follow these steps to install the package and try out the example code for basic face identification using remote images.
 
 [Reference documentation](/dotnet/api/overview/azure/cognitiveservices/face-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/cognitiveservices/Vision.Face) | [Package (NuGet)](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.Face/2.7.0-preview.3) | [Samples](/samples/browse/?products=azure&term=face)