Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI258499-anh-dep

Author: ElazarK

.openpublishing.publish.config.json

@@ -896,6 +896,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "storage-mgmt-devguide-dotnet",
+      "url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",

.openpublishing.redirection.json

@@ -4950,6 +4950,16 @@
             "redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
@@ -4964,7 +4974,17 @@
           "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
           "redirect_url":"/azure/operational-excellence/relocation-container-registry",
           "redirect_document_id":false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
+            "redirect_document_id": false
+        }  
 
     ]
 }

articles/active-directory-b2c/direct-signin.md

@@ -69,9 +69,9 @@ The domain hint query string parameter can set to one of the following domains:
 - linkedin.com
 - microsoft.com
 - qq.com
-- twitter.com
 - wechat.com
 - weibo.com 
+- x.com
 - For [Generic OpenID Connect](identity-provider-generic-openid-connect.md), see [Domain hint](identity-provider-generic-openid-connect.md#response-mode).
 
 ::: zone-end
@@ -89,4 +89,4 @@ To support domain hint parameter, you can configure the domain name using the `<
     ...
 ```
 
-::: zone-end
+::: zone-end

articles/advisor/advisor-reference-cost-recommendations.md

@@ -172,6 +172,9 @@ We've analyzed the usage patterns of your virtual machine scale sets over the pa
 
 Learn more about [Virtual machine scale set - LowUsageVmss (Right-size or shutdown underutilized virtual machine scale sets)](https://aka.ms/aa_lowusagerec_vmss_learnmore).
 
+> [!TIP]  
+> If you're unsure whether you can shut down an idle resource without causing chaos, you can first restrict access to the resource. Make sure the resource's role is restricted, too. Leave the resource up for a few weeks, and if nobody has connected to it or has complained, chances are the resource can be shut down safely.
+
 ### Use Virtual Machines with Ephemeral OS Disk enabled to save cost and get better performance
 
 With Ephemeral OS Disk, You get these benefits: Save on storage cost for OS disk. Get lower read/write latency to OS disk. Faster VM Reimage operation by resetting OS (and Temporary disk) to its original state. It's preferable to use Ephemeral OS Disk for short-lived IaaS VMs or VMs with stateless workloads.

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

@@ -86,7 +86,7 @@ This shield aims to safeguard against attacks that use information not directly
 
 ### Language availability
 
-Currently, the Prompt Shields API supports the English language. While our API doesn't restrict the submission of non-English content, we can't guarantee the same level of quality and accuracy in the analysis of such content. We recommend users to primarily submit content in English to ensure the most reliable and accurate results from the API.
+Prompt Shields have been specifically trained and tested on the following languages: Chinese, English, French, German, Italian, Japanese, Portuguese. However, the feature can work in many other languages, but the quality might vary. In all cases, you should do your own testing to ensure that it works for your application.
 
 ### Text length limitations
 

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

@@ -236,16 +236,16 @@ items:
     - name: Composed models
       displayName: custom, assign, modelId, model ID
       href:  concept-composed-models.md
-- name: Samples
+- name: Code samples
   items:
   - name: "C#/.NET"
-    href: /dotnet/api/overview/azure/ai.formrecognizer-readme?view=azure-dotnet#examples&preserve-view=true
+    href:  https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/.NET(v4.0)/README.md
   - name: "Java"
-    href: /java/api/overview/azure/ai-formrecognizer-readme?view=azure-java-stable#examples&preserve-view=true
+    href:  https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Java(v4.0)/README.md
   - name: "Python"
-    href: /python/api/overview/azure/ai-formrecognizer-readme?view=azure-python#examples&preserve-view=true
+    href:  https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Layout_model/README.md
   - name: "JavaScript"
-    href: /javascript/api/overview/azure/ai-form-recognizer-readme?view=azure-node-latest#examples&preserve-view=true
+    href:  https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/JavaScript(v4.0)/README.md
 - name: Responsible AI
   items:
   - name: Transparency note

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 07/18/2024
+ms.date: 07/30/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -93,9 +93,9 @@ These models are currently available for use in Azure OpenAI Service.
 | `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0613 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
-| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later **<sup>1</sup>** |
-| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later  **<sup>1</sup>**  |
-| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later  **<sup>1</sup>** |
+| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later **<sup>1</sup>** |
+| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>**  |
+| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>** |
 | `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
 | `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
 | `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |
@@ -143,11 +143,18 @@ If you're an existing customer looking for information about these models, see [
 
 ## Retirement and deprecation history
 
-## July 18, 2024
+### July 30, 2024
+
+* Updated `gpt-4` preview model upgrade date to November 15, 2024 or later for the following versions:
+  * 1106-preview
+  * 0125-preview
+  * vision-preview
+
+### July 18, 2024
 
 * Updated `gpt-4` 0613  deprecation date to October 1, 2024 and the retirement date to June 6, 2025.
 
-## June 19, 2024
+### June 19, 2024
 
 * Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
 * Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.

articles/ai-studio/.openpublishing.redirection.ai-studio.json

@@ -84,6 +84,16 @@
             "source_path_from_root": "/articles/ai-studio/how-to/model-catalog.md",
             "redirect_url": "/azure/ai-studio/how-to/model-catalog-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/ai-studio/how-to/llmops-azure-devops-prompt-flow.md",
+            "redirect_url": "/azure/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/ai-studio/how-to/llmops-github-prompt-flow.md",
+            "redirect_url": "/azure/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow",
+            "redirect_document_id": false
         }
     ]
 }