Fix merge conflict

Author: timlt

.openpublishing.redirection.sentinel.json

@@ -1055,6 +1055,21 @@
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
             "redirect_url": "/azure/sentinel/notebooks-hunt",

.whatsnew/.azure-monitor.json

@@ -16,7 +16,7 @@ Face Liveness detection can be used to determine if a face in an input video str
 
 The goal of liveness detection is to ensure that the system is interacting with a physically present live person at the time of authentication. Such systems have become increasingly important with the rise of digital finance, remote access control, and online identity verification processes.
 
-The liveness detection solution successfully defends against a variety of spoof types ranging from paper printouts, 2d/3d masks, and spoof presentations on phones and laptops. Liveness detection is an active area of research, with continuous improvements being made to counteract increasingly sophisticated spoofing attacks over time. Continuous improvements will be rolled out to the client and the service components over time as the overall solution gets more robust to new types of attacks.
+The liveness detection solution successfully defends against various spoof types ranging from paper printouts, 2d/3d masks, and spoof presentations on phones and laptops. Liveness detection is an active area of research, with continuous improvements being made to counteract increasingly sophisticated spoofing attacks over time. Continuous improvements will be rolled out to the client and the service components over time as the overall solution gets more robust to new types of attacks.
 
 [!INCLUDE [liveness-sdk-gate](../includes/liveness-sdk-gate.md)]
 
