Skip to content

Commit a70a005

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into perf-js
2 parents ac72e04 + b75638d commit a70a005

File tree

189 files changed

+1195
-991
lines changed

Some content is hidden

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

189 files changed

+1195
-991
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
"branch_mapping": {}
136136
},
137137
{
138-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management-archive",
139139
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140-
"branch": "master",
140+
"branch": "archive",
141141
"branch_mapping": {}
142142
},
143143
{

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6684,6 +6684,21 @@
66846684
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
66856685
"redirect_document_id": false
66866686
},
6687+
{
6688+
"source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
6689+
"redirect_url": "/azure/copilot/overview",
6690+
"redirect_document_id": false
6691+
},
6692+
{
6693+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigator-overview.md",
6694+
"redirect_url": "/azure/copilot/overview",
6695+
"redirect_document_id": false
6696+
},
6697+
{
6698+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigate-alert-instance.md",
6699+
"redirect_url": "/azure/copilot/overview",
6700+
"redirect_document_id": false
6701+
},
66876702
{
66886703
"source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
66896704
"redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",

articles/ai-services/.openpublishing.redirection.applied-ai-services.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,5 +240,15 @@
240240
"redirect_url": "/azure/ai-services/content-moderator/term-lists-quickstart-dotnet",
241241
"redirect_document_id": false
242242
},
243+
{
244+
"source_path_from_root": "/articles/ai-services/content-safety/concepts/incident-response.md",
245+
"redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories-rapid",
246+
"redirect_document_id": true
247+
},
248+
{
249+
"source_path_from_root": "/articles/ai-services/content-safety/how-to/incident-response.md",
250+
"redirect_url": "/azure/ai-services/content-safety/how-to/custom-categories-rapid",
251+
"redirect_document_id": true
252+
}
243253
]
244254
}

articles/ai-services/content-safety/concepts/incident-response.md renamed to articles/ai-services/content-safety/concepts/custom-categories-rapid.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Incident response in Azure AI Content Safety"
2+
title: "Custom categories (rapid) in Azure AI Content Safety"
33
titleSuffix: Azure AI services
44
description: Learn about content incidents and how you can use Azure AI Content Safety to handle them on your platform.
55
#services: cognitive-services
@@ -12,15 +12,15 @@ ms.date: 04/11/2024
1212
ms.author: pafarley
1313
---
1414

15-
# Incident response
15+
# Custom categories (rapid)
1616

17-
In content moderation scenarios, incident response is the process of identifying, analyzing, containing, eradicating, and recovering from cyber incidents that involve inappropriate or harmful content on online platforms.
17+
In content moderation scenarios, custom categories (rapid) is the process of identifying, analyzing, containing, eradicating, and recovering from cyber incidents that involve inappropriate or harmful content on online platforms.
1818

1919
An incident may involve a set of emerging content patterns (text, image, or other modalities) that violate Microsoft community guidelines or the customers' own policies and expectations. These incidents need to be mitigated quickly and accurately to avoid potential live site issues or harm to users and communities.
2020

21-
## Incident response API features
21+
## Custom categories (rapid) API features
2222

23-
One way to deal with emerging content incidents is to use [Blocklists](/azure/ai-services/content-safety/how-to/use-blocklist), but that only allows exact text matching and no image matching. The Azure AI Content Safety incident response API offers the following advanced capabilities:
23+
One way to deal with emerging content incidents is to use [Blocklists](/azure/ai-services/content-safety/how-to/use-blocklist), but that only allows exact text matching and no image matching. The Azure AI Content Safety custom categories (rapid) API offers the following advanced capabilities:
2424
- semantic text matching using embedding search with a lightweight classifier
2525
- image matching with a lightweight object-tracking model and embedding search.
2626

@@ -34,11 +34,11 @@ Then, you can include your defined incident in a regular text analysis or image
3434

3535
### Language availability
3636

37-
The text incident response API supports all languages that are supported by Content Safety text moderation. See [Language support](/azure/ai-services/content-safety/language-support).
37+
The text custom categories (rapid) API supports all languages that are supported by Content Safety text moderation. See [Language support](/azure/ai-services/content-safety/language-support).
3838

3939
### Input limitations
4040

41-
See the following table for the input limitations of the incident response API:
41+
See the following table for the input limitations of the custom categories (rapid) API:
4242

4343
| Object | Limitation |
4444
| :------------ | :----------- |
@@ -56,6 +56,6 @@ To use this API, you must create your Azure AI Content Safety resource in one of
5656

5757
## Next steps
5858

59-
Follow the how-to guide to use the Azure AI Content Safety incident response API.
59+
Follow the how-to guide to use the Azure AI Content Safety custom categories (rapid) API.
6060

