Merge branch 'MicrosoftDocs:main' into main

Author: eak13

.openpublishing.publish.config.json

@@ -356,6 +356,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-python-worker",
+      "url": "https://github.com/Azure/azure-functions-python-worker",
+      "branch": "dev",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-openapi-turbine-repair",
       "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -866,6 +872,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "blob-devguide-go",
+      "url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",

.openpublishing.redirection.azure-kubernetes-service.json

@@ -351,12 +351,6 @@
             "redirect_url": "/cli/azure/aks#az_aks_create",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/aks/delete-cluster.md",
-            "redirect_url": "/cli/azure/aks#az_aks_delete",
-            "redirect_document_id": false
-        },
-
         {
             "source_path": "articles/aks/view-master-logs.md",
             "redirect_url": "/azure/aks/view-control-plane-logs",

.openpublishing.redirection.azure-monitor.json

@@ -5,6 +5,11 @@
             "redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
+            "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",

.openpublishing.redirection.defender-for-cloud.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
+            "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
             "redirect_url": "/azure/defender-for-cloud/manage-mcsb",

.openpublishing.redirection.json

@@ -3987,7 +3987,7 @@
         },
         {
             "source_path_from_root":"/articles/trusted-signing/concept.md",
-            "redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
+            "redirect_url":"/azure/trusted-signing/concept-trusted-signing-resources-roles",
             "redirect_document_id":false 
         },
         {

.openpublishing.redirection.sentinel.json

@@ -71,7 +71,7 @@ Currently, the Prompt Shields API supports the English language. While our API d
 
 ### Text length limitations
 
-The maximum character limit for Prompt Shields is 10,000 characters per API call, between both the user prompts and documents combines. If your input (either user prompts or documents) exceeds these character limitations, you'll encounter an error.
+The maximum character limit for Prompt Shields allows for a user prompt of up to 10,000 characters, while the document array is restricted to a maximum of 5 documents with a combined total not exceeding 10,000 characters.
 
 ### TPS limitations
 

articles/ai-services/content-safety/concepts/jailbreak-detection.md

@@ -258,14 +258,18 @@ curl --location --request POST '<endpoint>/contentsafety/text/blocklists/<your_l
 > You can add multiple blocklistItems in one API call. Make the request body a JSON array of data groups:
 >
 > ```json
-> [{
->    "description": "string",
->    "text": "bleed"
-> },
 > {
->    "description": "string",
->    "text": "blood"
-> }]
+>    "blocklistItems": [
+>        {
+>            "description": "string",
+>            "text": "bleed"
+>        },
+>        {
+>            "description": "string",
+>            "text": "blood"
+>        }
+>    ]
+>}
 > ```
 
 

articles/ai-services/content-safety/how-to/use-blocklist.md

@@ -8,25 +8,30 @@ ms.date: 12/19/2023
 ms.author: jboback
 ---
 
-[Reference documentation](/dotnet/api/azure.ai.textanalytics?preserve-view=true&view=azure-dotnet) | [Additional samples](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/textanalytics/Azure.AI.TextAnalytics/samples) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.TextAnalytics/5.2.0) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/textanalytics/Azure.AI.TextAnalytics)
+[Reference documentation](/dotnet/api/azure.ai.textanalytics?preserve-view=true&view=azure-dotnet) | [More samples](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/textanalytics/Azure.AI.TextAnalytics/samples) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.TextAnalytics/5.2.0) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/textanalytics/Azure.AI.TextAnalytics)
 
