Skip to content

Commit 28b2828

Browse files
dlepowdlepow
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into apiverret
2 parents 5429c58 + bc88783 commit 28b2828

File tree

297 files changed

+3890
-2405
lines changed

Some content is hidden

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

297 files changed

+3890
-2405
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,12 @@
356356
"branch": "main",
357357
"branch_mapping": {}
358358
},
359+
{
360+
"path_to_root": "azure-functions-python-worker",
361+
"url": "https://github.com/Azure/azure-functions-python-worker",
362+
"branch": "dev",
363+
"branch_mapping": {}
364+
},
359365
{
360366
"path_to_root": "functions-openapi-turbine-repair",
361367
"url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",

‎.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,6 @@
351351
"redirect_url": "/cli/azure/aks#az_aks_create",
352352
"redirect_document_id": false
353353
},
354-
{
355-
"source_path_from_root": "/articles/aks/delete-cluster.md",
356-
"redirect_url": "/cli/azure/aks#az_aks_delete",
357-
"redirect_document_id": false
358-
},
359-
360354
{
361355
"source_path": "articles/aks/view-master-logs.md",
362356
"redirect_url": "/azure/aks/view-control-plane-logs",

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
5+
"redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
510
"redirect_url": "/azure/defender-for-cloud/manage-mcsb",

‎.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3987,7 +3987,7 @@
39873987
},
39883988
{
39893989
"source_path_from_root":"/articles/trusted-signing/concept.md",
3990-
"redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
3990+
"redirect_url":"/azure/trusted-signing/concept-trusted-signing-resources-roles",
39913991
"redirect_document_id":false
39923992
},
39933993
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
181181
| `gpt-35-turbo-16k` (0613) | 16,384 | Sep 2021 |
182182
| `gpt-35-turbo-instruct` (0914) | 4,097 |Sep 2021 |
183183
| `gpt-35-turbo` (1106) | Input: 16,385<br> Output: 4,096 | Sep 2021|
184-
| `gpt-35-turbo` (0125) **NEW** | 16,385 | Sep 2021 |
184+
| `gpt-35-turbo` (0125) **NEW** | Input: 16,385<br> Output: 4,096 | Sep 2021 |
185185

186186
### GPT-3.5-Turbo model availability
187187

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

Lines changed: 2 additions & 2 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: 03/13/2024
8+
ms.date: 04/26/2024
99
---
1010

