Skip to content

Commit 801dfe5

Browse files
PatrickFarleyPatrickFarley
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-ai-docs-pr into consaf-updates
2 parents c6e29a2 + bd5930d commit 801dfe5

File tree

16 files changed

+534
-99
lines changed

16 files changed

+534
-99
lines changed

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

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,31 @@ For more information, see [Language support](/azure/ai-services/content-safety/l
140140

141141
To use the Content Safety APIs, you must create your Azure AI Content Safety resource in the supported regions. Currently, the Content Safety features are available in the following Azure regions:
142142

143-
|Region | Moderation APIs<br>(text and image) | Prompt Shields | Protected material<br>detection | Groundedness<br>detection (preview) | Custom categories<br>(rapid) (preview) | Custom categories<br>(standard) | Blocklists |
144-
|---|---|---|---|---|---|---|--|
145-
| East US | ✅ | ✅| ✅ |✅ |✅ |✅|✅ |
146-
| East US 2 | ✅ | | | ✅ |✅ | |✅|
147-
| West US | | | | | ✅ | | |
148-
| West US 2 | ✅ | | | |✅ | |✅ |
149-
| Central US | ✅ | | | | | |✅ |
150-
| North Central US | ✅ | | | |✅ | | ✅|
151-
| South Central US | ✅ | | | | ✅| |✅ |
152-
| Canada East | ✅ | | | | ✅| | ✅|
153-
| Switzerland North | ✅ | | | |✅ | ✅ | ✅|
154-
| Sweden Central | ✅ | | |✅ |✅ | | ✅|
155-
| UK South | ✅ | | | | ✅| |✅ |
156-
| France Central | ✅ | | | |✅ | | ✅|
157-
| West Europe | ✅ | ✅ |✅ | |✅ | |✅ |
158-
| Japan East | ✅ | | | |✅ | |✅ |
159-
| Australia East| ✅ | | | |✅ | ✅| ✅|
160-
| USGov Arizona | ✅ | | | | | | |
161-
| USGov Virginia | ✅ | | | | | | |
143+
| Region | Moderation APIs (text and image) | Prompt Shields | Protected material detection for Text | Groundedness detection (preview) | Custom categories (rapid) (preview) | Custom categories (standard) | Blocklists |
144+
|---------------------|----------------------------------|----------------|--------------------------------------|-----------------------------------|------------------------------------|-------------------------------|------------|
145+
| East US | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
146+
| East US 2 | ✅ | | ✅ | ✅ | ✅ | | ✅ |
147+
| West US | | ✅ | ✅ | | ✅ | | |
148+
| West US 2 | ✅ | ✅ | ✅ | | ✅ | | ✅ |
149+
| West US 3 | ✅ | ✅ | ✅ | | ✅ | | ✅ |
150+
| Poland Central | ✅ | ✅ | ✅ | | ✅ | | ✅ |
151+
| South East Asia | ✅ | | ✅ | | ✅ | | ✅ |
152+
| Central US | ✅ | | ✅ | | ✅ | | ✅ |
153+
| North Central US | ✅ | | ✅ | | ✅ | | ✅ |
154+
| South Central US | ✅ | | ✅ | | ✅ | | ✅ |
155+
| Canada East | ✅ | ✅ | ✅ | | ✅ | | ✅ |
156+
| Switzerland North | ✅ | ✅ | ✅ | | ✅ | ✅ | ✅ |
157+
| Sweden Central | ✅ | ✅ | ✅ | ✅ | ✅ | | ✅ |
158+
| UK South | ✅ | | ✅ | | ✅ | | ✅ |
159+
| France Central | ✅ | ✅ | ✅ | | ✅ | | ✅ |
160+
| West Europe | ✅ | ✅ | ✅ | | ✅ | | ✅ |
161+
| Japan East | ✅ | ✅ | ✅ | | ✅ | | ✅ |
162+
| Australia East | ✅ | ✅ | ✅ | | ✅ | | ✅ |
163+
| South India | ✅ | | ✅ | | ✅ | ✅ | ✅ |
164+
| USGov Arizona | ✅ | ✅ | ✅ | | | | |
165+
| USGov Virginia | ✅ | ✅ | ✅ | | | | |
166+
167+
162168

163169
Feel free to [contact us](mailto:[email protected]) if you need other regions for your business.
164170

‎articles/ai-services/openai/concepts/content-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The default content filtering configuration for the GPT model series is set to f
9090
| High | Yes| Yes | Content detected at severity levels low and medium isn't filtered. Only content at severity level high is filtered. Requires approval<sup>1</sup>.|
9191
| No filters | If approved<sup>1</sup>| If approved<sup>1</sup>| No content is filtered regardless of severity level detected. Requires approval<sup>1</sup>.|
9292

93-
<sup>1</sup> For Azure OpenAI models, only customers who have been approved for modified content filtering have full content filtering control and can off turn content filters. Apply for modified content filters via this form: [Azure OpenAI Limited Access Review: Modified Content Filters](https://ncv.microsoft.com/uEfCgnITdR) For Azure Government customers, please apply for modified content filters via this form: [Azure Government - Request Modified Content Filtering for Azure OpenAI Service](https://aka.ms/AOAIGovModifyContentFilter).
93+
<sup>1</sup> For Azure OpenAI models, only customers who have been approved for modified content filtering have full content filtering control and can turn off content filters. Apply for modified content filters via this form: [Azure OpenAI Limited Access Review: Modified Content Filters](https://ncv.microsoft.com/uEfCgnITdR) For Azure Government customers, please apply for modified content filters via this form: [Azure Government - Request Modified Content Filtering for Azure OpenAI Service](https://aka.ms/AOAIGovModifyContentFilter).
9494

9595
Configurable content filters for inputs (prompts) and outputs (completions) are available for the following Azure OpenAI models:
9696

‎articles/ai-services/speech-service/speech-synthesis-markup-voice.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ The following table describes the usage of the `<lang xml:lang>` element's attri
244244

245245
> [!NOTE]
246246
> The `<lang xml:lang>` element is incompatible with the `prosody` and `break` elements. You can't adjust pause and prosody like pitch, contour, rate, or volume in this element.
247+
>
248+
> Non-multilingual voices don't support the `<lang xml:lang>` element by design.
247249
248250
### Multilingual voices with the lang element
249251

0 commit comments

Comments
 (0)