-Use this quickstart to create an entity linking application with the client library for .NET. In the following example, you will create a C# application that can identify and disambiguate entities found in text.
+Use this quickstart to create an entity linking application with the client library for .NET. In the following example, you create a C# application that can identify and disambiguate entities found in text.
 
 [!INCLUDE [Use Language Studio](../../../includes/use-language-studio.md)]
 
 ## Prerequisites
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
 * The [Visual Studio IDE](https://visualstudio.microsoft.com/vs/)
-* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics"  title="Create a Language resource"  target="_blank">create a Language resource </a> in the Azure portal to get your key and endpoint.  After it deploys, select **Go to resource**.
-    * You will need the key and endpoint from the resource you create to connect your application to the API. You'll paste your key and endpoint into the code below later in the quickstart.
-    * You can use the free pricing tier (`Free F0`) to try the service, and upgrade later to a paid tier for production.
-* To use the Analyze feature, you will need a Language resource with the standard (S) pricing tier.
-
 
 
 ## Setting up
 
+[!INCLUDE [Create an Azure resource](../../../includes/create-resource.md)]
+
+
+
+[!INCLUDE [Get your key and endpoint](../../../includes/get-key-endpoint.md)]
+
+
+
+[!INCLUDE [Create environment variables](../../../includes/environment-variables.md)]
+
 ### Create a new .NET Core application
 
 Using the Visual Studio IDE, create a new .NET Core console app. This will create a "Hello World" project with a single C# source file: *program.cs*.
@@ -37,9 +42,7 @@ Install the client library by right-clicking on the solution in the **Solution E
 
 ## Code example
 
-Copy the following code into your *program.cs* file. Remember to replace the `key` variable with the key for your resource, and replace the `endpoint` variable with the endpoint for your resource. Then run the code. 
-
-[!INCLUDE [find the key and endpoint for a resource](../../../includes/find-azure-resource-info.md)]
+Copy the following code into your *program.cs* file and run the code. 
 
 ```csharp
 using Azure;
@@ -51,8 +54,12 @@ namespace EntityLinkingExample
 {
     class Program
     {
-        private static readonly Uri endpoint = new Uri("replace-with-your-endpoint-here");
-        private static readonly AzureKeyCredential credentials = new AzureKeyCredential("replace-with-your-key-here");
+        // This example requires environment variables named "LANGUAGE_KEY" and "LANGUAGE_ENDPOINT"
+        static string languageKey = Environment.GetEnvironmentVariable("LANGUAGE_KEY");
+        static string languageEndpoint = Environment.GetEnvironmentVariable("LANGUAGE_ENDPOINT");
+
+        private static readonly AzureKeyCredential credentials = new AzureKeyCredential(languageKey);
+        private static readonly Uri endpoint = new Uri(languageEndpoint);
 
         // Example method for recognizing entities and providing a link to an online data source.
         static void EntityLinkingExample(TextAnalyticsClient client)

articles/ai-services/language-service/entity-linking/includes/quickstarts/csharp-sdk.md

@@ -10,26 +10,29 @@ ms.custom: devx-track-java
 ms.author: jboback
 ---
 
-[Reference documentation](/java/api/overview/azure/ai-textanalytics-readme?preserve-view=true&view=azure-java-stable) | [Additional samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics/src/samples) | [Package (Maven)](https://mvnrepository.com/artifact/com.azure/azure-ai-textanalytics/5.2.0) | [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics)
-
-Use this quickstart to create an entity linking application with the client library for Java. In the following example, you will create a Java application that can identify and disambiguate entities found in text.
-
-[!INCLUDE [Use Language Studio](../../../includes/use-language-studio.md)]
+[Reference documentation](/java/api/overview/azure/ai-textanalytics-readme?preserve-view=true&view=azure-java-stable) | [More samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics/src/samples) | [Package (Maven)](https://mvnrepository.com/artifact/com.azure/azure-ai-textanalytics/5.2.0) | [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics)
 
+Use this quickstart to create an entity linking application with the client library for Java. In the following example, you create a Java application that can identify and disambiguate entities found in text.
 
 ## Prerequisites
 
 * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
 * [Java Development Kit](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (JDK) with version 8 or above
-* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics"  title="Create a Language resource"  target="_blank">create a Language resource </a> in the Azure portal to get your key and endpoint.  After it deploys, select **Go to resource**.
-    * You will need the key and endpoint from the resource you create to connect your application to the API. You'll paste your key and endpoint into the code below later in the quickstart.
-    * You can use the free pricing tier (`Free F0`) to try the service, and upgrade later to a paid tier for production.
-* To use the Analyze feature, you will need a Language resource with the standard (S) pricing tier.
-
 
 
 ## Setting up
 
+[!INCLUDE [Create an Azure resource](../../../includes/create-resource.md)]
+
+
+
+[!INCLUDE [Get your key and endpoint](../../../includes/get-key-endpoint.md)]
+
+
+
+[!INCLUDE [Create environment variables](../../../includes/environment-variables.md)]
+
+
 ### Add the client library
 
 Create a Maven project in your preferred IDE or development environment. Then add the following dependency to your project's *pom.xml* file. You can find the implementation syntax [for other build tools](https://mvnrepository.com/artifact/com.azure/azure-ai-textanalytics/5.2.0) online.
@@ -48,9 +51,7 @@ Create a Maven project in your preferred IDE or development environment. Then ad
 
 ## Code example
 
-Create a Java file named `Example.java`. Open the file and copy the below code. Remember to replace the `key` variable with the key for your resource, and replace the `endpoint` variable with the endpoint for your resource. Then run the code. 
-
-[!INCLUDE [find the key and endpoint for a resource](../../../includes/find-azure-resource-info.md)]
+Create a Java file named `Example.java`. Open the file and copy the below code. Then run the code. 
 
 ```java
 import com.azure.core.credential.AzureKeyCredential;
@@ -60,11 +61,12 @@ import com.azure.ai.textanalytics.TextAnalyticsClient;
 
 public class Example {
 
-    private static String KEY = "replace-with-your-key-here";
-    private static String ENDPOINT = "replace-with-your-endpoint-here";
+    // This example requires environment variables named "LANGUAGE_KEY" and "LANGUAGE_ENDPOINT"
+    private static String languageKey = System.getenv("LANGUAGE_KEY");
+    private static String languageEndpoint = System.getenv("LANGUAGE_ENDPOINT");
 
     public static void main(String[] args) {
-        TextAnalyticsClient client = authenticateClient(KEY, ENDPOINT);
+        TextAnalyticsClient client = authenticateClient(languageKey, languageEndpoint);
         recognizeLinkedEntitiesExample(client);
     }
     // Method to authenticate the client object with your key and endpoint
@@ -144,4 +146,4 @@ Text: Altair 8800, Score: 0.88, Offset: 116, Length: 11
 * [Entity linking language support](../../language-support.md)
 * [How to call the entity linking API](../../how-to/call-api.md)  
 * [Reference documentation](/java/api/overview/azure/ai-textanalytics-readme?preserve-view=true&view=azure-java-stable)
-* [Additional samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics/src/samples)
+*[More samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/textanalytics/azure-ai-textanalytics/src/samples)