1111
The default quota for models varies by model and region. Default quota limits are subject to change.
@@ -18,7 +18,7 @@ Quota for standard deployments is described in of terms of [Tokens-Per-Minute (T
1818
| brazilsouth | - | - | - | - | - | - | 350 K | - | - | - | - | - | - | - | - | - |
1919
| canadaeast | 40 K | 80 K | 80 K | - | 300 K | - | 350 K | 350 K | 350 K | - | - | - | - | - | - | - |
2020
| eastus | - | - | 80 K | - | 240 K | 240 K | 240 K | 350 K | 350 K | - | - | - | - | - | - | - |
21-
| eastus2 | - | 80 K | 80 K | - | 300 K | - | 350 K | 350 K | 350 K | - | - | - | - | 250 K | 250 K | 250 K |
21+
| eastus2 | - | - | 80 K | - | 300 K | - | 350 K | 350 K | 350 K | - | - | - | - | 250 K | 250 K | 250 K |
2222
| francecentral | 20 K | 60 K | 80 K | - | 240 K | - | 240 K | - | - | - | - | - | - | - | - | - |
2323
| japaneast | - | - | - | 30 K | 300 K | - | 350 K | - | - | - | - | - | - | - | - | - |
2424
| northcentralus | - | - | 80 K | - | 300 K | - | 350 K | - | - | 240 K | 250 K | 240 K | 250 K | 250 K | 250 K | 250 K |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `text-embedding-ada-002`, `1` | `text-embedding-ada-002`, `2` | `text-embedding-3-small`, `1` | `text-embedding-3-large`, `1` |
11+
| **Region** | **text-embedding-ada-002**, **1** | **text-embedding-ada-002**, **2** | **text-embedding-3-small**, **1** | **text-embedding-3-large**, **1** |
1212
|:-----------------|:---------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|
1313
| australiaeast | - | ✅ | - | - |
1414
| brazilsouth | - | ✅ | - | - |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `gpt-35-turbo`, `0301` | `gpt-35-turbo`, `0613` | `gpt-35-turbo`, `1106` | `gpt-35-turbo`, `0125` | `gpt-35-turbo-16k`, `0613` | `gpt-35-turbo-instruct`, `0914` |
11+
| **Region** | **gpt-35-turbo**, **0301** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-35-turbo-16k**, **0613** | **gpt-35-turbo-instruct**, **0914** |
1212
|:-----------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:------------------------------:|:-----------------------------------:|
1313
| australiaeast | - | ✅ | ✅ | - | ✅ | - |
1414
| canadaeast | - | ✅ | ✅ | ✅ | ✅ | - |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `gpt-4`, `0613` | `gpt-4`, `1106-Preview` | `gpt-4`, `0125-Preview` | `gpt-4`, `vision-preview` | `gpt-4-32k`, `0613` |
11+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4-32k**, **0613** |
1212
|:-----------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------------:|:-----------------------:|
1313
| australiaeast | ✅ | ✅ | - | ✅ | ✅ |
1414
| canadaeast | ✅ | ✅ | - | - | ✅ |
@@ -22,5 +22,5 @@ ms.date: 03/13/2024
2222
| southindia | - | ✅ | - | - | - |
2323
| swedencentral | ✅ | ✅ | - | ✅ | ✅ |
2424
| switzerlandnorth | ✅ | - | - | ✅ | ✅ |
25-
| uksouth | - | ✅ | - | - | - |
26-
| westus | - | ✅ | - | ✅ | - |
25+
| uksouth | - | ✅ | ✅ | - | - |
26+
| westus | - | ✅ | - | ✅ | - |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 03/28/2024
99
---
1010

1111

12-
| `Region` | `gpt-4`, `0613` | `gpt-4`, `1106-Preview` | `gpt-4`, `0125-Preview` | `gpt-4`, `vision-preview` | `gpt-4-32k`, `0613` | `gpt-35-turbo`, `0301` | `gpt-35-turbo`, `0613` | `gpt-35-turbo`, `1106` | `gpt-35-turbo`, `0125` | `gpt-35-turbo-16k`, `0613` | `gpt-35-turbo-instruct`, `0914` | `text-embedding-ada-002`, `1` | `text-embedding-ada-002`, `2` | `text-embedding-3-small`, `1` | `text-embedding-3-large`, `1` | `babbage-002`, `1` | `dall-e-3`, `3.0` | `davinci-002`, `1` | `tts`, `001` | `tts-hd`, `001` | `whisper`, `001` |
12+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **0301** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-35-turbo-16k**, **0613** | **gpt-35-turbo-instruct**, **0914** | **text-embedding-ada-002**, **1** | **text-embedding-ada-002**, **2** | **text-embedding-3-small**, **1** | **text-embedding-3-large**, **1** | **babbage-002**, **1** | **dall-e-3**, **3.0** | **davinci-002**, **1** | **tts**, **001** | **tts-hd**, **001** | **whisper**, **001** |
1313
|:-----------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:------------------------------:|:-----------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|:----------------------:|:---------------------:|:----------------------:|:----------------:|:-------------------:|:--------------------:|
1414
| australiaeast | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | ✅ | - | - | - | - |
1515
| brazilsouth | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
@@ -25,7 +25,7 @@ ms.date: 03/28/2024
2525
| southindia | - | ✅ | - | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
2626
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | - | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
2727
| switzerlandnorth | ✅ | - | - | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
28-
| uksouth | - | ✅ | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
28+
| uksouth | - | ✅ | ✅ | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
2929
| westeurope | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31-
| westus3 | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31+
| westus3 | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |

0 commit comments

Comments
 (0)