Skip to content

Commit fa5a183

Browse files
authored
Merge pull request #291879 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents c99951a + e0d174e commit fa5a183

File tree

11 files changed

+22
-129
lines changed

11 files changed

+22
-129
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/create",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/migrate/context/vmware-context.yml",
10+
"redirect_url": "articles/migrate/context/migrate-context",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/partner-solutions/split-experimentation/how-to-set-up-data-access.md",
1015
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/how-to-set-up-data-access",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Provides a list of common Azure subscription and service limits, qu
44
ms.topic: conceptual
55
ms.custom:
66
- ignite-2024
7-
ms.date: 07/19/2024
7+
ms.date: 12/12/2024
88
---
99

1010
# Azure subscription and service limits, quotas, and constraints

articles/backup/backup-azure-enhanced-soft-delete-about.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Overview of enhanced soft delete for Azure Backup
33
description: This article gives an overview of enhanced soft delete for Azure Backup.
44
ms.topic: overview
55
ms.custom: references_regions
6-
ms.date: 07/18/2024
6+
ms.date: 12/12/2024
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
@@ -48,7 +48,7 @@ The key benefits of enhanced soft delete are:
4848
## Supported scenarios
4949

5050
- Enhanced soft delete is supported for Recovery Services vaults and Backup vaults. Also, it's supported for new and existing vaults.
51-
- Enhanced soft delete applies to all vaulted workloads alike and is supported for Recovery Services vaults and Backup vaults. However, it currently doesn't support operational tier workloads, such as Azure Files backup, Operational backup for Blobs, Disk and VM snapshot backups.
51+
- Enhanced soft delete applies to all vaulted workloads alike and is supported for Recovery Services vaults and Backup vaults. However, for Operational tier workloads, such as operational backup of [Azure Files](azure-file-share-backup-overview.md?tabs=snapshot#architecture-for-azure-file-share-backup), [Azure Blobs](blob-backup-overview.md?tabs=operational-backup#how-the-azure-blobs-backup-works), [Azure Disks](disk-backup-overview.md), soft delete won't be completely applicable as you can delete the underlying storage account that is part of your own subscription.
5252
- Always-on feature for soft delete is currently not supported for SQL database backups.
5353

5454
## States of soft delete settings

articles/communication-services/concepts/interop/guest/meeting-capabilities.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ This article describes which capabilities Azure Communication Services SDKs supp
124124
| | Apply [Watermark](/microsoftteams/watermark-meeting-content-video) over received video and screen sharing ||
125125
| Recording & transcription | Manage Teams cloud recording |[6] |
126126
| | Receive information of call being cloud recorded | ✔️ |
127+
| | Give explicit consent to Teams cloud recording | ✔️ |
127128
| | Manage Teams transcription |[6] |
128129
| | Receive information of call being transcribed | ✔️ |
130+
| | Give explicit consent to Teams transcription |✔️ |
129131
| | Manage Teams closed captions | ✔️ |
130132
| | Support for compliance recording | ✔️ |
131133
| | [Azure Communication Services recording](../../voice-video-calling/call-recording.md) ||

articles/communication-services/concepts/telephony/certified-session-border-controllers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ If you have any questions about the SBC certification program for Communication
3232

3333
|Vendor|Product|Software version|
3434
|:--- |:--- |:---
35-
|[Microsoft](https://azure.microsoft.com/products/communications-gateway/)|Azure Communications Gateway|2023-01-31|
3635
|[AudioCodes](https://www.audiocodes.com/media/lbjfezwn/mediant-sbc-with-microsoft-azure-communication-services.pdf)|Mediant Virtual Edition SBC|7.40A|
3736
||Mediant 500 SBC|7.40A|
3837
||Mediant 800 SBC|7.40A|

articles/migrate/context/vmware-context.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

articles/migrate/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ items:
6262
- name: Assess SQL instances for migration to Azure SQL
6363
href: tutorial-assess-sql.md
6464
- name: Assess servers for migration to AVS
65-
href: tutorial-assess-vmware-azure-vmware-solution.md
65+
href: ./vmware/tutorial-assess-vmware-azure-vmware-solution.md
6666
- name: Assess servers in Hyper-V environment
6767
items:
6868
- name: Assess servers for migration to Azure VMs

articles/migrate/vmware/prepare-for-agentless-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure Migrate automatically handles these configuration changes for the followin
2222
**Operating system versions supported for hydration**
2323

2424
- Windows Server 2008 or later
25-
- Red Hat Enterprise Linux 9.x, 8.x, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.0, 6.x
25+
- Red Hat Enterprise Linux 9.x, 8.x, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.x
2626
- CentOS Stream
2727
- SUSE Linux Enterprise Server 15 SP4, 15 SP3, 15 SP2, 15 SP1, 15 SP0, 12, 11 SP4, 11 SP3
2828
- Ubuntu 22.04, 21.04, 20.04, 19.04, 19.10, 18.04LTS, 16.04LTS, 14.04LTS

articles/migrate/vmware/toc.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

articles/synapse-analytics/sql/reference-collation-types.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Collation support
33
description: Collation types support for Synapse SQL in Azure Synapse Analytics.
44
author: filippopovic
55
ms.author: fipopovi
6-
ms.reviewer: wiassaf, kecona
7-
ms.date: 01/30/2024
6+
ms.reviewer: wiassaf
7+
ms.date: 12/11/2024
88
ms.service: azure-synapse-analytics
99
ms.subservice: sql
1010
ms.topic: reference
@@ -28,7 +28,7 @@ You can specify the default serverless SQL pool database collation at creation t
2828
To change the default collation for dedicated SQL pool database, update to the **Collation** field in the provisioning experience. For example, if you wanted to change the default collation to case sensitive, you would change the collation from `SQL_Latin1_General_CP1_CI_AS` to `SQL_Latin1_General_CP1_CS_AS`.
2929

3030
> [!NOTE]
31-
> Collation cannot be changed on an existing dedicated SQL pool database. If you need to have a different collation at the dedicated SQL pool level, create a new dedicated SQL pool with the required collation.
31+
> Collation cannot be changed on an existing dedicated SQL pool database. If you need to have a different collation at the dedicated SQL pool level, create a new dedicated SQL pool with the required collation. To specify a non-default collation when creating a dedicated SQL pool, use the Azure portal or PowerShell.
3232
3333
To change the default collation for a serverless SQL pool database, you can use ALTER DATABASE statement.
3434

0 commit comments

Comments
 (0)