Merge branch 'MicrosoftDocs:main' into patch-2

Author: yelevin

articles/active-directory/cloud-infrastructure-entitlement-management/TOC.yml

@@ -31,14 +31,14 @@
       - name: View key statistics and data about your authorization system
         href: ui-dashboard.md
       - name: View data about the activity in your authorization system
-        href: product-dashboard.md
-      - name: View current billable resources in your authorization system
-        href: product-data-billable-resources.md  
+        href: product-dashboard.md  
     - name: View information about your Authorization Systems
       expanded: false
       items:
       - name: View and configure settings for data collection
         href: product-data-sources.md
+      - name: View current billable resources in your authorization system
+        href: product-data-billable-resources.md
     - name: Manage organizational and personal information
       expanded: false
       items:

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-overview.md

@@ -129,7 +129,7 @@ Using this feature requires Azure AD Premium P1 licenses. Each user who is synch
 
 Which clouds can cross-tenant synchronization be used in?
 
-- Cross-tenant synchronization is supported within the commercial and Azure Government clouds.
+- Cross-tenant synchronization is supported within the commercial cloud. It is not supported within Azure Government or Azure China.
 - Synchronization is only supported between two tenants in the same cloud.
 - Cross-cloud (such as public cloud to Azure Government) isn't currently supported.
 

articles/app-service/troubleshoot-performance-degradation.md

@@ -47,7 +47,7 @@ This option enables you to find out if your application is having any issues. In
 Some of the metrics that you might want to monitor for your app are
 
 * Average memory working set
-* Average response time
+* Response time
 * CPU time
 * Memory working set
 * Requests
@@ -163,4 +163,4 @@ You can also manage your app using Azure PowerShell. For more information, see
 
 ## More resources
 
-[Tutorial: Run a load test to identify performance bottlenecks in a web app](../load-testing/tutorial-identify-bottlenecks-azure-portal.md)
+[Tutorial: Run a load test to identify performance bottlenecks in a web app](../load-testing/tutorial-identify-bottlenecks-azure-portal.md)

articles/azure-arc/servers/agent-release-notes.md

@@ -16,7 +16,7 @@ The Azure Connected Machine agent receives improvements on an ongoing basis. To
 
 This page is updated monthly, so revisit it regularly. If you're looking for items older than six months, you can find them in [archive for What's new with Azure Arc-enabled servers agent](agent-release-notes-archive.md).
 
-## Version 1.26 - January 2022
+## Version 1.26 - January 2023
 
 > [!NOTE]
 > Version 1.26 is only available for Linux operating systems. The most recent Windows agent version is 1.25.
