Merge branch 'MicrosoftDocs:main' into 240718-arc-sql-private-link

Author: MikeRayMSFT

.openpublishing.redirection.azure-app-configuration.json

@@ -24,6 +24,11 @@
             "source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
             "redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
+            "redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.baremetal-infrastructure.json

@@ -139,6 +139,36 @@
             "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
             "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
             "redirect_document_id": false
-        }       
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        }
     ]
 }

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

@@ -1,10 +1,15 @@
 {
     "redirections": [
         {
-            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "source_path_from_root": "/articles/defender-for-cloud/multicloud.yml",
             "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "redirect_url": "/azure/defender-for-cloud/plan-multicloud-security-get-started",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
             "redirect_url": "/azure/defender-for-cloud/security-policy-concept",

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-image.md

@@ -51,9 +51,7 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
   "image": {
     "content": "<base_64_string>"
   },
-  "categories": [
-    "Hate", "SelfHarm", "Sexual", "Violence"
-  ],
+  "categories": ["Hate", "SelfHarm", "Sexual", "Violence"],
   "outputType": "FourSeverityLevels"
 }'
 ```
@@ -63,9 +61,9 @@ curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-versi
 >
 > ```
 > {
->  "image": {
->    "blobUrl": "<your_storage_url>"
->  }
+>   "image": {
+>     "blobUrl": "<your_storage_url>"
+>   }
 > }
 > ```
 
@@ -91,24 +89,24 @@ You should see the image moderation results displayed as JSON data in the consol
 
 ```json
 {
-    "categoriesAnalysis": [
-        {
-            "category": "Hate",
-            "severity": 2
-        },
-        {
-            "category": "SelfHarm",
-            "severity": 0
-        },
-        {
-            "category": "Sexual",
-            "severity": 0
-        },
-        {
-            "category": "Violence",
-            "severity": 0
-        }
-    ]
+  "categoriesAnalysis": [
+    {
+      "category": "Hate",
+      "severity": 2
+    },
+    {
+      "category": "SelfHarm",
+      "severity": 0
+    },
+    {
+      "category": "Sexual",
+      "severity": 0
+    },
+    {
+      "category": "Violence",
+      "severity": 0
+    }
+  ]
 }
 ```
 

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-text.md

@@ -36,14 +36,10 @@ curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-versio
 --header 'Content-Type: application/json' \
 --data-raw '{
   "text": "I hate you",
-  "categories": [
-   "Hate","Sexual","SelfHarm","Violence"
-  ],
-   "blocklistNames": [
-      "string"
-    ],
-   "haltOnBlocklistHit": true,
-   "outputType": "FourSeverityLevels"
+  "categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
+  "blocklistNames": ["string"],
+  "haltOnBlocklistHit": true,
+  "outputType": "FourSeverityLevels"
 }'
 ```
 
@@ -68,12 +64,8 @@ See the following sample request body:
 ```json
 {
   "text": "I hate you",
-  "categories": [
-   "Hate","Sexual","SelfHarm","Violence"
-  ],
-  "blocklistNames": [
-    "array"
-  ],
+  "categories": ["Hate", "Sexual", "SelfHarm", "Violence"],
+  "blocklistNames": ["array"],
   "haltOnBlocklistHit": false,
   "outputType": "FourSeverityLevels"
 }
@@ -96,21 +88,22 @@ You should see the text moderation results displayed as JSON data in the console
     }
   ],
   "categoriesAnalysis": [
-        {
-            "category": "Hate",
-            "severity": 2
-        },
-        {
-            "category": "SelfHarm",
-            "severity": 0
-        },
-        {
-            "category": "Sexual",
-            "severity": 0
-        },
-        {
-            "category": "Violence",
-            "severity": 0
+    {
+      "category": "Hate",
+      "severity": 2
+    },
+    {
+      "category": "SelfHarm",
+      "severity": 0
+    },
+    {
+      "category": "Sexual",
+      "severity": 0
+    },
+    {
+      "category": "Violence",
+      "severity": 0
+    }
   ]
 }
 ```

articles/ai-services/content-safety/quickstart-custom-categories.md

@@ -61,9 +61,9 @@ curl -X PUT "<your_endpoint>/contentsafety/text/categories/survival-advice?api-v
      -H "Ocp-Apim-Subscription-Key: <your_api_key>" \
      -H "Content-Type: application/json" \
      -d "{
-        \"categoryName\": \"survival-advice\",
-        \"definition\": \"text prompts about survival advice in camping/wilderness situations\",
-        \"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
+            \"categoryName\": \"survival-advice\",
+            \"definition\": \"text prompts about survival advice in camping/wilderness situations\",
+            \"sampleBlobUrl\": \"https://<your-azure-storage-url>/example-container/survival-advice.jsonl\"
         }"
 ```
 
@@ -95,9 +95,9 @@ curl -X POST "<your_endpoint>/contentsafety/text:analyzeCustomCategory?api-versi
      -H "Ocp-Apim-Subscription-Key: <your_api_key>" \
      -H "Content-Type: application/json" \
      -d "{
-        \"text\": \"<Example text to analyze>\",
-        \"categoryName\": \"survival-advice\", 
-        \"version\": 1
+            \"text\": \"<Example text to analyze>\",
+            \"categoryName\": \"survival-advice\", 
+            \"version\": 1
         }"
 ```
 

articles/ai-services/content-safety/quickstart-groundedness.md

@@ -45,7 +45,7 @@ This section walks through a sample request with cURL. Paste the command below i
       "domain": "Generic",
       "task": "QnA",
       "qna": {
-           "query": "How much does she currently get paid per hour at the bank?"
+        "query": "How much does she currently get paid per hour at the bank?"
       },
       "text": "12/hour",
       "groundingSources": [
@@ -108,11 +108,13 @@ To test a summarization task instead of a question answering (QnA) task, use the
 
 ```json
 {
-    "domain": "Medical",
-    "task": "Summarization",
-    "text": "Ms Johnson has been in the hospital after experiencing a stroke.",
-    "groundingSources": ["Our patient, Ms. Johnson, presented with persistent fatigue, unexplained weight loss, and frequent night sweats. After a series of tests, she was diagnosed with Hodgkin’s lymphoma, a type of cancer that affects the lymphatic system. The diagnosis was confirmed through a lymph node biopsy revealing the presence of Reed-Sternberg cells, a characteristic of this disease. She was further staged using PET-CT scans. Her treatment plan includes chemotherapy and possibly radiation therapy, depending on her response to treatment. The medical team remains optimistic about her prognosis given the high cure rate of Hodgkin’s lymphoma."],
-    "reasoning": false
+  "domain": "Medical",
+  "task": "Summarization",
+  "text": "Ms Johnson has been in the hospital after experiencing a stroke.",
+  "groundingSources": [
+    "Our patient, Ms. Johnson, presented with persistent fatigue, unexplained weight loss, and frequent night sweats. After a series of tests, she was diagnosed with Hodgkin’s lymphoma, a type of cancer that affects the lymphatic system. The diagnosis was confirmed through a lymph node biopsy revealing the presence of Reed-Sternberg cells, a characteristic of this disease. She was further staged using PET-CT scans. Her treatment plan includes chemotherapy and possibly radiation therapy, depending on her response to treatment. The medical team remains optimistic about her prognosis given the high cure rate of Hodgkin’s lymphoma."
+  ],
+  "reasoning": false
 }
 ```
 
@@ -140,13 +142,13 @@ After you submit your request, you'll receive a JSON response reflecting the Gro
 
 ```json
 {
-    "ungroundedDetected": true,
-    "ungroundedPercentage": 1,
-    "ungroundedDetails": [
-        {
-            "text": "12/hour."
-        }
-    ]
+  "ungroundedDetected": true,
+  "ungroundedPercentage": 1,
+  "ungroundedDetails": [
+    {
+      "text": "12/hour."
+    }
+  ]
 }
 ```
 
@@ -176,7 +178,7 @@ In order to use your Azure OpenAI GPT4-Turbo (1106-preview) resource to enable t
 In your request to the Groundedness detection API, set the `"reasoning"` body parameter to `true`, and provide the other needed parameters:
 
 ```json
- {
+{
   "reasoning": true,
   "llmResource": {
     "resourceType": "AzureOpenAI",
@@ -203,7 +205,7 @@ This section walks through a sample request with cURL. Paste the command below i
       "domain": "Generic",
       "task": "QnA",
       "qna": {
-           "query": "How much does she currently get paid per hour at the bank?"
+        "query": "How much does she currently get paid per hour at the bank?"
       },
       "text": "12/hour",
       "groundingSources": [
@@ -291,24 +293,24 @@ After you submit your request, you'll receive a JSON response reflecting the Gro
 
 ```json
 {
-    "ungroundedDetected": true,
-    "ungroundedPercentage": 1,
-    "ungroundedDetails": [
-        {
-            "text": "12/hour.",
-            "offset": {
-                "utf8": 0,
-                "utf16": 0,
-                "codePoint": 0
-            },
-            "length": {
-                "utf8": 8,
-                "utf16": 8,
-                "codePoint": 8
-            },
-            "reason": "None. The premise mentions a pay of \"10/hour\" but does not mention \"12/hour.\" It's neutral. "
-        }
-    ]
+  "ungroundedDetected": true,
+  "ungroundedPercentage": 1,
+  "ungroundedDetails": [
+    {
+      "text": "12/hour.",
+      "offset": {
+        "utf8": 0,
+        "utf16": 0,
+        "codePoint": 0
+      },
+      "length": {
+        "utf8": 8,
+        "utf16": 8,
+        "codePoint": 8
+      },
+      "reason": "None. The premise mentions a pay of \"10/hour\" but does not mention \"12/hour.\" It's neutral. "
+    }
+  ]
 }
 ```
 

articles/ai-services/content-safety/quickstart-protected-material.md

@@ -37,7 +37,7 @@ curl --location --request POST '<endpoint>/contentsafety/text:detectProtectedMat
 --header 'Ocp-Apim-Subscription-Key: <your_subscription_key>' \
 --header 'Content-Type: application/json' \
 --data-raw '{
-  "text": "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine, they\'re yours, they\'re mine. and love can come to everyone, the best things in life are"
+  "text": "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"
 }'
 ```
 The below fields must be included in the url:

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/csharp-sdk.md

@@ -5,7 +5,7 @@ author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 05/23/2024
+ms.date: 07/18/2024
 ms.author: lajanuar
 ms.custom: devx-track-csharp, ignite-2023, linux-related-content
 monikerRange: 'doc-intel-4.0.0'
@@ -16,7 +16,7 @@ monikerRange: 'doc-intel-4.0.0'
 <!-- markdownlint-disable MD033 -->
 <!-- markdownlint-disable MD034 -->
 
-[Client library](/dotnet/api/overview/azure/ai.documentintelligence-readme?view=azure-dotnet-preview&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.DocumentIntelligence/1.0.0-beta.2/index.html) | [REST API reference](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true) | [Package](https://www.nuget.org/packages/Azure.AI.DocumentIntelligence/1.0.0-beta.2)| [Samples]( https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/README.md)|[Supported REST API versions](../../sdk-overview-v4-0.md)
+[Client library](/dotnet/api/overview/azure/ai.documentintelligence-readme?view=azure-dotnet-preview&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.DocumentIntelligence/1.0.0-beta.2/index.html) | [REST API reference](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true) | [Package](https://www.nuget.org/packages/Azure.AI.DocumentIntelligence/1.0.0-beta.2)| [Samples]( https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/README.md)|[Supported REST API versions](../../../sdk-overview-v4-0.md)
 
 ## Prerequisites
 
@@ -786,4 +786,4 @@ if (identityDocument.Fields.TryGetValue("Sex", out DocumentField sexfield))
 
 ```
 
-Visit the Azure samples repository on GitHub and view the [id-document model output](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/dotnet/FormRecognizer/how-to-guide/id-document-model-output.md).
+Visit the Azure samples repository on GitHub and view the [ID document model output](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/dotnet/FormRecognizer/how-to-guide/id-document-model-output.md).

articles/ai-services/document-intelligence/how-to-guides/use-sdk-rest-api.md

@@ -7,7 +7,7 @@ manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.custom: devx-track-dotnet, devx-track-extended-java, devx-track-js, devx-track-python, ignite-2023, linux-related-content
 ms.topic: how-to
-ms.date: 06/11/2024
+ms.date: 07/18/2024
 ms.author: lajanuar
 zone_pivot_groups: programming-languages-set-formre
 ---
@@ -68,7 +68,7 @@ Choose from the following Document Intelligence models and analyze and extract d
 ::: zone pivot="programming-language-csharp"
 
 ::: moniker range="doc-intel-4.0.0"
-[!INCLUDE [C# SDK quickstart](includes/v3-0/csharp-sdk.md)]
+[!INCLUDE [C# SDK quickstart](includes/v4-0/csharp-sdk.md)]
 ::: moniker-end
 
 ::: moniker range="doc-intel-3.1.0 || doc-intel-3.0.0"