Skip to content

Commit 40b80a0

Browse files
halkazwinihalkazwini
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ip-08
2 parents 4a86d4a + eb5e240 commit 40b80a0

File tree

46 files changed

+400
-350
lines changed

Some content is hidden

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

46 files changed

+400
-350
lines changed

‎articles/ai-services/openai/how-to/batch.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: nitinme
66
ms.service: azure-ai-openai
77
ms.custom:
88
ms.topic: how-to
9-
ms.date: 08/04/2024
9+
ms.date: 08/12/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
recommendations: false
@@ -51,8 +51,9 @@ Global batch is currently supported in the following regions:
5151
The following models support global batch:
5252

5353
| Model | Version | Supported |
54-
|---|---|
54+
|---|---|---|
5555
|`gpt-4o` | 2024-05-13 |Yes (text + vision) |
56+
|`gpt-4o-mini` | 2024-07-18 | Yes (text + vision) |
5657
|`gpt-4` | turbo-2024-04-09 | Yes (text only) |
5758
|`gpt-4` | 0613 | Yes |
5859
| `gpt-35-turbo` | 0125 | Yes |

‎articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ You can use the following policy to disable access to Azure OpenAI global standa
114114

115115
To learn about creating resources and deploying models refer to the [resource creation guide](./create-resource.md).
116116

117-
## Retrieve batch job output file
118-
119-
120117

121118
## See also
122119

‎articles/ai-services/openai/includes/global-batch-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The table shows the batch quota limit. Quota values for global batch are represe
2323
|Model|Enterprise agreement|Default| Monthly credit card based subscriptions | MSDN subscriptions | Azure for Students, Free Trials |
2424
|---|---|---|---|---|---|
2525
| `gpt-4o` | 5 B | 50 M | 1.35 M | 90 K | N/A|
26+
| `gpt-4o-mini` | 5 B | 50 M | 1.35 M | 90 K | N/A |
2627
| `gpt-4-turbo` | 300 M | 40 M | 1.35 M | 90 K | N/A |
2728
| `gpt-4` | 150 M | 5 M | 200 K | 100 K | N/A |
2829
| `gpt-35-turbo` | 10 B | 100 M | 5 M | 2 M | 50 K |

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

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

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Standard GPT-4 model availability
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/01/2024
8+
ms.date: 08/12/2024
99
---
1010

1111
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4o-mini**, **2024-07-18** | **gpt-4-32k**, **0613** |
@@ -23,6 +23,5 @@ ms.date: 08/01/2024
2323
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | ✅ | - | ✅ |
2424
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ |
2525
| uksouth | - | ✅ | ✅ | - | - | - | - | - |
26-
| westeurope | - | - | - | - | ✅ | - | - | - |
2726
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - |
28-
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |
27+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Quota and limits for Azure OpenAI by region.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/01/2024
8+
ms.date: 08/12/2024
99
---
1010

1111

@@ -26,6 +26,6 @@ ms.date: 08/01/2024
2626
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | ✅ | - | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | ✅ | - | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
2727
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ | - | ✅ | - | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - | - |
2828
| uksouth | - | ✅ | ✅ | - | - | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |
29-
| westeurope | - | - | - | - | ✅ | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | ✅ |
29+
| westeurope | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | - |
31-
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - | - | - | - | - | - | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |
31+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - | - | - | - | - | - | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |

‎articles/application-gateway/for-containers/quickstart-create-application-gateway-for-containers-byo-deployment.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-application-gateway
77
ms.subservice: appgw-for-containers
88
ms.custom: devx-track-azurecli
99
ms.topic: quickstart
10-
ms.date: 02/27/2024
10+
ms.date: 08/12/2024
1111
ms.author: greglin
1212
---
1313

@@ -86,9 +86,6 @@ az network vnet subnet update \
8686
ALB_SUBNET_ID=$(az network vnet subnet list --resource-group $VNET_RESOURCE_GROUP --vnet-name $VNET_NAME --query "[?name=='$ALB_SUBNET_NAME'].id" --output tsv)
8787
echo $ALB_SUBNET_ID
8888
```
89-
90-
> [!NOTE]
91-
> The NSG for the delegated subnet can only use the default rules for incoming traffic. For example: AllowVNetInBound, AllowAzureLoadBalancerInBound, and DenyAllInbound. No other incoming NSG rule is supported.
9289

9390
### Delegate permissions to managed identity
9491

0 commit comments

Comments
 (0)