fixing merge conflicts

Author: ShawnJackson

.openpublishing.publish.config.json

@@ -986,6 +986,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-app-service-sqldb-dotnetcore",
+      "url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",

.openpublishing.redirection.education.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
+            "redirect_url": "/articles/education-hub/about-education-hub.md",
+            "redirect_document_id": false
+        }
+    ]
+    }

.openpublishing.redirection.json

@@ -4192,7 +4192,18 @@
            "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
             "redirect_url": "/azure",
             "redirect_document_id": false
+        },
+        {
+
+           "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-site-recovery",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-clearpass.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
+            "redirect_document_id": false
         }
-       
+
     ]
 }

.openpublishing.redirection.sentinel.json

@@ -1624,6 +1624,16 @@
             "source_path_from_root": "/articles/sentinel/data-connectors/fortinet.md",
             "redirect_url": "/azure/sentinel/data-connectors/deprecated-fortinet-via-legacy-agent",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/cisco-stealthwatch.md",
+            "redirect_url": "/azure/sentinel/data-connectors-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/hyas-protect.md",
+            "redirect_url": "/azure/sentinel/data-connectors-reference",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.virtual-desktop.json

@@ -434,6 +434,11 @@
             "source_path_from_root": "/articles/virtual-desktop/configure-rdp-shortpath-limit-ports-public-networks.md",
             "redirect_url": "/azure/virtual-desktop/configure-rdp-shortpath",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/disaster-recovery.md",
+            "redirect_url": "/azure/virtual-desktop/disaster-recovery-concepts",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 06/05/2024
+ms.date: 07/01/2024
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: whats-new
@@ -19,6 +19,14 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
+## June 2024
+
+### Updated articles
+
+- [Define an OAuth2 custom error technical profile in an Azure Active Directory B2C custom policy](oauth2-error-technical-profile.md) - Error code updates
+- [Configure authentication in a sample Python web app by using Azure AD B2C](configure-authentication-sample-python-web-app.md) - Python version update
+
+
 ## May 2024
 
 ### New articles
@@ -45,10 +53,3 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 - [Localization string IDs](localization-string-ids.md) - CAPTCHA updates
 - [Page layout versions](page-layout.md) - CAPTCHA updates
 
-## January 2024
-
-### Updated articles
-
-- [Tutorial: Configure Nok Nok Passport with Azure Active Directory B2C for passwordless FIDO2 authentication](partner-nok-nok.md) - Updated Nok Nok instructions 
-- [Configure Transmit Security with Azure Active Directory B2C for passwordless authentication](partner-bindid.md) - Updated Transmit Security instructions
-- [About claim resolvers in Azure Active Directory B2C custom policies](claim-resolver-overview.md) - Updated claim resolvers and user journey

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

