Skip to content

Commit 0cf07dc

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pr/296639
2 parents 10bd24d + 07fae53 commit 0cf07dc

File tree

198 files changed

+2364
-2580
lines changed

Some content is hidden

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

198 files changed

+2364
-2580
lines changed

articles/app-service/manage-backup.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ The following table shows which app configurations are restored when you choose
329329
330330
A custom backup (on-demand backup or scheduled backup) includes all content and configuration that's included in an [automatic backup](#whats-included-in-an-automatic-backup), plus any linked database, up to the allowable maximum size.
331331
332+
Each backup contains a .zip file with backup data and an .xml file {siteName}-{dateTime}.xml, which lists the contents, including [custom domains](app-service-web-tutorial-custom-domain.md). When restoring a custom backup, custom domains from the .xml file will be added to the destination app if no DNS conflict exists (i.e., the domain is available for binding), and if the destination app has different custom domains than the .xml file's custom domain list, those custom domains will be removed.
333+
332334
When [backing up over Azure Virtual Network](#back-up-and-restore-over-azure-virtual-network), you can't [back up the linked database](#back-up-and-restore-a-linked-database).
333335
334336
### Why is my linked database not backed up?

articles/app-service/overview-tls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These suites provide strong encryption and are automatically used when TLS 1.3 i
6464

6565
### TLS 1.2
6666

67-
TLS 1.2 is the **default and recommended** TLS version for App Service. It provides strong encryption and broad compatibility while meeting compliance standards like PCI DSS. New web apps and SCM endpoints are automatically set to TLS 1.2 unless changed.
67+
TLS 1.2 is the **default** TLS version for App Service. It provides strong encryption and broad compatibility while meeting compliance standards like PCI DSS. New web apps and SCM endpoints are automatically set to TLS 1.2 unless changed.
6868

6969
Azure App Service uses a secure set of TLS 1.2 cipher suites to ensure encrypted connections and protect against known vulnerabilities. While TLS 1.0 and 1.1 can be enabled for backward compatibility, they are not recommended.
7070

articles/app-service/routine-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Maintenance operations upgrade machines iteratively while App Service monitors t
6060

6161
### Are business hours reflected?
6262

63-
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). If resources are still upgrading by 9 AM in a given region, the upgrade will safely pause before the next critical step and until the end of business hours.
63+
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). App Service maintenance makes a best effort to reduce maintenance operations during these business hours. If resources are still upgrading by 9 AM in a given region, the upgrade will continue until reaching a safe stopping point, pausing before the next critical step and until the end of business hours.
6464

6565
### What are my options to control routine maintenance?
6666

