Skip to content

Commit a0d67bd

Browse files
ShawnJacksonShawnJackson
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into azure-dev-tools-teaching
2 parents 637dee9 + ac416d7 commit a0d67bd

File tree

268 files changed

+5540
-2052
lines changed

Some content is hidden

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

268 files changed

+5540
-2052
lines changed

‎.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4004,6 +4004,11 @@
40044004
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
40054005
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
40064006
"redirect_document_id":false
4007-
}
4007+
},
4008+
{
4009+
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
4010+
"redirect_url":"/azure/aks/generation-2-vm",
4011+
"redirect_document_id":false
4012+
}
40084013
]
40094014
}

‎.openpublishing.redirection.operator-5g-core.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"redirect_document_id": false
1717
},
1818
{
19-
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
20-
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
19+
"source_path_from_root": "/articles/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service.md",
20+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",
2121
"redirect_document_id": false
2222
},
2323
{
@@ -49,6 +49,11 @@
4949
"source_path_from_root": "/articles/operator-5g-core/quickstart-perform-checks-post-deployment.md",
5050
"redirect_url": "/azure/operator-5g-core/quickstart-configure-extension-for-status-monitoring",
5151
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
55+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
56+
"redirect_document_id": false
5257
}
5358
]
5459
}

‎.openpublishing.redirection.sentinel.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,11 +1180,6 @@
11801180
"redirect_url": "/azure/sentinel/data-connectors-reference",
11811181
"redirect_document_id": false
11821182
},
1183-
{
1184-
"source_path_from_root": "/articles/sentinel/data-connectors/sonicwall-firewall.md",
1185-
"redirect_url": "/azure/sentinel/data-connectors-reference",
1186-
"redirect_document_id": false
1187-
},
11881183
{
11891184
"source_path_from_root": "/articles/sentinel/data-connectors/varmour-application-controller.md",
11901185
"redirect_url": "/azure/sentinel/data-connectors-reference",

‎articles/active-directory-b2c/add-captcha.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kengaderdus
55
manager: mwongerapk
66
ms.service: active-directory
77
ms.topic: how-to
8-
ms.date: 03/01/2024
8+
ms.date: 05/03/2024
99
ms.custom: project-no-code
1010
ms.author: kengaderdus
1111
ms.subservice: B2C
@@ -234,9 +234,9 @@ For the various page layouts, use the following page layout versions:
234234

235235
|Page layout |Page layout version range |
236236
|---------|---------|
237-
| Selfasserted | >=2.1.29 |
238-
| Unifiedssp | >=2.1.17 |
239-
| Multifactor | >=1.2.15 |
237+
| Selfasserted | >=2.1.30 |
238+
| Unifiedssp | >=2.1.18 |
239+
| Multifactor | >=1.2.16 |
240240

241241
**Example:**
242242

@@ -331,4 +331,4 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
331331
## Next steps
332332

333333
- Learn how to [Define a CAPTCHA technical profile](captcha-technical-profile.md).
334-
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).
334+
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).

‎articles/ai-services/openai/concepts/models.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ This table doesn't include fine-tuning regional availability, consult the dedica
142142

143143
[!INCLUDE [Provisioned](../includes/model-matrix/provisioned-models.md)]
144144

145+
> [!NOTE]
146+
> The provisioned version of `gpt-4` **Version:** `turbo-2024-04-09` is currently limited to text only.
147+
145148
### How do I get access to Provisioned?
146149

147150
You need to speak with your Microsoft sales/account team to acquire provisioned throughput. If you don't have a sales/account team, unfortunately at this time, you cannot purchase provisioned throughput.

‎articles/ai-services/openai/concepts/provisioned-throughput.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ You need to speak with your Microsoft sales/account team to acquire provisioned
4444

4545
[!INCLUDE [Provisioned](../includes/model-matrix/provisioned-models.md)]
4646

47+
> [!NOTE]
48+
> The provisioned version of `gpt-4` **Version:** `turbo-2024-04-09` is currently limited to text only.
49+
4750
## Key concepts
4851

4952
### Provisioned throughput units

‎articles/ai-services/openai/how-to/chat-markup-language.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to work with Chat Markup Language (preview)
55
author: mrbullwinkle #dereklegenzoff
66
ms.author: mbullwin #delegenz
77
ms.service: azure-ai-openai
8-
ms.topic: include
8+
ms.topic: how-to
99
ms.date: 04/05/2024
1010
manager: nitinme
1111
keywords: ChatGPT