61-
* [Use the incident response API](../how-to/incident-response.md)
61+
* [Use the custom categories (rapid) API](../how-to/custom-categories-rapid.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sections:
2727
2828
- Azure Content Moderator uses binary classification for each content type (such as `profanity` or `adult`), while Azure AI Content Safety uses multiple classes (such as `sexual`, `violent`, `hate`, and `self-harm`) with different severity levels.
2929
- Azure AI Content Safety supports multilingual content moderation in English, German, Japanese, Spanish, French, Italian, Portuguese, and Chinese, while Azure Content Moderator's AI classifiers only support English.
30-
- Azure Content Moderator has a built-in term list and a custom term list feature, while Azure AI Content Safety does not have a built-in term list but relies on advanced language and vision models to detect harmful content. It also provides a custom term list feature for incident response and customization.
30+
- Azure Content Moderator has a built-in term list and a custom term list feature, while Azure AI Content Safety does not have a built-in term list but relies on advanced language and vision models to detect harmful content. It also provides a custom term list feature for customization.
3131
- Azure AI Content Safety has an interactive studio for exploring and testing the service capabilities, while Azure Content Moderator does not.
3232
- question: |
3333
Why should I migrate from Azure Content Moderator to Azure AI Content Safety?

articles/ai-services/content-safety/how-to/incident-response.md renamed to articles/ai-services/content-safety/how-to/custom-categories-rapid.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Use the incident response API"
2+
title: "Use the custom categories (rapid) API"
33
titleSuffix: Azure AI services
4-
description: Learn how to use the incident response API to mitigate harmful content incidents quickly.
4+
description: Learn how to use the custom categories (rapid) API to mitigate harmful content incidents quickly.
55
#services: cognitive-services
66
author: PatrickFarley
77
manager: nitinme
@@ -13,9 +13,9 @@ ms.author: pafarley
1313
---
1414

1515

16-
# Use the incident response API
16+
# Use the custom categories (rapid) API
1717

18-
The incident response API lets you quickly respond to emerging harmful content incidents. You can define an incident with a few examples in a specific topic, and the service will start detecting similar content.
18+
The custom categories (rapid) API lets you quickly respond to emerging harmful content incidents. You can define an incident with a few examples in a specific topic, and the service will start detecting similar content.
1919

2020
Follow these steps to define an incident with a few examples of text content and then analyze new text content to see if it matches the incident.
2121

@@ -37,7 +37,7 @@ Follow these steps to define an incident with a few examples of text content and
3737

3838
<!--tbd env vars-->
3939

40-
## Test the text incident response API
40+
## Test the text custom categories (rapid) API
4141

4242
Use the sample code in this section to create a text incident, add samples to the incident, deploy the incident, and then detect text incidents.
4343

@@ -231,7 +231,7 @@ print(response.text)
231231
```
232232
---
233233

234-
## Test the image incident response API
234+
## Test the image custom categories (rapid) API
235235

236236
Use the sample code in this section to create an image incident, add samples to the incident, deploy the incident, and then detect image incidents.
237237

@@ -801,5 +801,5 @@ print(response.text)
801801

802802
## Related content
803803

804-
- [Incident response concepts](../concepts/incident-response.md)
804+
- [Custom categories (rapid) concepts](../concepts/custom-categories-rapid.md)
805805
- [What is Azure AI Content Safety?](../overview.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ There are different types of analysis available from this service. The following
5050
| Prompt Shields (preview) | Scans text for the risk of a [User input attack](./concepts/jailbreak-detection.md) on a Large Language Model. [Quickstart](./quickstart-jailbreak.md) |
5151
| Groundedness detection (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) |
5252
| Protected material text detection (preview) | Scans AI-generated text for known text content (for example, song lyrics, articles, recipes, selected web content). [Quickstart](./quickstart-protected-material.md)|
53-
| Incident response API (preview) | Lets you define [emerging harmful content patterns](./concepts/incident-response.md) and scan text and images for matches. [How-to guide](./how-to/incident-response.md) |
53+
| 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) |
5454

5555
## Content Safety Studio
5656

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ items:
4747
- name: Use a blocklist
4848
href: how-to/use-blocklist.md
4949
- name: Handle harmful content incidents
50-
href: how-to/incident-response.md
50+
href: how-to/custom-categories-rapid.md
5151
- name: Encryption of data at rest
5252
href: how-to/encrypt-data-at-rest.md
5353
- name: Migrate from public preview to GA
@@ -64,8 +64,8 @@ items:
6464
href: concepts/jailbreak-detection.md
6565
- name: Groundedness detection
6666
href: concepts/groundedness.md
67-
- name: Incident response
68-
href: concepts/incident-response.md
67+
- name: Custom categories (rapid)
68+
href: concepts/custom-categories-rapid.md
6969
- name: Reference
7070
items:
7171
- name: Azure AI Content Safety REST API

articles/ai-services/content-safety/whats-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Learn what's new in the service. These items might be release notes, videos, blo
1919
## May 2024
2020

2121

22-
### Incident response API
22+
### Custom categories (rapid) API
2323

24-
The incident response API lets you quickly define emerging harmful content patterns and scan text and images for matches. See [Incident response](./concepts/incident-response.md) to learn more.
24+
The custom categories (rapid) API lets you quickly define emerging harmful content patterns and scan text and images for matches. See [Custom categories (rapid)](./concepts/custom-categories-rapid.md) to learn more.
2525

2626
## March 2024
2727

articles/ai-services/document-intelligence/concept-add-on-capabilities.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ Document Intelligence supports more sophisticated and modular analysis capabilit
5454

5555
> [!NOTE]
5656
>
57-
> Not all add-on capabilities are supported by all models. For more information, *see* [model data extraction](concept-model-overview.md#model-analysis-features).
57+
> * Not all add-on capabilities are supported by all models. For more information, *see* [model data extraction](concept-model-overview.md#model-analysis-features).
58+
>
59+
> * Add-on capabilities are currently not supported for Microsoft Office file types.
5860
5961
The following add-on capabilities are available for`2024-02-29-preview`, `2024-02-29-preview`, and later releases:
6062

0 commit comments

Comments
 (0)