@@ -40,7 +40,7 @@ Once you have access to the SDK, follow instruction in the [azure-ai-vision-sdk]
 - For Swift iOS, follow the instructions in the [iOS sample](https://aka.ms/azure-ai-vision-face-liveness-client-sdk-ios-readme) 
 - For Kotlin/Java Android, follow the instructions in the [Android sample](https://aka.ms/liveness-sample-java) 
 
-Once you've added the code into your application, the SDK will handle starting the camera, guiding the end-user to adjust their position, composing the liveness payload, and calling the Azure AI Face cloud service to process the liveness payload.
+Once you've added the code into your application, the SDK handles starting the camera, guiding the end-user to adjust their position, composing the liveness payload, and calling the Azure AI Face cloud service to process the liveness payload.
 
 ### Orchestrate the liveness solution
 
@@ -86,7 +86,7 @@ The high-level steps involved in liveness orchestration are illustrated below:
 
 1. The SDK then starts the camera, guides the user to position correctly and then prepares the payload to call the liveness detection service endpoint. 
 
-1. The SDK calls the Azure AI Vision Face service to perform the liveness detection. Once the service responds, the SDK will notify the mobile application that the liveness check has been completed. 
+1. The SDK calls the Azure AI Vision Face service to perform the liveness detection. Once the service responds, the SDK notifies the mobile application that the liveness check has been completed. 
 
 1. The mobile application relays the liveness check completion to the app server. 
 
@@ -110,7 +110,7 @@ The high-level steps involved in liveness orchestration are illustrated below:
                 "method": "POST",
                 "contentLength": 352568,
                 "contentType": "multipart/form-data; boundary=--------------------------482763481579020783621915",
-                "userAgent": "PostmanRuntime/7.34.0"
+                "userAgent": ""
             },
             "response": {
                 "body": {
@@ -162,12 +162,12 @@ Use the following tips to ensure that your input images give the most accurate r
 #### Composition requirements:
 -	Photo is clear and sharp, not blurry, pixelated, distorted, or damaged. 
 -	Photo is not altered to remove face blemishes or face appearance.
--	Photo must be in an RGB color supported format (JPEG, PNG, WEBP, BMP). Recommended Face size is 200 pixels x 200 pixels. Face sizes larger than 200 pixels x 200 pixels will not result in better AI quality, and no larger than 6MB in size.
+-	Photo must be in an RGB color supported format (JPEG, PNG, WEBP, BMP). Recommended Face size is 200 pixels x 200 pixels. Face sizes larger than 200 pixels x 200 pixels will not result in better AI quality, and no larger than 6 MB in size.
 -	User is not wearing glasses, masks, hats, headphones, head coverings, or face coverings. Face should be free of any obstructions.
 -	Facial jewelry is allowed provided they do not hide your face. 
 -	Only one face should be visible in the photo.
 -	Face should be in neutral front-facing pose with both eyes open, mouth closed, with no extreme facial expressions or head tilt.
--	Face should be free of any shadows or red eyes. Please retake photo if either of these occur.
+-	Face should be free of any shadows or red eyes. Retake photo if either of these occur.
 -	Background should be uniform and plain, free of any shadows. 
 -	Face should be centered within the image and fill at least 50% of the image.
 
@@ -243,7 +243,7 @@ The high-level steps involved in liveness with verification orchestration are il
                 "method": "POST",
                 "contentLength": 352568,
                 "contentType": "multipart/form-data; boundary=--------------------------590588908656854647226496",
-                "userAgent": "PostmanRuntime/7.34.0"
+                "userAgent": ""
             },
             "response": {
                 "body": {

.whatsnew/.defender-for-iot.json

@@ -22,14 +22,19 @@ To get started with the **Search photos with image retrieval** scenario in Visio
 >
 > :::image type="content" source="../media/storage-instructions/subscription.png" alt-text="Screenshot of resource selection.":::
 
+
 ## Create a new storage account
 
 To get started, <a href="https://ms.portal.azure.com/#create/Microsoft.StorageAccount"  title="create a new storage account"  target="_blank">create a new storage account</a>.
 
 :::image type="content" source="../media/storage-instructions/create-storage.png" alt-text="Screenshot of Blob storage creation.":::
 
+Fill in the required parameters to configure your storage account, then select **Review** and **Create**.
 
-Fill in the required parameters to configure your storage account, then select **Review** and **Create**. 
+> [!IMPORTANT]
+> Your storage account must be publicly accessible to be used with Vision Studio. Configure this in the **Networking** tab of the resource creation page.
+>
+> :::image type="content" source="../media/storage-instructions/public-access.png" alt-text="Screenshot of network setting.":::
 
 Once your storage account has been deployed, select **Go to resource** to open the storage account overview. 
 

.whatsnew/.security-center.json

@@ -25,7 +25,7 @@ The fastest way to start using Product Recognition is to use the built-in pretra
 * Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="create a Vision resource"  target="_blank">create a Vision resource</a> in the Azure portal. It must be deployed in the **East US** or **West US 2** region. After it deploys, select **Go to resource**.
   * You'll need the key and endpoint from the resource you create to connect your application to the Azure AI Vision service. You'll paste your key and endpoint into the code below later in the guide.
 * An Azure Storage resource with a blob storage container. [Create one](/azure/storage/common/storage-account-create?tabs=azure-portal)
-* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Postman, Swagger, or the REST Client extension for VS Code.
+* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Swagger or the [REST Client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension for VS Code.
 * A shelf image. You can download our [sample image](https://github.com/Azure-Samples/cognitive-services-sample-data-files/blob/master/ComputerVision/shelf-analysis/shelf.png) or bring your own images. The maximum file size per image is 20 MB.
 
 ## Analyze shelf images

.whatsnew/.sentinel.json

@@ -24,7 +24,7 @@ This guide also shows you how to use the **Rectification API** to correct for pe
 * Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision"  title="create a Vision resource"  target="_blank">create a Vision resource</a> in the Azure portal. It must be deployed in the **East US** or **West US 2** region. After it deploys, select **Go to resource**.
   * You'll need the key and endpoint from the resource you create to connect your application to the Azure AI Vision service. You'll paste your key and endpoint into the code below later in the quickstart.
 * An Azure Storage resource with a blob storage container. [Create one](/azure/storage/common/storage-account-create?tabs=azure-portal)
-* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Postman, Swagger, or the REST Client extension for VS Code.
+* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Swagger or the [REST Client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension for VS Code.
 * A set of photos that show adjacent parts of the same shelf. A 50% overlap between images is recommended. You can download and use the sample "unstitched" images from [GitHub](https://github.com/Azure-Samples/cognitive-services-sample-data-files/tree/master/ComputerVision/shelf-analysis).
 
 

articles/ai-services/computer-vision/Tutorials/liveness.md

@@ -22,7 +22,7 @@ A planogram is a diagram that indicates the correct placement of retail products
 
 ## Prerequisites
 * You must have already set up and run basic [Product Understanding analysis](./shelf-analyze.md) with the Product Understanding API.
-* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Postman, Swagger, or the REST Client extension for VS Code.
+* [cURL](https://curl.haxx.se/) installed. Or, you can use a different REST platform, like Swagger or the [REST Client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension for VS Code.
 
 ## Prepare a planogram schema