Merge remote-tracking branch 'upstream/main'

Author: bhaimicrosoft

articles/defender-for-iot/organizations/how-to-manage-individual-sensors.md

@@ -83,11 +83,15 @@ You need to upload a new activation file to your sensor if you want to switch se
 
 **To add a new activation file:**
 
-1. In [Defender for IoT on the Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_IoT_Defender/IoTDefenderDashboard/Getting_Started) > **Sites and sensors**, locate and [delete](how-to-manage-sensors-on-the-cloud.md#sensor-maintenance-and-troubleshooting) your OT sensor.
+1. Do one of the following:
 
-1. Select **Onboard OT sensor > OT** to onboard the sensor again from scratch and download the new activation file. For more information, see [Onboard OT sensors](onboard-sensors.md).
+    - **Onboard your sensor from scratch**:
+    
+        1. In [Defender for IoT on the Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_IoT_Defender/IoTDefenderDashboard/Getting_Started) > **Sites and sensors**, locate and [delete](how-to-manage-sensors-on-the-cloud.md#sensor-maintenance-and-troubleshooting) your OT sensor.
 
-    Alternately, on the **Sites and sensors** page, locate the sensor you just added. Select the three dots (...) on the sensor's row and select **Download activation file**. Save the file in a location accessible to your sensor.
+        1. Select **Onboard OT sensor > OT** to onboard the sensor again from scratch and download the new activation file. For more information, see [Onboard OT sensors](onboard-sensors.md).
+
+    - <a name="current"></a>**Download the current sensor's activation file**: On the **Sites and sensors** page, locate the sensor you just added. Select the three dots (...) on the sensor's row and select **Download activation file**. Save the file in a location accessible to your sensor.
 
     [!INCLUDE [root-of-trust](includes/root-of-trust.md)]
 
@@ -108,7 +112,7 @@ You'll receive an error message if the activation file couldn't be uploaded. The
 - **The activation file is valid but Defender for IoT rejected it:** If you can't resolve this problem, you can download another activation from the **Sites and sensors** page in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_IoT_Defender/IoTDefenderDashboard/Getting_Started). If this doesn't work, contact Microsoft Support.
 
 > [!NOTE]
-> Activation files are valid for 14 days after creation. New activation files must be created if yours are expired.
+> Activation files expire 14 days after creation. If you onboarded your sensor but didn't upload the activation file before it expired, [download a new  activation file](#current).
 >
 
 ## Manage SSL/TLS certificates

articles/defender-for-iot/organizations/ot-deploy/activate-deploy-sensor.md

@@ -24,11 +24,14 @@ To perform the procedures in this article, you need:
 
 - An OT sensor [onboarded](../onboard-sensors.md) to Defender for IoT in the Azure portal.
 
+- OT sensor software installed on your appliance. Make sure that you've either [installed](install-software-ot-sensor.md) the software yourself or [purchased](../ot-pre-configured-appliances.md) a preconfigured appliance.
+
 - The sensor's activation file, which was downloaded after [onboarding your sensor](../onboard-sensors.md). You need a unique activation file for each OT sensor you deploy.
 
     [!INCLUDE [root-of-trust](../includes/root-of-trust.md)]
 
-- OT sensor software installed on your appliance. Make sure that you've either [installed](install-software-ot-sensor.md) the software yourself or [purchased](../ot-pre-configured-appliances.md) a preconfigured appliance.
+    > [!NOTE]
+    > Activation files expire 14 days after creation. If you onboarded your sensor but didn't upload the activation file before it expired, [download a new  activation file](../how-to-manage-individual-sensors.md#current).
 
 - A SSL/TLS certificate. We recommend using a CA-signed certificate, and not a self-signed certificate. For more information, see [Create SSL/TLS certificates for OT appliances](create-ssl-certificates.md).
 

articles/site-recovery/vmware-physical-azure-troubleshoot-process-server.md

@@ -53,7 +53,7 @@ The process server generates a number of health alerts. These alerts, and recomm
 ![Critical][red] | Memory usage > 95% for the last 15 minutes. | 1. Don't add new machines, and considering setting up an [additional process server](vmware-azure-set-up-process-server-scale.md).<br/> 2. Follow any instructions associated with the warning.<br/> 3. 4. If the issue continues, follow the instructions below to [troubleshoot connectivity and replication issues](#check-connectivity-and-replication).<br/> 4. If the issue persists, run the [Deployment Planner](./site-recovery-deployment-planner.md) for VMware/physical server replication issues.
 ![Warning][yellow] | Cache folder free space < 30% for the last 15 minutes. | 1. Don't add new machines, and consider setting up an [additional process server](vmware-azure-set-up-process-server-scale.md).<br/>2. Check that the number of VMs using the process server aligns to [guidelines](site-recovery-plan-capacity-vmware.md#capacity-considerations).<br/> 3. Follow the instructions below to [troubleshoot connectivity and replication issues](#check-connectivity-and-replication).
 ![Critical][red] |  Free space < 25% for last 15 minutes | 1. Follow the instructions associated with the warning for this issue.<br/> 2. 3. Follow the instructions below to [troubleshoot connectivity and replication issues](#check-connectivity-and-replication).<br/> 3. If the issue persists, run the [Deployment Planner](./site-recovery-deployment-planner.md) for VMware/physical server replication.
-![Critical][red] | No heartbeat from the process server for 15 minutes or more. The tmansvs service isn't communicating with the configuration server. | 1) Check that the process server is up and running.<br/> 2. Check that the tmassvc is running on the process server.<br/> 3. Follow the instructions below to [troubleshoot connectivity and replication issues](#check-connectivity-and-replication).
+![Critical][red] | No heartbeat from the process server for 15 minutes or more. The tmansvs service isn't communicating with the configuration server. | 1) Check that the process server is up and running.<br/> 2. Check that the tmansvc is running on the process server.<br/> 3. Follow the instructions below to [troubleshoot connectivity and replication issues](#check-connectivity-and-replication).
 
 
 ![Table key](./media/vmware-physical-azure-troubleshoot-process-server/table-key.png)
@@ -246,4 +246,4 @@ If you need more help, post your question in the [Microsoft Q&A question page fo
 
 [green]: ./media/vmware-physical-azure-troubleshoot-process-server/green.png
 [yellow]: ./media/vmware-physical-azure-troubleshoot-process-server/yellow.png
-[red]: ./media/vmware-physical-azure-troubleshoot-process-server/red.png
+[red]: ./media/vmware-physical-azure-troubleshoot-process-server/red.png