Resolving merge conflicts with main

Author: KennedyDenMSFT

.openpublishing.redirection.azure-monitor.json

@@ -2287,17 +2287,17 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/solutions-inventory.md",
-            "redirect_url": "/azure/azure-monitor/monitor-reference",
+            "redirect_url": "/azure/azure-monitor/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/monitoring/monitoring-solutions-inventory.md",
-            "redirect_url": "/azure/azure-monitor/monitor-reference",
+            "redirect_url": "/azure/azure-monitor/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/data-locations.md",
-            "redirect_url": "/azure/azure-monitor/monitor-reference/",
+            "redirect_url": "/azure/azure-monitor/overview/",
             "redirect_document_id": false
         },
         {
@@ -6603,6 +6603,11 @@
             "source_path_from_root": "/articles/azure-monitor/partners.md",
             "redirect_url": "/azure/azure-monitor/overview#integrate",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
+            "redirect_url": "/azure/azure-monitor/overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -60,6 +60,11 @@
             "redirect_url": "/previous-versions/azure/storage/queues/storage-ruby-how-to-use-queue-storage",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/storage-actions/index.yml",
+            "redirect_url": "/azure/storage-actions/storage-tasks/",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/storage/queues/storage-php-how-to-use-queues.md",
             "redirect_url": "/previous-versions/azure/storage/queues/storage-php-how-to-use-queues",
@@ -11799,10 +11804,15 @@
             "redirect_document_id": false
 
         },
+        {
+            "source_path": "articles/external-attack-surface-management/labeling-inventory-assets.md",
+            "redirect_URL": "/azure/external-attack-surface-management/modifying-inventory-assets",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/azure-health-insights/response-info.md",
             "redirect_url": "/azure/azure-health-insights/overview",
             "redirect_document_id": false
         }
     ]
-}
+}

articles/ai-services/.openpublishing.redirection.cognitive-services.json

@@ -5125,7 +5125,7 @@
         },
         {
             "source_path_from_root": "/articles/cognitive-services/text-analytics/migration-guide.md",
-            "redirect_url": "/azure/ai-services/language-service/concepts/migrate-from-text-analytics-v2",
+            "redirect_url": "/azure/ai-services/language-service/concepts/migrate",
             "redirect_document_id": false
         },
         {

articles/ai-services/document-intelligence/faq.yml

@@ -216,7 +216,7 @@ sections:
 
             | Supported Language Azure SDK reference|Supported API versions|
             | ----- | -----|
-            | &bull; C#/.NET: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.FormRecognizer/4.0.0/index.html)<br><br>&bull; Java: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-ai-formrecognizer/4.0.0/index.html)<br><br>&bull; JavaScript: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/javascript/azure-ai-form-recognizer/4.0.0/index.html)<br><br>&bull; Python [3.2.0](https://azuresdkdocs.blob.core.windows.net/$web/python/azure-ai-formrecognizer/3.2.0/index.html)  |[**2023-10-31-preview**](https://learn.microsoft.com/rest/api/aiservices/operation-groups?view=rest-aiservices-2023-10-31-preview&preserve-view=true&tabs=HTTP&branch=main)<br>[**v3.0**](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP)</br> [**v2.1**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1/operations/AnalyzeBusinessCardAsync)</br>[**v2.0**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2/operations/AnalyzeLayoutAsync) |
+            | &bull; C#/.NET: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.FormRecognizer/4.0.0/index.html)<br><br>&bull; Java: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/java/azure-ai-formrecognizer/4.0.0/index.html)<br><br>&bull; JavaScript: [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/javascript/azure-ai-form-recognizer/4.0.0/index.html)<br><br>&bull; Python [3.2.0](https://azuresdkdocs.blob.core.windows.net/$web/python/azure-ai-formrecognizer/3.2.0/index.html)  |[**2023-10-31-preview**](/rest/api/aiservices/operation-groups?view=rest-aiservices-2023-10-31-preview&preserve-view=true&tabs=HTTP&branch=main)<br>[**v3.0**](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP)</br> [**v2.1**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1/operations/AnalyzeBusinessCardAsync)</br>[**v2.0**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2/operations/AnalyzeLayoutAsync) |
 
           For more information, *see* [Supported clients](sdk-overview-v4-0.md#supported-clients)
 
@@ -460,11 +460,32 @@ sections:
 
           - You need an active [Azure account](https://azure.microsoft.com/free/cognitive-services/) and subscription with at least a **Reader** role to access Document Intelligence Studio.
 
-          - For **document analysis and prebuilt models**, you need full access—**Cognitive Services User** role—to at least one [Document Intelligence](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [multi-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource. Once you access the model analyze page, you can change the endpoint and key to access other resources, if needed.
+          - For document analysis and prebuilt models, here are the role requirements for user scenarios.
 
-          - For **custom models**, you can either use a **Cognitive Services User** role, or use the endpoint and key of a [Document Intelligence](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [multi-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource to create a project. You also need to have **Storage Blob Data Contributor** role to access to at least one blob storage account.
+            - Basic
 
-          - For more information, *see* [Microsoft Entra built-in roles](../../role-based-access-control/built-in-roles.md).
+              - **Cognitive Services User**: you need this role to [Document Intelligence](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [Cognitive Services multi-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource to enter the analyze page.
+
+            - Advanced
+
+              - **Contributor**: you need this role to create resource group or Document Intelligence resource.
+
+          - For custom model projects, here are the role requirements for user scenarios.
+
+            - Basic
+
+              - **Cognitive Services User**: you need this role to [Document Intelligence](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) or [Cognitive Services multi-service](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource to train custom model or analyze with trained models.
+
+              - **Storage Blob Data Contributor**: you need this role to storage account to create project and label data.
+
+            - Advanced
+
+              - **Storage Account Contributor**: you need this role to the storage account to setup CORS settings (this is one time effort if the same storage account is reused).
+
+              - **Contributor**: you need this role to create resource group and resources.
+
+
+          - For more information, *see* [Microsoft Entra built-in roles](../../role-based-access-control/built-in-roles.md) and **Azure role assignments** sections in [Document Intelligence Studio](quickstarts/try-document-intelligence-studio.md) page.
 
       - question: |
           I have multiple pages in a document. Why are there only two pages analyzed in Document Intelligence Studio?

articles/ai-services/openai/concepts/content-filter.md

@@ -650,7 +650,7 @@ Approval for modified content filtering is required for access to the asynchrono
 
 ### Comparison of content filtering modes
 
-| | Streaming - Default | Streaming - Asynchronous Modified Filter |
+| Compare | Streaming - Default | Streaming - Asynchronous Modified Filter |
 |---|---|---|
 |Status |GA |Public Preview |
 | Eligibility |All customers |Customers approved for modified content filtering |