@@ -25,7 +25,7 @@ This page is updated monthly, so revisit it regularly. If you're looking for ite
 
 - Increased the [resource limits](agent-overview.md#agent-resource-governance) for the Microsoft Defender for Endpoint extension (MDE.Linux) on Linux to improve installation reliability
 
-## Version 1.25 - January 2022
+## Version 1.25 - January 2023
 
 ### New features
 

articles/backup/backup-azure-alternate-dpm-server.md

@@ -1,50 +1,56 @@
 ---
 title: Recover data from an Azure Backup Server
 description: Recover the data you've protected to a Recovery Services vault from any Azure Backup Server registered to that vault.
-ms.topic: conceptual
-ms.date: 07/09/2019
+ms.topic: how-to
+ms.date: 01/24/2023
+author: jyothisuri
+ms.author: jsuri
+ms.service: backup
+ms.custom: engagement-fy23
 ---
+
 # Recover data from Azure Backup Server
 
-You can use Azure Backup Server to recover the data you've backed up to a Recovery Services vault. The process for doing so is integrated into the Azure Backup Server management console, and is similar to the recovery workflow for other Azure Backup components.
+This article describes how to recover data from Azure Backup Server.
+
+You can use Azure Backup Server to recover the data you've backed-up to a Recovery Services vault. The process for doing so is integrated into the Azure Backup Server management console, and is similar to the recovery workflow for other Azure Backup components.
 
 > [!NOTE]
 > This article is applicable for [System Center Data Protection Manager 2012 R2 with UR7 or later](https://support.microsoft.com/kb/3065246), combined with the [latest Azure Backup agent](https://aka.ms/azurebackup_agent).
->
->
 
-To recover data from an Azure Backup Server:
+## Recover the data
+
+To recover data from an Azure Backup Server, follow these steps:
 
-1. From the **Recovery** tab of the Azure Backup Server management console, select **'Add External DPM'** (at the top left of the screen).
+1. On the **Recovery** tab of the Azure Backup Server management console, select **'Add External DPM'** (at the top left of the screen).
 
-    ![Add External DPM](./media/backup-azure-alternate-dpm-server/add-external-dpm.png)
+    ![Screenshot shows how to add external DPM.](./media/backup-azure-alternate-dpm-server/add-external-dpm.png)
 2. Download new **vault credentials** from the vault associated with the **Azure Backup Server** where the data is being recovered, choose the Azure Backup Server from the list of Azure Backup Servers registered with the Recovery Services vault, and provide the **encryption passphrase** associated with the server whose data is being recovered.
 
-    ![External DPM Credentials](./media/backup-azure-alternate-dpm-server/external-dpm-credentials.png)
+    ![Screenshot shows how to download the external DPM credentials.](./media/backup-azure-alternate-dpm-server/external-dpm-credentials.png)
 
    > [!NOTE]
    > Only Azure Backup Servers associated with the same registration vault can recover each other’s data.
-   >
-   >
+
 
     Once the External Azure Backup Server is successfully added, you can browse the data of the external server and the local Azure Backup Server from the **Recovery** tab.
 3. Browse the available list of production servers protected by the external Azure Backup Server and select the appropriate data source.
 
-    ![Browse External DPM Server](./media/backup-azure-alternate-dpm-server/browse-external-dpm.png)
+    ![Screenshot shows how to browse external DPM server.](./media/backup-azure-alternate-dpm-server/browse-external-dpm.png)
 4. Select **the month and year** from the **Recovery points** drop down, select the required **Recovery date** for when the recovery point was created, and select the **Recovery time**.
 
     A list of files and folders appears in the bottom pane, which can be browsed and recovered to any location.
 
-    ![External DPM Server Recovery Points](./media/backup-azure-alternate-dpm-server/external-dpm-recoverypoint.png)
+    ![Screenshot shows the external DPM Server recovery points.](./media/backup-azure-alternate-dpm-server/external-dpm-recoverypoint.png)
 5. Right-click the appropriate item and select **Recover**.
 
-    ![External DPM recovery](./media/backup-azure-alternate-dpm-server/recover.png)
+    ![Screenshot shows how to start external DPM recovery.](./media/backup-azure-alternate-dpm-server/recover.png)
 6. Review the **Recover Selection**. Verify the data and time of the backup copy being recovered, as well as the source from which the backup copy was created. If the selection is incorrect, select **Cancel** to navigate back to recovery tab to select appropriate recovery point. If the selection is correct, select **Next**.
 
-    ![External DPM recovery summary](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-summary.png)
+    ![Screenshot shows the external DPM recovery summary.](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-summary.png)
 7. Select **Recover to an alternate location**. **Browse** to the correct location for the recovery.
 
-    ![External DPM recovery alternate location](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-alternate-location.png)
+    ![Screenshot shows how to start the external DPM recovery to an alternate location.](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-alternate-location.png)
 8. Choose the option related to **create copy**, **Skip**, or **Overwrite**.
 
    * **Create copy** - creates a copy of the file if there's a name collision.
@@ -55,29 +61,28 @@ To recover data from an Azure Backup Server:
 
      Identify whether a **Notification** is sent, once the recovery successfully completes.
 
-     ![External DPM Recovery Notifications](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-notifications.png)
+     ![Screenshot shows how to view the external DPM recovery notifications.](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-notifications.png)
 9. The **Summary** screen lists the options chosen so far. Once you select **Recover**, the data is recovered to the appropriate on-premises location.
 
-    ![External DPM Recovery Options Summary](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-options-summary.png)
+    ![Screenshot shows how to view the external DPM recovery options summary.](./media/backup-azure-alternate-dpm-server/external-dpm-recovery-options-summary.png)
 
    > [!NOTE]
    > The recovery job can be monitored in the **Monitoring** tab of the Azure Backup Server.
-   >
-   >
 
-    ![Monitoring Recovery](./media/backup-azure-alternate-dpm-server/monitoring-recovery.png)
+
+    ![Screenshot shows how to monitor the recovery.](./media/backup-azure-alternate-dpm-server/monitoring-recovery.png)
 10. You can select **Clear External DPM** on the **Recovery** tab of the DPM server to remove the view of the external DPM server.
 
-    ![Clear External DPM](./media/backup-azure-alternate-dpm-server/clear-external-dpm.png)
+    ![Screenshot shows how to clear external DPM.](./media/backup-azure-alternate-dpm-server/clear-external-dpm.png)
 
-## Troubleshooting error messages
+## Troubleshoot error messages
 
-| No. | Error Message | Troubleshooting steps |
-|:---:|:--- |:--- |
-| 1. |This server is not registered to the vault specified by the vault credential. |**Cause:** This error appears when the vault credential file selected does not belong to the Recovery Services vault associated with Azure Backup Server on which the recovery is attempted. <br> **Resolution:** Download the vault credential file from the Recovery Services vault to which the Azure Backup Server is registered. |
-| 2. |Either the recoverable data is not available or the selected server is not a DPM server. |**Cause:** There are no other Azure Backup Servers registered to the Recovery Services vault, or the servers have not yet uploaded the metadata, or the selected server is not an Azure Backup Server (using Windows Server or Windows Client). <br> **Resolution:** If there are other Azure Backup Servers registered to the Recovery Services vault, ensure that the latest Azure Backup agent is installed. <br>If there are other Azure Backup Servers registered to the Recovery Services vault, wait for a day after installation to start the recovery process. The nightly job will upload the metadata for all the protected backups to cloud. The data will be available for recovery. |
-| 3. |No other DPM server is registered to this vault. |**Cause:** There are no other Azure Backup Servers  that are registered to the vault from which the recovery is being attempted.<br>**Resolution:** If there are other Azure Backup Servers registered to the Recovery Services vault, ensure that the latest Azure Backup agent is installed.<br>If there are other Azure Backup Servers registered to the Recovery Services vault, wait for a day after installation to start the recovery process. The nightly job uploads the metadata for all protected backups to cloud. The data will be available for recovery. |
-| 4. |The encryption passphrase provided does not match with passphrase associated with the following server: **\<server name>** |**Cause:** The encryption passphrase used in the process of encrypting the data from the Azure Backup Server’s data that's being recovered doesn't match the encryption passphrase provided. The agent is unable to decrypt the data, and so the recovery fails.<br>**Resolution:** Provide the exact same encryption passphrase associated with the Azure Backup Server whose data is being recovered. |
+| Error Message | Cause | Resolution |
+|:--- |:--- |:--- |
+|This server is not registered to the vault specified by the vault credential. | This error appears when the vault credential file selected doesn't belong to the Recovery Services vault associated with Azure Backup Server on which the recovery is attempted. | Download the vault credential file from the Recovery Services vault to which the Azure Backup Server is registered. |
+|Either the recoverable data isn't available or the selected server isn't a DPM server. | There are no other Azure Backup Servers registered to the Recovery Services vault, or the servers haven't yet uploaded the metadata, or the selected server isn't an Azure Backup Server (using Windows Server or Windows Client). | If there are other Azure Backup Servers registered to the Recovery Services vault, ensure that the latest Azure Backup agent is installed. <br>If there are other Azure Backup Servers registered to the Recovery Services vault, wait for a day after installation to start the recovery process. The nightly job will upload the metadata for all the protected backups to cloud. The data will be available for recovery. |
+|No other DPM server is registered to this vault. | There are no other Azure Backup Servers  that are registered to the vault from which the recovery is being attempted. | If there are other Azure Backup Servers registered to the Recovery Services vault, ensure that the latest Azure Backup agent is installed.<br>If there are other Azure Backup Servers registered to the Recovery Services vault, wait for a day after installation to start the recovery process. The nightly job uploads the metadata for all protected backups to cloud. The data will be available for recovery. |
+|The encryption passphrase provided does not match with passphrase associated with the following server: **\<server name>** | The encryption passphrase used in the process of encrypting the data from the Azure Backup Server’s data that's being recovered doesn't match the encryption passphrase provided. The agent is unable to decrypt the data, and so the recovery fails. | Provide the exact same encryption passphrase associated with the Azure Backup Server whose data is being recovered. |
 
 ## Next steps