@@ -0,0 +1,42 @@
+---
+title: "Protected material detection in Azure AI Content Safety"
+titleSuffix: Azure AI services
+description: Learn about Protected material detection and the related flags that the Azure AI Content Safety service returns.
+services: cognitive-services
+author: PatrickFarley
+manager: nitinme
+ms.service: azure-ai-content-safety
+ms.topic: conceptual
+ms.date: 06/24/2024
+ms.author: pafarley
+keywords: 
+---
+
+
+# Protected material detection
+
+The [Protected material text API](../quickstart-protected-material.md) flags known text content (for example, song lyrics, articles, recipes, and selected web content) that might be output by large language models. This guide provides details about the kind of content that the protected material API detects.
+
+## Protected material examples
+
+Refer to this table for details of the major categories of protected material text detection. All four categories are applied when you call the API.
+
+| Category | Scope  | Considered acceptable  | Considered harmful    |
+|---|-------|---|--------|--|
+| Recipes     | Copyrighted content related to Recipes.   <br><br> Other harmful or sensitive text is out of scope for this task, unless it intersects with Recipes IP copyright harm. | <ul><li>Links to web pages that contain information about recipes  </li><li>Any content from recipes that have no or low IP/Copyright protections: <ul><li>Lists of ingredients</li><li>Basic instructions for combining and cooking ingredients</li></ul></li><li>Rejection or refusal to provide copyrighted content: <ul><li>Changing a topic to avoid sharing copyrighted content</li><li>Refusal to share copyrighted content</li><li>Providing nonresponsive information</li></ul></li></ul> | <ul><li>Other literary content in a recipe <ul><li>Matching anecdotes, stories, or personal commentary about the recipe (40 characters or more)</li><li>Creative names for the recipe that are not limited to the well-known name of the dish, or a plain descriptive summary of the dish indicating what the primary ingredient is (40 characters or more)</li><li>Creative descriptions of the ingredients or steps for combining or cooking ingredients, including descriptions that contain more information than needed to create the dish, rely on imprecise wording, or contain profanity (40 characters or more)</li></ul></li><li>Methods to access copyrighted content:<ul><li>Ways to bypass paywalls to access recipes</li></ul></li></ul> |
+| Web Content | All websites that have `webmd.com` as their URL domain name. Only focuses on issues of copyrighted content around Selected Web Content. <br><br> Other harmful or sensitive text is out of scope for this task, unless it intersects Selected Web Content harm. | <ul><li>Links to web pages </li><li>Short excerpts or snippets of Selected Web Content as long as:<ul><li>They are relevant to the user's query</li><li>They are fewer than 200 characters</li></ul></li></ul>    | <ul><li>Substantial content of Selected Web Content  <ul><li>Response sections longer than 200 characters that bear substantial similarity to a block of text from the Selected Web Content</li><li>Excerpts from Selected Web Content that are longer than 200 characters</li><li>Quotes from Selected Web Content that are longer than 200 characters</li></ul></li><li>Methods to access copyrighted content:<ul><li>Ways to bypass paywalls or DRM protections to access copyrighted Selected Web Content</li></ul></li></ul>           |
+| News        | Only focus on issues of copyrighted content around News. <br><br> Other harmful or sensitive text is out of scope for this task, unless it intersects News IP Copyright harm. | <ul><li>Links to web pages that host news or information about news, magazines, or blog articles as long as:<ul><li>They have legitimate permissions</li><li>They have licensed news coverage</li><li>They are authorized platforms</li></ul></li><li>Links to authorized web pages that contain embedded audio/video players as long as:<ul><li>They have legitimate permissions</li><li>They have licensed news coverage</li><li>They are authorized streaming platforms</li><li>They are official YouTube channels</li></ul></li><li>Short excerpts/snippets like headlines or captions from news articles as long as:<ul><li>They are relevant to the user's query</li><li>They are not a substantial part of the article</li><li>They are not the entire article</li></ul></li><li>Summary of news articles as long as:<ul><li>It is relevant to the user's query</li><li>It is brief and factual</li><li>It does not copy/paraphrase a substantial part of the article</li><li>It is clearly and visibly cited as a summary</li></ul></li><li>Analysis/Critique/Review of news articles as long as:<ul><li>It is relevant to the user's query</li><li>It is brief and factual</li><li>It does not copy/paraphrase a substantial part of the article</li><li>It is clearly and visibly cited as an analysis/critique/review</li></ul></li><li>Any news content that has no IP/Copyright protections:<ul><li>News/Magazines/Blogs that are in the public domain</li><li>News/Magazines/Blogs for which Copyright protection has elapsed, been surrendered, or never existed</li></ul></li><li>Rejection or refusal to provide copyrighted content:<ul><li>Changing topic to avoid sharing copyrighted content</li><li>Refusal to share copyrighted content</li><li>Providing nonresponsive information</li></ul></li></ul> | <ul><li>Links to pdf or any other file containing full text of news/magazine/blog articles, unless:<ul><li>They are sourced from authorized platforms with legitimate permissions and licenses</li></ul></li><li>News content<ul><li>More than 200 characters taken verbatim from any news article</li><li>More than 200 characters substantially similar to a block of text from any news article</li><li>Direct access to news/magazine/blog articles that are behind paywalls</li></ul></li><li>Methods to access copyrighted content:<ul><li>Steps to download news from an unauthorized website</li><li>Ways to bypass paywalls or DRM protections to access copyrighted news or videos</li></ul></li></ul>       |
+| Lyrics      | Only focuses on issues of copyrighted content around Songs.     <br><br> Other harmful or sensitive text is out of scope for this task, unless it intersects Songs IP Copyright harm. | <ul><li>Links to web pages that contain information about songs such as:<ul><li>Lyrics of the songs</li><li>Chords or tabs of the associated music</li><li>Analysis or reviews of the song/music</li></ul></li><li>Links to authorized web pages that contain embedded audio/video players as long as:<ul><li>They have legitimate permissions</li><li>They have licensed music</li><li>They are authorized streaming platforms</li><li>They are official YouTube channels</li></ul></li><li>Short excerpts or snippets from lyrics of the songs as long as:<ul><li>They are relevant to the user's query</li><li>They are not a substantial part of the lyrics</li><li>They are not the entire lyrics</li><li>They are not more than 11 words long</li></ul></li><li>Short excerpts or snippets from chords/tabs of the songs as long as:<ul><li>They are relevant to the user's query</li><li>They are not a substantial part of the chords/tabs</li><li>They are not the entire chords/tabs</li></ul></li><li>Any content from songs that have no IP/Copyright protections:<ul><li>Songs/Lyrics/Chords/Tabs that are in the public domain</li><li>Songs/Lyrics/Chords/Tabs for which Copyright protection has elapsed, been surrendered, or never existed</li></ul></li><li>Rejection or refusal to provide copyrighted content:<ul><li>Changing topic to avoid sharing copyrighted content</li><li>Refusal to share copyrighted content</li><li>Providing nonresponsive information</li></ul></li></ul>         | <ul><li>Lyrics of a song<ul><li>Entire lyrics</li><li>Substantial part of the lyrics</li><li>Part of lyrics that contain more than 11 words</li></ul></li><li>Chords or Tabs of a song<ul><li>Entire chords/tabs</li><li>Substantial part of the chords/tabs</li></ul></li><li>Links to webpages that contain embedded audio/video players that:<ul><li>Do not have legitimate permissions</li><li>Do not have licensed music</li><li>Are not authorized streaming platforms</li><li>Are not official YouTube channels</li></ul></li><li>Methods to access copyrighted content:<ul><li>Steps to download songs from an unauthorized website</li><li>Ways to bypass paywalls or DRM protections to access copyrighted songs or videos</li></ul></li></ul>   |
+
+
+
+## Next steps
+
+Follow the quickstart to get started using Azure AI Content Safety to detect protected material.
+
+> [!div class="nextstepaction"]
+> [Detect protected material](../quickstart-protected-material.md)
+
+
+
+

