Skip to content

Commit c9e3d49

Browse files
authored
Merge pull request #314453 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b871a43 + 8b03405 commit c9e3d49

4 files changed

Lines changed: 4 additions & 5 deletions

File tree

articles/automation/automation-use-azure-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For Azure Automation to communicate with Microsoft Entra ID, you must retrieve t
4949

5050
## Create a credential asset
5151

52-
With the Azure credentials for Microsoft Entra available, it's time to create an Azure Automation credential asset to securely store the Microsoft Entra credentials so that runbooks and Desire State Configuration (DSC) scripts can access them. You can do this using either the Azure portal or PowerShell cmdlets.
52+
With the Azure credentials for Microsoft Entra available, it's time to create an Azure Automation credential asset to securely store the Microsoft Entra credentials so that runbooks and Desired State Configuration (DSC) scripts can access them. You can do this using either the Azure portal or PowerShell cmdlets.
5353

5454
### Create the credential asset in Azure portal
5555

articles/backup/back-up-azure-stack-hyperconverged-infrastructure-virtual-machines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: v-mallicka
1212

1313
# Back up Azure Local virtual machines with Azure Backup Server
1414

15-
This article describes how to back up virtual machines running on Azure Local, versions *23 H2* and *22 H2*, using Microsoft Azure Backup Server (MABS).
15+
This article describes how to back up virtual machines running on Azure Local using Microsoft Azure Backup Server (MABS).
1616

1717
## Supported scenarios
1818

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ In the restore process, you'll see the option **Availability Zone.** You'll see
273273

274274
In summary, the **Availability Zone** will only appear when
275275
- The source VM is zone pinned and is NOT encrypted
276-
- The recovery point is present in vault tier only (Snapshots only or snapshot and vault tier are not supported)
276+
- The recovery point is present in vault tier (Snapshots only are not supported)
277277
- The recovery option is to either create a new VM or to restore disks (replace disks option replaces source data and hence the availability zone option is not applicable)
278278
- Creating VM/disks in the same region when vault's storage redundancy is ZRS (Doesn't work when vault's storage redundancy is GRS even though the source VM is zone pinned)
279279
- Creating VM/disks in the paired region when vault's storage redundancy is enabled for Cross-Region-Restore AND if the paired region supports zones

articles/private-link/network-security-perimeter-concepts.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ A network security perimeter-aware private link resource is a PaaS resource that
101101
| [Cosmos DB](/azure/cosmos-db/how-to-configure-nsp) | Microsoft.DocumentDB/databaseAccounts | | Public Preview |
102102
| [Event Hubs](/azure/event-hubs/network-security-perimeter) | Microsoft.EventHub/namespaces | | Generally Available |
103103
| [Key Vault](/azure/key-vault/general/network-security#network-security-perimeter-preview) | Microsoft.KeyVault/vaults | | Generally Available |
104-
| [Service Bus](/azure/service-bus-messaging/network-security-perimeter) | Microsoft.ServiceBus/namespaces | | Generally Available |
105104
| [SQL DB](/azure/azure-sql/database/network-security-perimeter) | Microsoft.Sql/servers | | Public Preview |
106-
| [Storage](/azure/storage/common/storage-network-security#network-secuirty-perimeter-preview) | Microsoft.Storage/storageAccounts | | Generally Available |
105+
| [Storage](/azure/storage/common/storage-network-security#network-security-perimeter-preview) | Microsoft.Storage/storageAccounts | | Generally Available |
107106
| [Azure OpenAI service](/azure/ai-services/openai/how-to/network-security-perimeter) | Microsoft.CognitiveServices(kind="OpenAI") | | Public Preview |
108107
| [Microsoft Foundry](/azure/ai-foundry/how-to/add-foundry-to-network-security-perimeter) | Microsoft.CognitiveServices(kind="AIServices") | | Generally Available |
109108

0 commit comments

Comments
 (0)