Skip to content

Commit e71b808

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pv2PerfPortal
2 parents 88790c6 + 12ee1e6 commit e71b808

File tree

12 files changed

+101
-87
lines changed

12 files changed

+101
-87
lines changed

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

Lines changed: 2 additions & 1 deletion
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
@@ -53,6 +53,7 @@ The following models support global batch:
5353
| Model | Version | Supported |
5454
|---|---|
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/azure-cache-for-redis/cache-azure-active-directory-for-authentication.md

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

articles/azure-cache-for-redis/cache-configure-role-based-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ The following list contains some examples of permission strings for various scen
131131
132132
## Configure your Redis client to use Microsoft Entra ID
133133

134-
Now that you have configured Redis User and Data access policy for configuring role based access control, you need to update your client workflow to support authenticating using a specific user/password. To learn how to configure your client application to connect to your cache instance as a specific Redis User, see [Configure your Redis client to use Microsoft Entra ID](cache-azure-active-directory-for-authentication.md#configure-your-redis-client-to-use-microsoft-entra-id).
134+
Now that you have configured Redis User and Data access policy for configuring role based access control, you need to update your client workflow to support authenticating using a specific user/password. To learn how to configure your client application to connect to your cache instance as a specific Redis User, see [Configure your Redis client to use Microsoft Entra](cache-azure-active-directory-for-authentication.md#configure-your-redis-client-to-use-microsoft-entra).
135135

136136
## Next steps
137137

articles/communication-services/concepts/rooms/room-concept.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Virtual Rooms empower developers with essential security and control capabilitie
2626
| Voice (VoIP) | ✔️ |
2727
| Video | ✔️ |
2828
| Client initiated dial-out to a PSTN number | ✔️ |
29-
| Server-side call management (Call Automation)* | ✔️ |
3029
| Server initiated dial-out to a PSTN number** | ✔️ |
30+
| Server-side call management (Call Automation)* | ✔️ |
3131
| PSTN Dial-in ||
3232
| Async Messaging (Chat) ||
3333
| Interoperability with Microsoft Teams ||
@@ -39,6 +39,7 @@ Virtual Rooms empower developers with essential security and control capabilitie
3939
## When to use Virtual Rooms
4040

4141
Following table shows when to use Virtual Rooms.
42+
4243
| Condition | Use Rooms |
4344
| ------ | ------ |
4445
| When it is important to control who is allowed to join a call (invite-only experience). | ✔️ |
@@ -70,12 +71,12 @@ At a high level, to conduct calls in a Virtual Rooms you need to create and mana
7071
| Get list of users invited to join a Virtual Room | ✔️ |||
7172
| A user initiates a Virtual Rooms call or joins an in-progress call || ✔️ ||
7273
| Dial-out to a PSTN user || ✔️ | ✔️* |
73-
| Add/Remove VoIP participants to an in-progress call || ✔️ | ✔️ |
74-
| Get list of participants who joined the in-progress call || ✔️ | ✔️ |
74+
| Add/Remove VoIP participants to an in-progress call || ✔️ | ✔️* |
75+
| Get list of participants who joined the in-progress call || ✔️ | ✔️* |
7576
| Start/Stop call captions and change captions language || ✔️* ||
7677
| Manage call recording ||| ✔️* |
7778
| Send/Receive DTMF to/from PSTN participants ||| ✔️* |
78-
| Send announcements to participants ||| ✔️* |
79+
| Play audio prompts to participants ||| ✔️* |
7980

8081
[Calling client SDK](../voice-video-calling/calling-sdk-features.md#detailed-capabilities) provides the full list of client-side in-call operations and explains how to use them.
8182

@@ -128,6 +129,17 @@ Developers can allow/disallow the ability for call participants to dial-out to a
128129
1. A participant with Presenter role adds PSTN number into a call
129130
1. PSTN user accepts and joins a room call
130131

132+
133+
### Virtual Rooms API/SDKs
134+
135+
Rooms are created and managed via rooms APIs or SDKs. Use the rooms API/SDKs in your server application for `room` operations:
136+
- Create
137+
- Modify
138+
- Delete
139+
- Set and update the list of participants
140+
- Set and modify the Room validity
141+
- Assign roles and permissions to users
142+
131143
|Virtual Rooms SDK | Version | State|
132144
|-------------------| :-----------------------: | :-----------------------------: |
133145
| Virtual Rooms SDKs | 2024-04-15 | Generally Available - Fully supported |
@@ -216,6 +228,7 @@ The *Open Room* concept is now deprecated. Going forward, *Invite Only* rooms ar
216228
## Next steps:
217229
- Use the [QuickStart to create, manage, and join a room](../../quickstarts/rooms/get-started-rooms.md).
218230
- Learn how to [join a room call](../../quickstarts/rooms/join-rooms-call.md).
231+
- Learn how to [manage a room call](../../quickstarts/rooms/manage-rooms-call.md).
219232
- Review the [Network requirements for media and signaling](../voice-video-calling/network-requirements.md).
220233
- Analyze your Rooms data, see: [Rooms Logs](../Analytics/logs/rooms-logs.md).
221234
- Learn how to use the Log Analytics workspace, see: [Log Analytics Tutorial](../../../azure-monitor/logs/log-analytics-tutorial.md).

articles/cosmos-db/gen-ai/quickstart-rag-chatbot.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ At the end, we'll create a simple UX using Gradio to allow users to type in ques
2626
**Important Note**: This sample requires you to set up accounts for Azure Cosmos DB for NoSQL and Azure OpenAI. To get started, visit:
2727
- [Azure Cosmos DB for NoSQL Python Quickstart](../nosql/quickstart-python.md)
2828
- [Azure Cosmos DB for NoSQL Vector Search](../nosql/vector-search.md)
29-
- [Azure OpenAI](../../ai-services/openai/toc.yml)
3029

3130
### 1. Install Required Packages
3231

@@ -432,4 +431,4 @@ This quickstart guide is designed to help you set up and get running with Azure
432431

433432
- [Azure PostgreSQL Server pgvector Extension](../../postgresql/flexible-server/how-to-use-pgvector.md)
434433

435-
:::image type="content" source="../media/vector-search/azure-databases-and-ai-search.png" lightbox="../media/vector-search/azure-databases-and-ai-search.png" alt-text="Diagram of Vector indexing services.":::
434+
:::image type="content" source="../media/vector-search/azure-databases-and-ai-search.png" lightbox="../media/vector-search/azure-databases-and-ai-search.png" alt-text="Diagram of Vector indexing services.":::

articles/governance/machine-configuration/whats-new/migrating-from-azure-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ section outlines the expected steps for migration.
3838
1. Unregister servers from Azure Automation State Configuration
3939
1. Assign configurations to servers using machine configuration
4040

41-
Machine configuration uses DSC version 3 with PowerShell version 7. DSC version 3 can coexist with
41+
Machine configuration uses DSC version 2 with PowerShell version 7. DSC version 3 can coexist with
4242
older versions of DSC in [Windows][02] and [Linux][03]. The implementations are separate. However,
4343
there's no conflict detection.
4444

5.13 KB
Loading

articles/migrate/vmware/start-here-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ products:
1313
ms.date: 05/08/2024
1414
ms.custom: vmware-scenario-422
1515

16-
# Customer intent - overview of the options for assessing an existing VMware deployment for migration
16+
# Customer intent - Overview of the options for assessing an existing VMware deployment for migration
1717
---
1818

1919

0 commit comments

Comments
 (0)