Skip to content

Commit fa5ad35

Browse files
PatrickFarleyPatrickFarley
committed
Merge branch 'release-build-ai-foundry-non-FDP-features' of https://github.com/MicrosoftDocs/azure-ai-docs-pr into foundry-build
2 parents c27e2a5 + 222dd80 commit fa5ad35

30 files changed

+192
-244
lines changed

‎articles/ai-foundry/includes/create-content-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For any model deployment in [Azure AI Foundry](https://ai.azure.com), you can di
2020
2121
Follow these steps to create a content filter:
2222

23-
1. Go to [Azure AI Foundry](https://ai.azure.com) and navigate to your project. Then select the **Guardrails & controls** page from the left menu and select the **Content filters** tab.
23+
1. Go to [Azure AI Foundry](https://ai.azure.com) and navigate to your project. Then select the **Guardrails + controls** page from the left menu and select the **Content filters** tab.
2424

2525
:::image type="content" source="../media/content-safety/content-filter/create-content-filter.png" alt-text="Screenshot of the button to create a new content filter." lightbox="../media/content-safety/content-filter/create-content-filter.png":::
2626
1. Select **+ Create content filter**.

‎articles/ai-foundry/includes/use-blocklists.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: include
1313

1414
## Create a blocklist
1515

16-
1. Go to [Azure AI Foundry](https://ai.azure.com/) and navigate to your project. Then select the **Guardrails & controls** page on the left nav and select the **Blocklists** tab.
16+
1. Go to [Azure AI Foundry](https://ai.azure.com/) and navigate to your project. Then select the **Guardrails + controls** page on the left nav and select the **Blocklists** tab.
1717

1818
:::image type="content" source="../media/content-safety/content-filter/select-blocklists.png" lightbox="../media/content-safety/content-filter/select-blocklists.png" alt-text="Screenshot of the Blocklists page tab.":::
1919

@@ -25,7 +25,7 @@ ms.custom: include
2525

2626
## Attach a blocklist to a content filter configuration
2727

28-
1. Once the blocklist is ready, go back to the **Guardrails & controls** page and select the **Content filters** tab. Create a new content filter configuration. This opens a wizard with several content filter components.
28+
1. Once the blocklist is ready, go back to the **Guardrails + controls** page and select the **Content filters** tab. Create a new content filter configuration. This opens a wizard with several AI content safety components.
2929

3030
:::image type="content" source="../media/content-safety/content-filter/create-content-filter.png" lightbox="../media/content-safety/content-filter/create-content-filter.png" alt-text="Screenshot of the Create content filter button.":::
3131

‎articles/ai-foundry/media/content-safety/content-filter/create-content-filter.png

-72.9 KB
Loading

‎articles/ai-foundry/media/content-safety/content-filter/deployment-edit.png

-86.7 KB
Loading

‎articles/ai-foundry/media/content-safety/content-filter/input-filter.png

-21.7 KB
Loading

‎articles/ai-foundry/media/content-safety/content-filter/output-filter.png

-76.6 KB
Loading

‎articles/ai-foundry/media/content-safety/content-filter/select-blocklists.png

-55.7 KB
Loading

‎articles/ai-foundry/responsible-use-of-ai-overview.md

Lines changed: 13 additions & 128 deletions
Large diffs are not rendered by default.

‎articles/ai-services/language-service/concepts/regional-support.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Conversational language understanding and orchestration workflow are only availa
3030
|--------------------|-----------|-------------|
3131
| Australia East | ✓ | ✓ |
3232
| Brazil South | | ✓ |
33-
| Canada Central | | ✓ |
33+
| Canada Central | ✓ | ✓ |
34+
| Canada East | | ✓ |
3435
| Central India | ✓ | ✓ |
3536
| Central US | | ✓ |
3637
| China East 2 | ✓ | ✓ |
@@ -39,8 +40,11 @@ Conversational language understanding and orchestration workflow are only availa
3940
| East US | ✓ | ✓ |
4041
| East US 2 | ✓ | ✓ |
4142
| France Central | | ✓ |
43+
| Germany West Central| | ✓ |
44+
| Italy North | | ✓ |
4245
| Japan East | | ✓ |
4346
| Japan West | | ✓ |
47+
| Jio India Central | | ✓ |
4448
| Jio India West | | ✓ |
4549
| Korea Central | | ✓ |
4650
| North Central US | | ✓ |
@@ -54,6 +58,7 @@ Conversational language understanding and orchestration workflow are only availa
5458
| Switzerland North | ✓ | ✓ |
5559
| UAE North | | ✓ |
5660
| UK South | ✓ | ✓ |
61+
| UK West | | ✓ |
5762
| West Central US | | ✓ |
5863
| West Europe | ✓ | ✓ |
5964
| West US | | ✓ |
@@ -68,15 +73,18 @@ Custom named entity recognition is only available in some Azure regions. Some re
6873
|--------------------|-----------|-------------|
6974
| Australia East | ✓ | ✓ |
7075
| Brazil South | | ✓ |
71-
| Canada Central | | ✓ |
76+
| Canada Central | ✓ | ✓ |
77+
| Canada East | | ✓ |
7278
| Central India | ✓ | ✓ |
7379
| Central US | | ✓ |
7480
| East Asia | | ✓ |
7581
| East US | ✓ | ✓ |
7682
| East US 2 | ✓ | ✓ |
7783
| France Central | | ✓ |
84+
| Germany West Central| | ✓ |
7885
| Japan East | | ✓ |
7986
| Japan West | | ✓ |
87+
| Jio India Central | | ✓ |
8088
| Jio India West | | ✓ |
8189
| Korea Central | | ✓ |
8290
| North Central US | | ✓ |
@@ -90,6 +98,7 @@ Custom named entity recognition is only available in some Azure regions. Some re
9098
| Switzerland North | ✓ | ✓ |
9199
| UAE North | | ✓ |
92100
| UK South | ✓ | ✓ |
101+
| UK West | | ✓ |
93102
| West Central US | | ✓ |
94103
| West Europe | ✓ | ✓ |
95104
| West US | | ✓ |
@@ -105,15 +114,18 @@ Custom text classification is only available in some Azure regions. Some regions
105114
|--------------------|-----------|-------------|
106115
| Australia East | ✓ | ✓ |
107116
| Brazil South | | ✓ |
108-
| Canada Central | | ✓ |
117+
| Canada Central | ✓ | ✓ |
118+
| Canada East | | ✓ |
109119
| Central India | ✓ | ✓ |
110120
| Central US | | ✓ |
111121
| East Asia | | ✓ |
112122
| East US | ✓ | ✓ |
113123
| East US 2 | ✓ | ✓ |
114124
| France Central | | ✓ |
125+
| Germany West Central| | ✓ |
115126
| Japan East | | ✓ |
116127
| Japan West | | ✓ |
128+
| Jio India Central | | ✓ |
117129
| Jio India West | | ✓ |
118130
| Korea Central | | ✓ |
119131
| North Central US | | ✓ |
@@ -127,6 +139,7 @@ Custom text classification is only available in some Azure regions. Some regions
127139
| Switzerland North | ✓ | ✓ |
128140
| UAE North | | ✓ |
129141
| UK South | ✓ | ✓ |
142+
| UK West | | ✓ |
130143
| West Central US | | ✓ |
131144
| West Europe | ✓ | ✓ |
132145
| West US | | ✓ |
@@ -166,4 +179,4 @@ Custom text classification is only available in some Azure regions. Some regions
166179
### Next steps
167180

168181
* [Language support](./language-support.md)
169-
* [Quotas and limits](./data-limits.md)
182+
* [Quotas and limits](./data-limits.md)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ These models are currently available for use in Azure OpenAI Service.
110110
| `gpt-4.1-nano` | 2025-04-14 | No earlier than April 11, 2026 | |
111111
| `gpt-4o` | 2024-05-13 | No earlier than June 30, 2025 | `gpt-4.1` version: `2025-04-14` |
112112
| `gpt-4o` | 2024-08-06 | No earlier than August 6, 2025 | `gpt-4.1` version: `2025-04-14` |
113-
| `gpt-4o` | 2024-11-20 | No earlier than March 1, 2026 | `gpt-4.1` version: `2025-04-14` |
114-
| `gpt-4o-mini` | 2024-07-18 | August 16, 2025 | `gpt-4.1-mini` version: `2025-04-14` |
113+
| `gpt-4o` | 2024-11-20 | No earlier than March 1, 2026 | `gpt-4.1` version: `2025-04-14` |
114+
| `gpt-4o-mini` | 2024-07-18 | No earlier than August 16, 2025 | `gpt-4.1-mini` version: `2025-04-14` |
115115
| `gpt-3.5-turbo-instruct` | 0914 | No earlier than May 31, 2025 | |
116116
| `gpt-image-1` | 2025-04-15 | No earlier than August 01, 2025 | |
117117
| `o1-preview` | 2024-09-12 | May 29, 2025 | `o1` |

0 commit comments

Comments
 (0)