articles/application-gateway/for-containers/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Application Gateway for Containers offers some entirely new features at release,
4444
- Mutual authentication to the backend target
4545
- Kubernetes support for Ingress and Gateway API
4646
- Flexible [deployment strategies](#deployment-strategies)
47-
- Increased performance, offering near real-time updates to add or move pods, routes, and probes
47+
- Increased performance, offering near real-time updates to add or remove pods, routes, and probes
4848

4949
Application Gateway for Containers offers an elastic and scalable ingress to AKS clusters and comprises a new data plane as well as control plane with [new set of ARM APIs](#implementation-of-gateway-api), different from existing Application Gateway. These APIs are different from the current implementation of Application Gateway. Application Gateway for Containers is outside the AKS cluster data plane and is responsible for ingress. The service is managed by an ALB controller component that runs inside the AKS cluster and adheres to Kubernetes Gateway APIs.
5050

articles/application-gateway/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
href: quick-create-terraform.md
2626
- name: Design
2727
items:
28-
- name: Well-Architected review of Application Gateway
28+
- name: Architecture best practices for Azure Application Gateway v2
2929
href: /azure/architecture/framework/services/networking/azure-application-gateway?toc=/azure/application-gateway/toc.json&bc=/azure/application-gateway/breadcrumb/toc.json
3030
- name: Basics
3131
items:

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ The following table details the features and limits of the Basic, Standard, and
364364
> [!NOTE]
365365
> Some areas of this service have adjustable limits, and others do not. The following tables use the *Adjustable?* column to represent this condition. When the limit can be adjusted, the *Adjustable?* value is *Yes*.
366366
367-
[!INCLUDE [digital-twins-limits](../../../includes/digital-twins-limits.md)]
367+
[!INCLUDE [digital-twins-limits](../../digital-twins/includes/digital-twins-limits.md)]
368368

369369
## Azure Event Grid limits
370370

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

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Rooms are created and managed via rooms APIs or SDKs. Use the rooms API/SDKs in
137137

138138
|Virtual Rooms SDK | Version | State|
139139
|-------------------| :-----------------------: | :-----------------------------: |
140+
| Virtual Rooms SDKs | 2025-03-13 | Generally Available - Fully supported |
140141
| Virtual Rooms SDKs | 2024-04-15 | Generally Available - Fully supported |
141142
| Virtual Rooms SDKs | 2023-06-14 | Generally Available - Fully supported |
142143
| Virtual Rooms SDKs | 2023-10-30 | Public Preview - Fully supported |
@@ -147,57 +148,59 @@ Rooms are created and managed via rooms APIs or SDKs. Use the rooms API/SDKs in
147148
## Predefined participant roles and permissions in Virtual Rooms calls
148149
<a name="predefined-participant-roles-and-permissions"></a>
149150

150-
Room participants can be assigned one of the following roles: **Presenter**, **Attendee**, and **Consumer**.
151+
Room participants can be assigned one of the following roles: **Presenter**, **Collaborator**, **Attendee**, and **Consumer**.
151152

152-
The following table provides detailed capabilities mapped to the roles. At a high level, **Presenter** role has full control, **Attendee** capabilities are limited to audio and video, while **Consumer** can only receive audio, video, and screen sharing.
153+
The following table provides detailed capabilities mapped to the roles. At a high level, **Presenter** role has full control, **Collaborator** has audio, video, and screenshare capabilities, **Attendee** has audio and video capabilities, while **Consumer** can only receive audio, video, and screen sharing.
153154

154155
<b>Note:</b> A PSTN call participant is not a part of Room roster, so a user role is not assigned to them. They capabilities are limited to mute/unmute themselves on the local device.
155156

156-
| Capability | Role: Presenter | Role: Attendee | Role: Consumer
157-
|---------------------------------------------| :--------: | :--------: | :--------: |
158-
| **Mid call controls** | | |
159-
| - Turn video on/off | ✔️ | ✔️ ||
160-
| - Mute/Unmute mic | ✔️ | ✔️ ||
161-
| - Mute remote user | ✔️ |||
162-
| - Switch between cameras | ✔️ | ✔️ ||
163-
| - Active speaker | ✔️ | ✔️ | ✔️ |
164-
| - Choose speaker for calls | ✔️ | ✔️ | ✔️ |
165-
| - Choose mic for calls | ✔️ | ✔️ ||
166-
| - Show participants state (idle, connecting, connected, On-hold, Disconnecting, Disconnected etc.) | ✔️ | ✔️ | ✔️ |
167-
| - Show call state (Early media, Incoming, Connecting, Ringing, Connected, Hold, Disconnecting, Disconnected | ✔️ | ✔️ | ✔️ |
168-
| - Show if a participant is muted | ✔️ | ✔️ | ✔️ |
169-
| - Show the reason why a participant left a call | ✔️ | ✔️ | ✔️ |
170-
| - Start call captions | ✔️ | ✔️ | ✔️ |
171-
| - Change captions language | ✔️ | ✔️ | ✔️ |
172-
| - Invite to join a Virtual Room participant to a call | ✔️ |||
173-
| **Screen sharing** | | |
174-
| - Share screen | ✔️ * |||
175-
| - Share an application | ✔️ * |||
176-
| - Share a browser tab | ✔️ * |||
177-
| - Participants can view shared screen | ✔️ | ✔️ | ✔️ |
178-
| **Roster management** | | |
179-
| - Remove a participant | ✔️ |||
180-
| **Device management** | | |
181-
| - Ask for permission to use audio and/or video | ✔️ | ✔️ ||
182-
| - Get camera list | ✔️ | ✔️ ||
183-
| - Set camera | ✔️ | ✔️ ||
184-
| - Get selected camera | ✔️ | ✔️ ||
185-
| - Get mic list | ✔️ * | ✔️ * ||
186-
| - Set mic | ✔️ * | ✔️ * ||
187-
| - Get selected mic | ✔️ * | ✔️ * ||
188-
| - Get speakers list | ✔️ * | ✔️ * | ✔️ * |
189-
| - Set speaker | ✔️ * | ✔️ * | ✔️ * |
190-
| - Get selected speaker | ✔️ | ✔️ | ✔️ |
191-
| **Video rendering** | | | |
192-
| - Render a video in multiple places (local camera or remote stream) | ✔️ | ✔️ | ✔️ <br>(Only Remote)</br> |
193-
| - Set/Update video scaling mode | ✔️ | ✔️ | ✔️ <br>(Only Remote)</br> |
194-
| - Render remote video stream | ✔️ | ✔️ | ✔️ |
195-
| **Dial-out to PSTN participants from the client-side** | | |
196-
| - Dial-out to PSTN participants from Virtual Rooms calls | ✔️ |||
197-
198-
\* Only available on the web calling SDK. Not available on iOS and Android calling SDKs
199-
157+
| Capability | Role: Presenter | Role: Collaborator | Role: Attendee | Role: Consumer |
158+
|---------------------------------------------| :--------: | :--------: | :--------: | :--------: |
159+
| **Mid call controls** | | | |
160+
| - Turn video on/off | ✔️ | ✔️ | ✔️ ||
161+
| - Mute/Unmute mic | ✔️ | ✔️ | ✔️ ||
162+
| - Mute remote user | ✔️ ||||
163+
| - Switch between cameras | ✔️ | ✔️ | ✔️ ||
164+
| - Active speaker | ✔️ | ✔️ | ✔️ | ✔️ |
165+
| - Choose speaker for calls | ✔️ | ✔️ | ✔️ | ✔️ |
166+
| - Choose mic for calls | ✔️ | ✔️ | ✔️ ||
167+
| - Show participants state (idle, connecting, connected, On-hold, Disconnecting, Disconnected etc.) | ✔️ | ✔️ | ✔️ | ✔️ |
168+
| - Show call state (Early media, Incoming, Connecting, Ringing, Connected, Hold, Disconnecting, Disconnected | ✔️ | ✔️ | ✔️ | ✔️ |
169+
| - Show if a participant is muted | ✔️ | ✔️ | ✔️ | ✔️ |
170+
| - Show the reason why a participant left a call | ✔️ | ✔️ | ✔️ | ✔️ |
171+
| - Start call captions | ✔️ | ✔️ | ✔️ | ✔️ |
172+
| - Change captions language | ✔️ | ✔️ | ✔️ | ✔️ |
173+
| - Invite to join a Virtual Room participant to a call | ✔️ ||||
174+
| **Screen sharing** | | | |
175+
| - Share screen | ✔️ * | ✔️ * |||
176+
| - Share an application | ✔️ * | ✔️ * |||
177+
| - Share a browser tab | ✔️ * | ✔️ * |||
178+
| - Participants can view shared screen | ✔️ | ✔️ | ✔️ | ✔️ |
179+
| **Roster management** | | | |
180+
| - Remove a participant | ✔️ ||||
181+
| **Device management** | | | |
182+
| - Ask for permission to use audio and/or video | ✔️ | ✔️ | ✔️ ||
183+
| - Get camera list | ✔️ | ✔️ | ✔️ ||
184+
| - Set camera | ✔️ | ✔️ | ✔️ ||
185+
| - Get selected camera | ✔️ | ✔️ | ✔️ ||
186+
| - Get mic list | ✔️ * | ✔️ * | ✔️ * ||
187+
| - Set mic | ✔️ * | ✔️ * | ✔️ * ||
188+
| - Get selected mic | ✔️ * | ✔️ * | ✔️ * ||
189+
| - Get speakers list | ✔️ * | ✔️ * | ✔️ * | ✔️ * |
190+
| - Set speaker | ✔️ * | ✔️ * | ✔️ * | ✔️ * |
191+
| - Get selected speaker | ✔️ | ✔️ | ✔️ | ✔️ |
192+
| **Video rendering** | | | | |
193+
| - Render a video in multiple places (local camera or remote stream) | ✔️ | ✔️ | ✔️ | ✔️ <br>(Only Remote)</br> |
194+
| - Set/Update video scaling mode | ✔️ | ✔️ | ✔️ | ✔️ <br>(Only Remote)</br> |
195+
| - Render remote video stream | ✔️ | ✔️ | ✔️ | ✔️ |
196+
| **Dial-out to PSTN participants from the client-side** | | | |
197+
| - Dial-out to PSTN participants from Virtual Rooms calls | ✔️ ||||
198+
199+
\* Only available on the web calling SDK.
200+
201+
<!-- Commented out as we have no need to label anything in public preview at the moment
200202
\*\* Currently in [public preview](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
203+
-->
201204

202205
## Event handling
203206

articles/communication-services/how-tos/calling-sdk/manage-role-assignment.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,17 @@ You create a 'Call' instance when you join the Teams meeting or Room with callin
4545
- Presenter
4646
- Organizer
4747
- Consumer
48+
- Collaborator
49+
50+
To learn about the roles and capabilities in Rooms please see more [here](./../../concepts/rooms/room-concept.md#predefined-participant-roles-and-permissions-in-virtual-rooms-calls).
4851

4952
```js
5053
const role = meetingCall.role;
5154
```
5255

56+
> [!NOTE]
57+
> Collaborator is only available in beta for Azure Communication Services Calling Web SDK version 1.34.1-beta.2 or higher.
58+
5359
## Subscribe to role changes
5460

5561
During the Teams meeting or Room, your role can be changed. To learn about the change, subscribe to an event, `roleChanged`, on the `Call` object.

articles/cost-management-billing/manage/assign-roles-azure-service-principals.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Assign Enterprise Agreement roles to service principals
33
description: This article helps you assign EA roles to service principals by using PowerShell and REST APIs.
44
author: bandersmsft
5-
ms.reviewer: sapnakeshari
5+
ms.reviewer: prsaini
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: prsaini
1111
---
1212

1313
# Assign Enterprise Agreement roles to service principals

articles/cost-management-billing/manage/avoid-charges-free-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Avoid charges with your Azure free account
33
description: Understand why you see charges for your Azure free account. Learn ways to avoid these charges.
44
author: bandersmsft
5-
ms.reviewer: amberbhargava
5+
ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: shrshett
1111
---
1212

1313
# Avoid charges with your Azure free account

0 commit comments

Comments
 (0)