‎articles/ai-services/openai/includes/gpt-4-turbo.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This is the replacement for the following preview models:
1818
- `gpt-4` **Version:** `0125-Preview`
1919
- `gpt-4` **Version:** `vision-preview`
2020

21-
### Differences between OpenAI and Azure OpenAI GPT-4 Turbo with Vision GA model
21+
### Differences between OpenAI and Azure OpenAI GPT-4 Turbo GA Models
2222

2323
- OpenAI's version of the latest `0409` turbo model supports JSON mode and function calling for all inference requests.
2424
- Azure OpenAI's version of the latest `turbo-2024-04-09` currently doesn't support the use of JSON mode and function calling when making inference requests with image (vision) input. Text based input requests (requests without `image_url` and inline images) do support JSON mode and function calling.
@@ -27,9 +27,13 @@ This is the replacement for the following preview models:
2727

2828
- Azure AI specific Vision enhancements integration with GPT-4 Turbo with Vision aren't supported for `gpt-4` **Version:** `turbo-2024-04-09`. This includes Optical Character Recognition (OCR), object grounding, video prompts, and improved handling of your data with images.
2929

30+
### GPT-4 Turbo provisioned managed availability
31+
32+
- `gpt-4` **Version:** `turbo-2024-04-09` is available for both standard and provisioned deployments. Currently the provisioned version of this model **doesn't support image/vision inference requests**. Provisioned deployments of this model only accept text input. Standard model deployments accept both text and image/vision inference requests.
33+
3034
### Region availability
3135

32-
For information on model regional availability consult the [model matrix](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability).
36+
For information on model regional availability consult the model matrix for [standard](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability), and [provisioned deployments](../concepts/models.md#provisioned-deployment-model-availability).
3337

3438
### Deploying GPT-4 Turbo with Vision GA
3539

‎articles/ai-services/openai/includes/model-matrix/provisioned-models.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ description: PTU-managed model availability by region.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 04/29/2024
8+
ms.date: 05/06/2024
99
---
1010

11-
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12-
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13-
| australiaeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
14-
| brazilsouth | ✅ | ✅ | - | ✅ | ✅ | - |
15-
| canadacentral | ✅ | - | - | ✅ | - | ✅ |
16-
| canadaeast | ✅ | ✅ | - | - | ✅ | - |
17-
| eastus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
18-
| eastus2 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
19-
| francecentral | ✅ | ✅ | ✅ | ✅ | - | ✅ |
20-
| germanywestcentral | ✅ | ✅ | ✅ | ✅ | ✅ | - |
21-
| japaneast | - | ✅ | ✅ | - | - | ✅ |
22-
| koreacentral | ✅ | - | - | ✅ | ✅ | - |
23-
| northcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
24-
| norwayeast | ✅ | - | ✅ | ✅ | - | - |
25-
| polandcentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
26-
| southafricanorth | ✅ | ✅ | - | ✅ | ✅ | - |
27-
| southcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
28-
| southindia | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
29-
| swedencentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
30-
| switzerlandnorth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
31-
| switzerlandwest | - | - | - | - | - | ✅ |
32-
| uksouth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
33-
| westus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
34-
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
11+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12+
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-------------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13+
| australiaeast | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
14+
| brazilsouth | ✅ | ✅ | - | - | ✅ | ✅ | - |
15+
| canadacentral | ✅ | - | - | - | ✅ | - | ✅ |
16+
| canadaeast | ✅ | ✅ | - | - | - | ✅ | - |
17+
| eastus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
18+
| eastus2 | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
19+
| francecentral | ✅ | ✅ | ✅ | - | ✅ | - | ✅ |
20+
| germanywestcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | - |
21+
| japaneast | - | ✅ | ✅ | - | - | - | ✅ |
22+
| koreacentral | ✅ | - | - | - | ✅ | ✅ | - |
23+
| northcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
24+
| norwayeast | ✅ | - | ✅ | - | ✅ | - | - |
25+
| polandcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
26+
| southafricanorth | ✅ | ✅ | - | - | ✅ | ✅ | - |
27+
| southcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
28+
| southindia | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
29+
| swedencentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
30+
| switzerlandnorth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
31+
| switzerlandwest | - | - | - | - | - | - | ✅ |
32+
| uksouth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
33+
| westus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
34+
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |

‎articles/ai-services/openai/includes/model-matrix/standard-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ ms.date: 03/28/2024
2828
| uksouth | - | ✅ | ✅ | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
2929
| westeurope | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31-
| westus3 | - | ✅ | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31+
| westus3 | - | ✅ | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - |

0 commit comments

Comments
 (0)