Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into payment-hsm

Author: msmbaldwin

.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
         },
         {
@@ -6598,6 +6598,11 @@
             "source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
             "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
             "redirect_document_id": true
+        },
+        {
+            "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 |

articles/ai-services/openai/includes/whisper-python.md

@@ -0,0 +1,76 @@
+---
+services: ai-services
+author: soferreira
+ms.author: soferreira
+ms.service: openai
+ms.topic: include
+ms.date: 1/25/2024
+---
+
+## Python
+
+### Prerequisites
+
+- <a href="https://www.python.org/" target="_blank">Python 3.7.1 or later version</a>
+- The following Python libraries: os
+
+### Set up
+
+Install the OpenAI Python client library with:
+
+# [OpenAI Python 0.28.1](#tab/python)
+
+```console
+pip install openai==0.28.1
+```
+
+# [OpenAI Python 1.x](#tab/python-new)
+
+```console
+pip install openai
+```
+
+---
+
+1. Create a new Python file called quickstart.py. Then open it up in your preferred editor or IDE.
+
+1. Replace the contents of quickstart.py with the following code. Modify the code to add your deployment name:
+
+```python
+import openai
+import time
+import os
+
+openai.api_key = os.getenv("AZURE_OPENAI_KEY")
+openai.api_base = os.getenv("AZURE_OPENAI_ENDPOINT")  # your endpoint should look like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
+openai.api_type = "azure"
+openai.api_version = "2023-09-01-preview"
+
+model_name = "whisper"
+deployment_id = "YOUR-DEPLOYMENT-NAME-HERE" #This will correspond to the custom name you chose for your deployment when you deployed a model."
+audio_language="en"
+
+audio_test_file = "./wikipediaOcelot.wav"
+
+result = openai.Audio.transcribe(
+            file=open(audio_test_file, "rb"),            
+            model=model_name,
+            deployment_id=deployment_id
+        )
+
+print(result)
+```
+
+Run the application with the python command on your quickstart file:
+
+
+You can get sample audio files from the [Azure AI Speech SDK repository at GitHub](https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/sampledata/audiofiles).
+
+> [!IMPORTANT]
+> For production, use a secure way of storing and accessing your credentials like [Azure Key Vault](../../../key-vault/general/overview.md). For more information about credential security, see the Azure AI services [security](../../security-features.md) article.
+
+## Output
+
+```python
+{"text":"The ocelot, Lepardus paradalis, is a small wild cat native to the southwestern United States, Mexico, and Central and South America. This medium-sized cat is characterized by solid black spots and streaks on its coat, round ears, and white neck and undersides. It weighs between 8 and 15.5 kilograms, 18 and 34 pounds, and reaches 40 to 50 centimeters 16 to 20 inches at the shoulders. It was first described by Carl Linnaeus in 1758. Two subspecies are recognized, L. p. paradalis and L. p. mitis. Typically active during twilight and at night, the ocelot tends to be solitary and territorial. It is efficient at climbing, leaping, and swimming. It preys on small terrestrial mammals such as armadillo, opossum, and lagomorphs."}
+```