fix merge conflict

Author: asudbring

.openpublishing.redirection.json

@@ -980,6 +980,11 @@
             "redirect_url": "/analysis-services/tabular-models/compatibility-level-for-tabular-models-in-analysis-services",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/analysis-services/analysis-services-monitor.md",
+            "redirect_url": "/azure/analysis-services/monitor-analysis-services",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/frontdoor/front-door-whats-new.md",
             "redirect_url": "https://azure.microsoft.com/updates/?category=networking\u0026query=Azure%20Front%20Door",

articles/advisor/advisor-assessments.md

@@ -39,8 +39,8 @@ You can manage access to Advisor WAF assessments using built-in roles. The permi
 
 | **Name** | **Description** |
 |---|:---:|
-|Reader|View assessments for a workload and the corresponding recommendations|
-|Contributor|Create assessments for a workload and triage the corresponding recommendations|
+|Reader|View assessments for a subscription or workload and the corresponding recommendations|
+|Contributor|Create assessments for a subscription or workload and triage the corresponding recommendations|
 
 ## Access Azure Advisor WAF assessments
 
@@ -157,7 +157,7 @@ Once the recommendation is, or multiple recommendations are, selected with **Mar
 Some common questions and answers.
 
 **Q**. Can I edit previously taken assessments?\
-**A**. In the "Most Valuable Professionals" (MVP) program scope, assessments can't be edited once completed.
+**A**. In the current program, assessments can't be edited once completed.
 
 **Q**. Why am I not getting any recommendations?\
 **A**. If you didn't answer all of the assessment questions and skipped to **View guidance**, you might not get any recommendations generated. The other reason might be that the Learn platform hasn't generated any recommendations for the assessment.

articles/ai-services/cognitive-services-limited-access.md

@@ -7,7 +7,7 @@ author: PatrickFarley
 manager: nitinme
 ms.service: azure-ai-services
 ms.topic: conceptual
-ms.date: 10/27/2022
+ms.date: 02/27/2024
 ms.author: pafarley
 ---
 
@@ -17,7 +17,7 @@ Our vision is to empower developers and organizations to use AI to transform soc
 
 ## What is Limited Access? 
 
-Limited Access services require registration, and only customers managed by Microsoft, meaning those who are working directly with Microsoft account teams, are eligible for access. The use of these services is limited to the use case selected at the time of registration. Customers must acknowledge that they've reviewed and agree to the terms of service. Microsoft may require customers to reverify this information. 
+Limited Access services require registration, and only customers managed by Microsoft—meaning those who are working directly with Microsoft account teams—are eligible for access. The use of these services is limited to the use case selected at the time of registration. Customers must acknowledge that they've reviewed and agree to the terms of service. Microsoft may require customers to reverify this information. 
 
 Limited Access services are made available to customers under the terms governing their subscription to Microsoft Azure Services (including the [Service Specific Terms](https://go.microsoft.com/fwlink/?linkid=2018760)). Review these terms carefully as they contain important conditions and obligations governing your use of Limited Access services. 
 
@@ -51,7 +51,7 @@ Submit a registration form for each Limited Access service you would like to use
 
 ### How long will the registration process take? 
 
-Review may take 5-10 business days. You will receive an email as soon as your application is reviewed. 
+You'll receive communication from us about your application within 5-10 business days. In some cases, reviews can take longer. You'll receive an email as soon as your application is reviewed.
 
 ### Who is eligible to use Limited Access services? 
 
@@ -92,9 +92,6 @@ Detailed information about supported regions for Custom Neural Voice and Speaker
 
 If you're an existing customer and your application for access is denied, you will no longer be able to use Limited Access features after June 30, 2023. Your data is subject to Microsoft's data retention [policies](https://www.microsoft.com/trust-center/privacy/data-management#:~:text=If%20you%20terminate%20a%20cloud,data%20or%20renew%20your%20subscription.). 
 
-### How long will the registration process take?
-
-You'll receive communication from us about your application within 10 business days. In some cases, reviews can take longer. You'll receive an email as soon as your application is reviewed.
 
 ## Help and support 
 

articles/ai-services/computer-vision/concept-describe-images-40.md

@@ -122,7 +122,7 @@ The following JSON response illustrates what the Analysis 4.0 API returns when g
       }
     ]
   },
