Skip to content

Commit 034bb17

Browse files
authored
Merge pull request #297310 from MicrosoftDocs/release-migration-toc
Release migration toc -> main -- 03/31 - 10:00 AM PST
2 parents acbfd0e + 4401a5b commit 034bb17

12 files changed

+807
-522
lines changed

articles/iot-hub/troubleshoot-error-codes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ This error can occur because the [SAS token used to connect to IoT Hub](iot-hub-
128128

129129
Some other possibilities include:
130130

131-
* The device lost underlying network connectivity longer than the [MQTT keep-alive](../iot/iot-mqtt-connect-to-iot-hub.md#default-keep-alive-time-out), resulting in a remote idle timeout. The MQTT keep-alive setting can be different per device.
132-
* The device sent a TCP/IP-level reset but didn't send an application-level `MQTT DISCONNECT`. Basically, the device abruptly closed the underlying socket connection. Sometimes, this issue is caused by bugs in older versions of the Azure IoT SDK.
131+
* The device lost underlying network connectivity longer than the [MQTT keep-alive](../iot/iot-mqtt-connect-to-iot-hub.md#default-keep-alive-time-out), resulting in a remote idle time-out. The MQTT keep-alive setting can be different per device.
132+
* The device sent a TCP/IP-level reset but didn't send an application-level `MQTT DISCONNECT`. Basically, the device abruptly closed the underlying socket connection. Sometimes, bugs in older versions of the Azure IoT SDK might cause this issue.
133133
* The device side application crashed.
134134

135135
Or, IoT Hub might be experiencing a transient issue. For more information, see [500xxx Internal errors](#500xxx-internal-errors).

articles/migrate/tutorial-migrate-aws-virtual-machines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ ms.custom:
1313
- aws-to-azure
1414
---
1515

16-
# Discover, assess, and migrate Amazon Web Services (AWS) VMs to Azure
16+
# Discover, assess, and migrate Amazon Web Services (AWS) EC2 instances to Azure
1717

18-
This tutorial shows you how to discover, assess, and migrate Amazon Web Services (AWS) virtual machines (VMs) to Azure VMs by using Azure Migrate: Server Assessment and the Migration and modernization tool.
18+
This tutorial shows you how to discover, assess, and migrate Amazon Web Services (AWS) EC2 instances to Azure VMs by using Azure Migrate: Server Assessment and the Migration and modernization tool.
1919

2020
> [!NOTE]
2121
> You migrate AWS VMs to Azure by treating them as physical servers.
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)