Skip to content

Commit fffd4c7

Browse files
authored
Merge pull request #298540 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 2bea849 + c422b3e commit fffd4c7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/communication-services/samples/trusted-auth-sample.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ zone_pivot_groups: acs-js-csharp
1818
# Authentication service hero sample
1919

2020
> [!IMPORTANT]
21-
> This sample is available on GitHub Azure Samples for [node.JS](https://github.com/Azure-Samples/communication-services-authentication-hero-nodejs) and [C#](https://github.com/Azure-Samples/communication-services-authentication-hero-csharp).
21+
> This sample is available on GitHub Azure Samples for [Node.js](https://github.com/Azure-Samples/communication-services-authentication-hero-nodejs) and [C#](https://github.com/Azure-Samples/communication-services-authentication-hero-csharp).
2222
2323
Azure Communication Services requires developers to generate user and access token credentials inside of a trusted authentication service. Azure Communication Services is identity-agnostic, to learn more check out our [conceptual documentation](../concepts/identity-model.md).
2424

articles/defender-for-iot/organizations/traffic-mirroring/configure-mirror-hyper-v.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ Get-VMSwitchExtensionPortFeature -FeatureName "Ethernet Switch Port Security Set
165165

166166
## Configure VLAN settings for the Monitor adapter (if needed)
167167

168-
If the Hyper-V server is located in a different VLAN than the VLAN from which the mirrored traffic originates, set the Monitor adapter to accept traffic from the mirrored VLANs.
168+
If the mirrored traffic is VLAN tagged, configure the Monitor adapter of the VM to accept traffic from the mirrored VLAN(s).
169169

170-
Use this PowerShell command to enable the Monitor adapter to accept the monitored traffic from different VLANs:
170+
Use this PowerShell command to enable the Monitor adapter of the VM to accept the monitored traffic from different VLANs:
171171
```PowerShell
172172
Set-VMNetworkAdapterVlan -VMName VK-C1000V-LongRunning-650 -VMNetworkAdapterName Monitor -Trunk -AllowedVlanIdList 1010-1020 -NativeVlanId 10
173173
```

articles/migrate/vmware/tutorial-assess-sql-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Tutorial to assess SQL instances in VMWare VMs for migration to SQL Server on Azure VM, Azure SQL Managed Instance and Azure SQL Database
2+
title: Tutorial to assess SQL instances in VMware VMs for migration to SQL Server on Azure VM, Azure SQL Managed Instance and Azure SQL Database
33
description: Learn how to create assessment for Azure SQL in VMware VMs in Azure Migrate
44
ms.topic: tutorial
55
ms.service: azure-migrate

articles/sap/center-sap-solutions/view-cost-analysis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following Azure resources aren't included in the SAP system-level cost analy
3131
- Virtual networks
3232
- Storage accounts
3333
- Azure NetApp files (ANF)
34-
- Azure key vaults
34+
- Azure Key Vault
3535
- Azure Monitor for SAP solutions resources
3636
- Azure Backup resources
3737

0 commit comments

Comments
 (0)