articles/ai-services/content-safety/language-support.md

@@ -20,7 +20,7 @@ ms.author: pafarley
 > [!NOTE]
 > **Language auto-detection**
 >
-> You don't need to specify a language code for text moderation. The service automatically detects your input language.
+> You don't need to specify a language code for text moderation and Prompt Shields. The service automatically detects your input language.
 
 | Language name         | Language code | Supported Languages | Specially trained languages|
 |-----------------------|---------------|--------|--|

articles/ai-services/content-safety/overview.md

@@ -47,7 +47,7 @@ There are different types of analysis available from this service. The following
 | :-------------------------- | :---------------------- |
 | [Prompt Shields](/rest/api/cognitiveservices/contentsafety/text-operations/detect-text-jailbreak) (preview) | Scans text for the risk of a [User input attack](./concepts/jailbreak-detection.md) on a Large Language Model. [Quickstart](./quickstart-jailbreak.md) |
 | [Groundedness detection](/rest/api/cognitiveservices/contentsafety/text-groundedness-detection-operations/detect-groundedness-options) (preview) | Detects whether the text responses of large language models (LLMs) are grounded in the source materials provided by the users. [Quickstart](./quickstart-groundedness.md) |
-| [Protected material text detection](/rest/api/cognitiveservices/contentsafety/text-operations/detect-text-protected-material) (preview) | Scans AI-generated text for known text content (for example, song lyrics, articles, recipes, selected web content). [Quickstart](./quickstart-protected-material.md)|
+| [Protected material text detection](/rest/api/cognitiveservices/contentsafety/text-operations/detect-text-protected-material) (preview) | Scans AI-generated text for [known text content](./concepts/protected-material.md) (for example, song lyrics, articles, recipes, selected web content). [Quickstart](./quickstart-protected-material.md)|
 | Custom categories (rapid) API (preview) | Lets you define [emerging harmful content patterns](./concepts/custom-categories-rapid.md) and scan text and images for matches. [How-to guide](./how-to/custom-categories-rapid.md) |
 | [Analyze text](/rest/api/cognitiveservices/contentsafety/text-operations/analyze-text) API          | Scans text for sexual content, violence, hate, and self harm with multi-severity levels. |
 | [Analyze image](/rest/api/cognitiveservices/contentsafety/image-operations/analyze-image) API         | Scans images for sexual content, violence, hate, and self harm with multi-severity levels. |
@@ -120,7 +120,7 @@ See the following list for the input requirements for each feature.
   - Maximum text and query length: 7,500 characters.
 - **Protected material detection (preview)**: 
   - Default maximum length: 1K characters.
-  - Minimum length: 111 characters (for scanning LLM completions, not user prompts).
+  - Default minimum length: 110 characters (for scanning LLM completions, not user prompts).
 
 
 ### Language support

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

@@ -13,7 +13,7 @@ ms.author: pafarley
 
 # Quickstart: Detect protected material (preview)
 
-The protected material text describes language that matches known text content (for example, song lyrics, articles, recipes, selected web content). This feature can be used to identify and block known text content from being displayed in language model output (English content only).
+Protected material text describes language that matches known text content (for example, song lyrics, articles, recipes, selected web content). This feature can be used to identify and block known text content from being displayed in language model output (English content only).
 
 ## Prerequisites