Skip to content

Commit 3fbf11c

Browse files
authored
Merge pull request #293466 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 770888c + 3e8c31e commit 3fbf11c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

articles/azure-signalr/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
href: https://azure.microsoft.com/pricing/details/signalr-service/
228228
- name: Videos
229229
href: https://www.youtube.com/results?search_query=Azure+SignalR+Core
230-
- name: StackOverflow
230+
- name: Stack Overflow
231231
href: https://stackoverflow.com/search?q=signalr+service
232232
- name: X
233233
href: https://x.com/SignalR

articles/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ More cost savings on the hardware can be realized with reserved instances: [Save
7070
NC2 on Azure infrastructure counts toward your organization's Microsoft Azure Consumption Commitment (MACC) agreement.
7171

7272
### Azure Hybrid Benefit for Windows and SQL Server
73-
With Software Assurance or an active Linux subscription, you can also take advantage of Azure Hybrid Benefit for SQL Server, Windows Server, or Linux running in the NC2 on Azure environment.
73+
Azure Hybrid Benefit enables commercial customers to use their qualifying on-premises licenses on Azure. With Software Assurance or an active Linux subscription, you can take advantage of Azure Hybrid Benefit for SQL Server, Windows Server, or Linux running in the NC2 on Azure environment.
7474

7575
The primary benefit allows you to reuse you existing licensing investments to run in NC2 on Azure. There are other benefits, including allowing you to migrate over time while maintaining license compliance both on-premises and in Azure.
7676

@@ -79,7 +79,9 @@ Under the Azure Hybrid Benefit terms NC2 on Azure should be considered a Dedicat
7979
- [Windows Server Product Terms](https://www.microsoft.com/licensing/terms/productoffering/WindowsServerStandardDatacenterEssentials/EAEAS)
8080
- [Azure Product Terms](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/EAEAS)
8181

82-
For any additional questions on Azure Hybrid Benefit, contact your Microsoft Account Executive.
82+
There's no current product integration where you can choose Azure Hybrid Benefit for VMs in NC2 on Azure.
83+
84+
For any additional questions on Azure Hybrid Benefit, contact your Microsoft Account Executive.
8385

8486
### No-cost Extended Security Updates (ESU) for Windows Server
8587
Windows virtual machines (VMs) hosted in Azure, including NC2 on Azure, are eligible for Extended Security Updates (ESUs) free of charge.

articles/iot-central/core/how-to-connect-iot-edge-transparent-gateway.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ In your IoT Central application, verify that the **Device status** for the `ther
231231
232232
## Configure a downstream device
233233
234+
> [!NOTE]
235+
> IoT Central does not support X.509 certificate authentication for downstream devices connected to an IoT Edge transparent gateway.
236+
234237
In the previous section, you configured the `edgegateway` virtual machine with the demo certificates to enable it to run as gateway. The `leafdevice` virtual machine is ready for you to install a thermostat simulator that uses the gateway to connect to IoT Central.
235238
236239
The `leafdevice` virtual machine needs a copy of the root CA certificate you created on the `edgegateway` virtual machine. Copy the */home/AzureUser/certs/certs/azure-iot-test-only.root.ca.cert.pem* file from the `edgegateway` virtual machine to your home directory on the `leafdevice` virtual machine. You can use the **scp** command to copy files between Linux virtual machines. For example, from the `leafdevice` machine:

0 commit comments

Comments
 (0)