Skip to content

Commit 5337a72

Browse files
authored
Merge pull request #279713 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents f9ba2cd + c143eb7 commit 5337a72

File tree

78 files changed

+2430
-7254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2430
-7254
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,6 +4192,11 @@
41924192
"source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
41934193
"redirect_url": "/azure",
41944194
"redirect_document_id": false
4195+
},
4196+
{
4197+
"source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-clearpass.md",
4198+
"redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
4199+
"redirect_document_id": false
41954200
}
41964201

41974202
]

.openpublishing.redirection.sentinel.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,6 +1624,16 @@
16241624
"source_path_from_root": "/articles/sentinel/data-connectors/fortinet.md",
16251625
"redirect_url": "/azure/sentinel/data-connectors/deprecated-fortinet-via-legacy-agent",
16261626
"redirect_document_id": true
1627+
},
1628+
{
1629+
"source_path_from_root": "/articles/sentinel/data-connectors/cisco-stealthwatch.md",
1630+
"redirect_url": "/azure/sentinel/data-connectors-reference",
1631+
"redirect_document_id": false
1632+
},
1633+
{
1634+
"source_path_from_root": "/articles/sentinel/data-connectors/hyas-protect.md",
1635+
"redirect_url": "/azure/sentinel/data-connectors-reference",
1636+
"redirect_document_id": false
16271637
}
16281638
]
16291639
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
title: "Protected material detection in Azure AI Content Safety"
3+
titleSuffix: Azure AI services
4+
description: Learn about Protected material detection and the related flags that the Azure AI Content Safety service returns.
5+
services: cognitive-services
6+
author: PatrickFarley
7+
manager: nitinme
8+
ms.service: azure-ai-content-safety
9+
ms.topic: conceptual
10+
ms.date: 06/24/2024
11+
ms.author: pafarley
12+
keywords:
13+
---
14+
15+
16+
# Protected material detection
17+
18+
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.
19+
20+
## Protected material examples
21+
22+
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.
23+
24+
| Category | Scope | Considered acceptable | Considered harmful |
25+
|---|-------|---|--------|--|
26+
| 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> |
27+
| 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> |
28+
| 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> |
29+
| 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> |
30+
31+
32+
33+
## Next steps
34+
35+
Follow the quickstart to get started using Azure AI Content Safety to detect protected material.
36+
37+
> [!div class="nextstepaction"]
38+
> [Detect protected material](../quickstart-protected-material.md)
39+
40+
41+
42+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.author: pafarley
2020
> [!NOTE]
2121
> **Language auto-detection**
2222
>
23-
> You don't need to specify a language code for text moderation. The service automatically detects your input language.
23+
> You don't need to specify a language code for text moderation and Prompt Shields. The service automatically detects your input language.
2424
2525
| Language name | Language code | Supported Languages | Specially trained languages|
2626
|-----------------------|---------------|--------|--|

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ There are different types of analysis available from this service. The following
4747
| :-------------------------- | :---------------------- |
4848
| [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) |
4949
| [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) |
50-
| [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)|
50+
| [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)|
5151
| 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) |
5252
| [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. |
5353
| [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.
120120
- Maximum text and query length: 7,500 characters.
121121
- **Protected material detection (preview)**:
122122
- Default maximum length: 1K characters.
123-
- Minimum length: 111 characters (for scanning LLM completions, not user prompts).
123+
- Default minimum length: 110 characters (for scanning LLM completions, not user prompts).
124124

125125

126126
### Language support

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: pafarley
1313

1414
# Quickstart: Detect protected material (preview)
1515

16-
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).
16+
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).
1717

1818
## Prerequisites
1919

articles/ai-services/content-safety/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ items:
6161
href: concepts/jailbreak-detection.md
6262
- name: Groundedness detection
6363
href: concepts/groundedness.md
64+
- name: Protected material detection
65+
href: concepts/protected-material.md
6466
- name: Custom categories (rapid)
6567
href: concepts/custom-categories-rapid.md
6668
- name: Harm categories

