Skip to content

Commit deffaf7

Browse files
authored
Merge pull request #273530 from MicrosoftDocs/main
4/26/2024 AM Publish
2 parents 42b2286 + c9fafb6 commit deffaf7

File tree

85 files changed

+644
-649
lines changed

Some content is hidden

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

85 files changed

+644
-649
lines changed

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-studio/reference/region-support.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: This article lists Azure AI Studio feature availability across clou
55
manager: nitinme
66
ms.service: azure-ai-studio
77
ms.topic: conceptual
8-
ms.date: 02/26/2024
8+
ms.date: 04/26/2024
99
ms.reviewer: deeikele
1010
ms.author: eur
1111
author: eric-urban
@@ -51,6 +51,9 @@ Azure AI Studio preview is currently not available in Azure Government regions o
5151

5252
[!INCLUDE [OpenAI Quotas](../../ai-services/openai/includes/model-matrix/quota.md)]
5353

54+
> [!NOTE]
55+
> Some models might not be available within the AI Studio model catalog.
56+
5457
For more information, see [Azure OpenAI quotas and limits](/azure/ai-services/openai/quotas-limits).
5558

5659
## Speech capabilities

articles/app-service/tutorial-connect-msi-sql-database.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ The steps you follow for your project depends on whether you're using [Entity Fr
172172
Install-Package Azure.Identity
173173
Update-Package EntityFramework
174174
```
175+
> [!NOTE]
176+
> The token caching feature for Managed Identity is available starting from Azure.Identity version 1.8.0. To help reduce network port usage, consider updating Azure.Identity to this version or later.
177+
175178
1. In your DbContext object (in *Models/MyDbContext.cs*), add the following code to the default constructor.
176179
177180
```csharp

articles/azure-arc/servers/billing-extended-security-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Please note that estimates in the Azure Cost Management forecast may not accurat
4242
4343
- **Core modification:** If cores are added to an existing ESU license, they're subject to back-billing (that is, charges for the time elapsed since EOS) and regularly billed from the calendar month in which they were added. If cores are reduced or decremented to an existing ESU license, the billing rate will reflect the reduced number of cores within 5 business days of the change.
4444

45-
- **Activation:** Licenses are billed for their number and edition of cores from the point at which they're both activated and assigned to at least one Azure Arc-enabled server. Activation and reactivation are subject to back-billing.
45+
- **Activation:** Licenses are billed for their number and edition of cores from the point at which they're both activated. The activated license doesn't need to be linked to any Azure Arc-enabled servers to initiate billing. Activation and reactivation are subject to back-billing. Note that licenses that were activated but not linked to any servers may be back-billed if they weren't billed upon creation. Customers are responsible for deletion of any activated but unlinked ESU licenses.
4646

4747
- **Deactivation or deletion:** Licenses that are deactivated or deleted will be billed through up to five calendar days from the time of the change.
4848

articles/azure-netapp-files/cool-access-introduction.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Standard storage with cool access is supported for the following regions:
4545
* East Asia
4646
* East US 2
4747
* France Central
48+
* Germany North
4849
* Germany West Central
4950
* Japan East
5051
* Japan West

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,13 @@ Before starting your move operation, review the [checklist](./move-resource-grou
640640
> | ------------- | ----------- | ---------- | ----------- |
641641
> | connectionmanagers | No | No | No |
642642
643+
## Microsoft.DataDog
644+
645+
> [!div class="mx-tableFixed"]
646+
> | Resource type | Resource group | Subscription | Region move |
647+
> | ------------- | ----------- | ---------- | ----------- |
648+
> | monitors | No | No | No |
649+
643650
## Microsoft.DataExchange
644651

645652
> [!div class="mx-tableFixed"]

articles/azure-vmware/reserved-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 4/4/2024
77
ms.custom: engagement-fy23
88
---
99

10-
# Save costs with Azure VMware Solution
10+
# Save costs with reserved instances in Azure VMware Solution
1111

1212
When you commit to a reserved instance of [Azure VMware Solution](introduction.md), you save money. The reservation discount automatically applies to the running Azure VMware Solution hosts that match the reservation scope and attributes. In addition, a reserved instance purchase covers only the compute part of your usage and includes software licensing costs.
1313

articles/azure-web-pubsub/samples-app-scenarios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Here's a list of code samples written by Azure Web PubSub team and the community
3131
::: zone pivot="method-javascript"
3232
| App scenario | Industry |
3333
| --------------------------------------------------- | ----------------- |
34-
| [Cross-platform chat](https://github.com/Azure/azure-webpubsub/blob/main/samples/csharp/chatapp/Startup.cs#L29) | Social |
35-
| [Collaborative code editor](https://github.com/Azure/azure-webpubsub/blob/main/samples/csharp/chatapp/Startup.cs#L29) | Modern work |
34+
| [Cross-platform chat](https://github.com/Azure/azure-webpubsub/tree/main/samples/csharp/chatapp) | Social |
35+
| [Collaborative code editor](https://github.com/Azure/azure-webpubsub/tree/main/samples/csharp/chatapp) | Modern work |
3636
::: zone-end
3737

3838
::: zone pivot="method-java"

articles/azure-web-pubsub/samples-authenticate-and-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ While the client's role is often limited, the application server's role goes bey
2626
::: zone pivot="method-sdk-csharp"
2727
| Use case | Description |
2828
| ------------------------------------------------------------------------ | ----------------------------------------------------------------- |
29-
| [Using connection string](https://github.com/Azure/azure-webpubsub/blob/main/samples/csharp/chatapp/Startup.cs#L29) | Applies to application server only.
29+
| [Using connection string](https://github.com/Azure/azure-webpubsub/tree/main/samples/csharp/chatapp) | Applies to application server only.
3030
| [Using Client Access Token](https://github.com/Azure/azure-webpubsub/blob/main/samples/csharp/chatapp/wwwroot/index.html#L13) | Applies to client only. Client Access Token is generated on the application server.
3131
| Using Microsoft Entra ID | Using Microsoft Entra ID for authorization offers improved security and ease of use compared to Access Key authorization.
3232
| [Anonymous connection](https://github.com/Azure/azure-webpubsub/blob/main/samples/csharp/clientWithCert/client/Program.cs#L15) | Anonymous connection allows clients to connect with Azure Web PubSub directly without going to an application server for a Client Access Token first. This is useful for clients that have limited networking capabilities, like an EV charging point.

0 commit comments

Comments
 (0)