-  "modelVersion": "2023-10-01",
+  "modelVersion": "2024-02-01",
   "metadata": {
     "width": 850,
     "height": 567

articles/ai-services/computer-vision/concept-ocr.md

@@ -34,7 +34,7 @@ The following JSON response illustrates what the Image Analysis 4.0 API returns
 
 ```json
 {
-    "modelVersion": "2023-10-01",
+    "modelVersion": "2024-02-01",
     "metadata":
     {
         "width": 1000,

articles/ai-services/computer-vision/concept-people-detection.md

@@ -27,7 +27,7 @@ The following JSON response illustrates what the Analysis 4.0 API returns when d
 
 ```json
 {
-  "modelVersion": "2023-10-01",
+  "modelVersion": "2024-02-01",
   "metadata": {
     "width": 300,
     "height": 231

articles/ai-services/computer-vision/deploy-computer-vision-on-premises.md

@@ -7,7 +7,7 @@ author: PatrickFarley
 manager: nitinme
 ms.service: azure-ai-vision
 ms.topic: how-to
-ms.date: 05/09/2022
+ms.date: 02/27/2024
 ms.author: pafarley
 ms.custom: cogserv-non-critical-vision
 ---

articles/ai-services/computer-vision/faq.yml

@@ -9,7 +9,7 @@ metadata:
 
   ms.service: azure-ai-vision
   ms.topic: faq
-  ms.date: 05/09/2022
+  ms.date: 02/27/2024
   ms.author: pafarley
   ms.custom: cogserv-non-critical-vision
 title: Azure AI Vision API Frequently Asked Questions
@@ -52,4 +52,4 @@ sections:
       - question: |
           Can I train Azure AI Vision API to use custom tags?  For example, I would like to feed in pictures of cat breeds to 'train' the AI, then receive the breed value on an AI request.
         answer: |
-          This function is currently not available. You can use [Custom Vision](../custom-vision-service/overview.md) to train a model to detect user-defined visual features.
+          Yes. See [Model customization](/azure/ai-services/computer-vision/concept-model-customization), a feature of Image Analysis 4.0.

articles/ai-services/computer-vision/how-to/analyze-video.md

@@ -8,29 +8,30 @@ author: PatrickFarley
 ms.author: pafarley
 ms.service: azure-ai-vision
 ms.topic: how-to
-ms.date: 07/05/2022
+ms.date: 02/27/2024
 ms.devlang: csharp
 ms.custom: devx-track-csharp, cogserv-non-critical-vision
 ---
 
 # Analyze videos in near real time
 
-This article demonstrates how to perform near real-time analysis on frames that are taken from a live video stream by using the Azure AI Vision API. The basic elements of such an analysis are:
+This article demonstrates how to use the Azure AI Vision API to perform near real-time analysis on frames that are taken from a live video stream. The basic elements of such an analysis are:
 
-- Acquiring frames from a video source.
-- Selecting which frames to analyze.
-- Submitting these frames to the API.
-- Consuming each analysis result that's returned from the API call.
+- Acquiring frames from a video source
+- Selecting which frames to analyze
+- Submitting these frames to the API
+- Consuming each analysis result that's returned from the API call
 
-The samples in this article are written in C#. To access the code, go to the [Video frame analysis sample](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) page on GitHub.
+> [!TIP]
+> The samples in this article are written in C#. To access the code, go to the [Video frame analysis sample](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) page on GitHub.
 
 ## Approaches to running near real-time analysis
 
-You can solve the problem of running near real-time analysis on video streams by using a variety of approaches. This article outlines three of them, in increasing levels of sophistication.
+You can solve the problem of running near real-time analysis on video streams using a variety of approaches. This article outlines three of them, in increasing levels of sophistication.
 
-### Design an infinite loop
+### Method 1: Design an infinite loop
 
-The simplest design for near real-time analysis is an infinite loop. In each iteration of this loop, you grab a frame, analyze it, and then consume the result:
+The simplest design for near real-time analysis is an infinite loop. In each iteration of this loop, the application retrieves a frame, analyzes it, and then processes the result:
 
 ```csharp
 while (true)
@@ -46,7 +47,7 @@ while (true)
 
 If your analysis were to consist of a lightweight, client-side algorithm, this approach would be suitable. However, when the analysis occurs in the cloud, the resulting latency means that an API call might take several seconds. During this time, you're not capturing images, and your thread is essentially doing nothing. Your maximum frame rate is limited by the latency of the API calls.
 
-### Allow the API calls to run in parallel
+### Method 2: Allow the API calls to run in parallel
 
 Although a simple, single-threaded loop makes sense for a lightweight, client-side algorithm, it doesn't fit well with the latency of a cloud API call. The solution to this problem is to allow the long-running API call to run in parallel with the frame-grabbing. In C#, you could do this by using task-based parallelism. For example, you can run the following code:
 
@@ -70,9 +71,9 @@ With this approach, you launch each analysis in a separate task. The task can ru
 * It could also cause multiple threads to enter the ConsumeResult() function simultaneously, which might be dangerous if the function isn't thread-safe. 
 * Finally, this simple code doesn't keep track of the tasks that get created, so exceptions silently disappear. Thus, you need to add a "consumer" thread that tracks the analysis tasks, raises exceptions, kills long-running tasks, and ensures that the results get consumed in the correct order, one at a time.
 
-### Design a producer-consumer system
+### Method 3: Design a producer-consumer system
 
-For your final approach, designing a "producer-consumer" system, you build a producer thread that looks similar to your previously mentioned infinite loop. However, instead of consuming the analysis results as soon as they're available, the producer simply places the tasks in a queue to keep track of them.
+To design a "producer-consumer" system, you build a producer thread that looks similar to the previous section's infinite loop. Then, instead of consuming the analysis results as soon as they're available, the producer simply places the tasks in a queue to keep track of them.
 
 ```csharp
 // Queue that will contain the API call tasks.
@@ -109,7 +110,7 @@ while (true)
 }
 ```
 
-You also create a consumer thread, which takes tasks off the queue, waits for them to finish, and either displays the result or raises the exception that was thrown. By using the queue, you can guarantee that the results get consumed one at a time, in the correct order, without limiting the maximum frame rate of the system.
+You also create a consumer thread, which takes tasks off the queue, waits for them to finish, and either displays the result or raises the exception that was thrown. By using this queue, you can guarantee that the results get consumed one at a time, in the correct order, without limiting the maximum frame rate of the system.
 
 ```csharp
 // Consumer thread.
@@ -137,13 +138,15 @@ while (true)
 
 ### Get sample code
 
-To help get your app up and running as quickly as possible, we've implemented the system that's described in the preceding section. It's intended to be flexible enough to accommodate many scenarios, while being easy to use. To access the code, go to the [Video frame analysis sample](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) page on GitHub.
+To help get your app up and running as quickly as possible, we've implemented the system that's described in the previous section. It's intended to be flexible enough to accommodate many scenarios, while being easy to use. To access the code, go to the [Video frame analysis sample](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) repo on GitHub.
 
-The library contains the `FrameGrabber` class, which implements the previously discussed producer-consumer system to process video frames from a webcam. Users can specify the exact form of the API call, and the class uses events to let the calling code know when a new frame is acquired, or when a new analysis result is available.
+The library contains the `FrameGrabber` class, which implements the producer-consumer system to process video frames from a webcam. Users can specify the exact form of the API call, and the class uses events to let the calling code know when a new frame is acquired, or when a new analysis result is available.
+
+### View sample implementations
 
 To illustrate some of the possibilities, we've provided two sample apps that use the library. 
 
-The first sample app is a simple console app that grabs frames from the default webcam and then submits them to the Face service for face detection. A simplified version of the app is reproduced in the following code:
+The first sample app is a simple console app that grabs frames from the default webcam and then submits them to the Face service for face detection. A simplified version of the app is represented in the following code:
 
 ```csharp
 using System;
@@ -213,11 +216,11 @@ namespace BasicConsoleSample
 }
 ```
 
-The second sample app is a bit more interesting. It allows you to choose which API to call on the video frames. On the left side, the app shows a preview of the live video. On the right, it overlays the most recent API result on the corresponding frame.
+The second sample app offers more functionality. It allows you to choose which API to call on the video frames. On the left side, the app shows a preview of the live video. On the right, it overlays the most recent API result on the corresponding frame.
 
-In most modes, there's a visible delay between the live video on the left and the visualized analysis on the right. This delay is the time that it takes to make the API call. An exception is in the "EmotionsWithClientFaceDetect" mode, which performs face detection locally on the client computer by using OpenCV before it submits any images to Azure AI services. 
+In most modes, there's a visible delay between the live video on the left and the visualized analysis on the right. This delay is the time that it takes to make the API call. An exception is in the `EmotionsWithClientFaceDetect` mode, which performs face detection locally on the client computer by using OpenCV before it submits any images to Azure AI services. 
 
-By using this approach, you can visualize the detected face immediately. You can then update the emotions later, after the API call returns. This demonstrates the possibility of a "hybrid" approach. That is, some simple processing can be performed on the client, and then Azure AI services APIs can be used to augment this processing with more advanced analysis when necessary.
+By using this approach, you can visualize the detected face immediately. You can then update the attributes later, after the API call returns. This demonstrates the possibility of a "hybrid" approach. That is, some simple processing can be performed on the client, and then Azure AI services APIs can be used to augment this processing with more advanced analysis when necessary.
 
 ![The LiveCameraSample app displaying an image with tags](../images/frame-by-frame.jpg)
 
@@ -226,18 +229,18 @@ By using this approach, you can visualize the detected face immediately. You can
 To get started with this sample, do the following:
 
 1. Create an [Azure account](https://azure.microsoft.com/free/cognitive-services/). If you already have one, you can skip to the next step.
-2. Create resources for Azure AI Vision and Face in the Azure portal to get your key and endpoint. Make sure to select the free tier (F0) during setup.
+1. Create resources for Azure AI Vision and Face in the Azure portal to get your key and endpoint. Make sure to select the free tier (F0) during setup.
    - [Azure AI Vision](https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision)
    - [Face](https://portal.azure.com/#create/Microsoft.CognitiveServicesFace)
    After the resources are deployed, select **Go to resource** to collect your key and endpoint for each resource. 
-3. Clone the [Cognitive-Samples-VideoFrameAnalysis](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) GitHub repo.
-4. Open the sample in Visual Studio 2015 or later, and then build and run the sample applications:
+1. Clone the [Cognitive-Samples-VideoFrameAnalysis](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/) GitHub repo.
+1. Open the sample in Visual Studio 2015 or later, and then build and run the sample applications:
     - For BasicConsoleSample, the Face key is hard-coded directly in [BasicConsoleSample/Program.cs](https://github.com/Microsoft/Cognitive-Samples-VideoFrameAnalysis/blob/master/Windows/BasicConsoleSample/Program.cs).
     - For LiveCameraSample, enter the keys in the **Settings** pane of the app. The keys are persisted across sessions as user data.
 
-When you're ready to integrate the samples, reference the VideoFrameAnalyzer library from your own projects.
+When you're ready to integrate the samples, reference the **VideoFrameAnalyzer** library from your own projects.
 
-The image-, voice-, video-, and text-understanding capabilities of VideoFrameAnalyzer use Azure AI services. Microsoft receives the images, audio, video, and other data that you upload (via this app) and might use them for service-improvement purposes. We ask for your help in protecting the people whose data your app sends to Azure AI services.
+The image-, voice-, video-, and text-understanding capabilities of **VideoFrameAnalyzer** use Azure AI services. Microsoft receives the images, audio, video, and other data that you upload (through this app) and might use them for service-improvement purposes. We ask for your help in protecting the people whose data your app sends to Azure AI services.
 
 ## Next steps
 

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

@@ -10,7 +10,7 @@ ms.service: azure-ai-vision
 ms.topic: how-to
 ms.date: 08/01/2023
 ms.custom: references_regions, devx-track-python, devx-track-extended-java, devx-track-js
-zone_pivot_groups: programming-languages-computer-vision-40
+zone_pivot_groups: programming-languages-computer-vision
 ---
 
 # Call the Image Analysis 4.0 Analyze API