articles/ai-studio/how-to/prompt-flow-tools/index-lookup-tool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The prompt flow Index Lookup tool enables the use of common vector indices (such
2121

2222
## Build with the Index Lookup tool
2323

24+
1. If you have a flow that contains one of the deprecated legacy index tools ( the Vector Index Lookup tool, Vector DB Lookup tool, and Faiss Index Lookup tool) you will first need to [upgrade your flow](#upgrade-your-tools).
2425
1. Create or open a flow in [Azure AI Studio](https://ai.azure.com). For more information, see [Create a flow](../flow-develop.md).
2526
1. Select **+ More tools** > **Index Lookup** to add the Index Lookup tool to your flow.
2627

@@ -140,7 +141,6 @@ The following JSON format response is an example returned by the tool that inclu
140141
]
141142

142143
```
143-
144144
## Migrate from legacy tools to the Index Lookup tool
145145

146146
The Index Lookup tool looks to replace the three deprecated legacy index tools: the Vector Index Lookup tool, the Vector DB Lookup tool, and the Faiss Index Lookup tool.

articles/aks/app-routing.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,14 @@ az aks create \
6363

6464
### Enable on an existing cluster
6565

66-
To enable application routing on an existing cluster, use the [`az aks approuting enable`][az-aks-approuting-enable] command.
66+
To enable application routing on an existing cluster, use the [`az aks approuting enable`][az-aks-approuting-enable] or the [`az aks enable-addons`][az-aks-enable-addons] command with the `--addons` parameter set to `http_application_routing`.
6767

6868
```azurecli-interactive
69+
# az aks approuting enable
6970
az aks approuting enable --resource-group <ResourceGroupName> --name <ClusterName>
71+
72+
# az aks enable-addons
73+
az aks enable-addons --resource-group <ResourceGroupName> --name <ClusterName> --addons http_application_routing
7074
```
7175

7276
# [Open Service Mesh (OSM) (retired)](#tab/with-osm)

articles/app-service/configure-ssl-certificate.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,18 +311,19 @@ After the certificate renews inside your key vault, App Service automatically sy
311311

312312
## Frequently asked questions
313313

314-
- [How can I automate adding a bring-your-owncertificate to an app?](#how-can-i-automate-adding-a-bring-your-owncertificate-to-an-app)
315-
- [Frequently asked questions for App Service certificates](configure-ssl-app-service-certificate.md#frequently-asked-questions)
316-
#### How can I automate adding a bring-your-owncertificate to an app?
314+
### How can I automate adding a bring-your-owncertificate to an app?
317315

318316
- [Azure CLI: Bind a custom TLS/SSL certificate to a web app](scripts/cli-configure-ssl-certificate.md)
319317
- [Azure PowerShell Bind a custom TLS/SSL certificate to a web app using PowerShell](scripts/powershell-configure-ssl-certificate.md)
320318

321-
#### Can I configure a private CA certificate on my app?
322-
323-
App Service has a list of Trusted Root Certificates which you cannot modify in the multi-tenant variant version of App Service, but you can load your own CA certificate in the Trusted Root Store in an App Service Environment (ASE), which is a single-tenant environment in App Service. (The Free, Basic, Standard, and Premium App Service Plans are all multi-tenant, and the Isolated Plans are single-tenant.)
324-
- [Private client certificate](environment/overview-certificates.md)
325-
319+
### Can I use a private CA (certificate authority) certificate for inbound TLS on my app?
320+
You can use a private CA certificate for inbound TLS in an [App Service Environment version 3 (ASEv3)](./environment/overview-certificates.md). This isn't possible in App Service (multi-tenant). For more information on App Service multi-tenant vs. single-tenant, see [App Service Environment v3 and App Service public multitenant comparison](./environment/ase-multi-tenant-comparison.md).
321+
322+
### Can I make outbound calls using a private CA (certificate authority) client certificate from my app?
323+
This is only supported for Windows container apps in multi-tenant App Service. In addition, you can make outbound calls using a private CA client certificate with both code-based and container-based apps in an [App Service Environment version 3 (ASEv3)](./environment/overview-certificates.md). For more information on App Service multi-tenant vs. single-tenant, see [App Service Environment v3 and App Service public multitenant comparison](./environment/ase-multi-tenant-comparison.md).
324+
325+
### Can I load a private CA (certificate authority) certificate in my App Service Trusted Root Store?
326+
You can load your own CA certificate into the Trusted Root Store in an [App Service Environment version 3 (ASEv3)](./environment/overview-certificates.md). You can't modify the list of Trusted Root Certificates in App Service (multi-tenant). For more information on App Service multi-tenant vs. single-tenant, see [App Service Environment v3 and App Service public multitenant comparison](./environment/ase-multi-tenant-comparison.md).
326327

327328
## More resources
328329

0 commit comments

Comments
 (0)