Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: SnehaGunda

.openpublishing.redirection.json

@@ -18550,6 +18550,11 @@
       "redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-to-party-cluster",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/migrate/troubleshooting-general.md",
+      "redirect_url": "troubleshoot-general",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/migrate/preserve-drive-letter-protected-virtual-machines-failed-migrated-azure.md",
       "redirect_url": "prepare-for-migration",

articles/backup/backup-azure-arm-restore-vms.md

@@ -17,7 +17,8 @@ Azure Backup provides a number of ways to restore a VM.
 --- | ---
 **Create a new VM** | Quickly creates and gets a basic VM up and running from a restore point.<br/><br/> You can specify a name for the VM, select the resource group and virtual network (VNet) in which it will be placed, and specify a storage account for the restored VM. The new VM must be created in the same region as the source VM.
 **Restore disk** | Restores a VM disk, which can then be used to create a new VM.<br/><br/> Azure Backup provides a template to help you customize and create a VM. <br/><br> The restore job generates a template that you can download and use to specify custom VM settings, and create a VM.<br/><br/> The disks are copied to the Resource Group you specify.<br/><br/> Alternatively, you can attach the disk to an existing VM, or create a new VM using PowerShell.<br/><br/> This option is useful if you want to customize the VM, add configuration settings that weren't there at the time of backup, or add settings that must be configured using the template or PowerShell.
-**Replace existing** | You can restore a disk, and use it to replace a disk on the existing VM.<br/><br/> The current VM must exist. If it's been deleted, this option can't be used.<br/><br/> Azure Backup takes a snapshot of the existing VM before replacing the disk, and stores it in the staging location you specify. Existing disks connected to the VM are replaced with the selected restore point.<br/><br/> The snapshot is copied to the vault, and retained in accordance with the retention policy. <br/><br/> After the replace disk operation, the original disk is retained in the resource group. You can choose to manually delete the original disks if they are not needed. <br/><br/>Replace existing is supported for unencrypted managed VMs. It's not supported for unmanaged disks, [generalized VMs](https://docs.microsoft.com/azure/virtual-machines/windows/capture-image-resource), or for VMs [created using custom images](https://azure.microsoft.com/resources/videos/create-a-custom-virtual-machine-image-in-azure-resource-manager-with-powershell/).<br/><br/> If the restore point has more or less disks than the current VM, then the number of disks in the restore point will only reflect the VM configuration.<br/><br/>
+**Replace existing** | You can restore a disk, and use it to replace a disk on the existing VM.<br/><br/> The current VM must exist. If it's been deleted, this option can't be used.<br/><br/> Azure Backup takes a snapshot of the existing VM before replacing the disk, and stores it in the staging location you specify. Existing disks connected to the VM are replaced with the selected restore point.<br/><br/> The snapshot is copied to the vault, and retained in accordance with the retention policy. <br/><br/> After the replace disk operation, the original disk is retained in the resource group. You can choose to manually delete the original disks if they are not needed. <br/><br/>Replace existing is supported for unencrypted managed VMs. It's not supported for unmanaged disks, [generalized VMs](https://docs.microsoft.com/azure/virtual-machines/windows/capture-image-resource), or for VMs [created using custom images](https://azure.microsoft.com/resources/videos/create-a-custom-virtual-machine-image-in-azure-resource-manager-with-powershell/).<br/><br/> If the restore point has more or less disks than the current VM, then the number of disks in the restore point will only reflect the VM configuration.
+**Cross Region (secondary region)** | Cross Region restore can be used to restore Azure VMs in the secondary region, which is an [Azure paired region](https://docs.microsoft.com/azure/best-practices-availability-paired-regions#what-are-paired-regions).<br><br> You can restore all the Azure VMs for the selected recovery point if the backup is done in the secondary region.<br><br> This feature is available for the options below:<br> * [Create a VM](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#create-a-vm) <br> * [Restore Disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-disks) <br><br> We don't currently support the [Replace existing disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#replace-existing-disks) option.<br><br> Permissions<br> The restore operation on secondary region can be performed by Backup Admins and App admins.
 
 > [!NOTE]
 > You can also recover specific files and folders on an Azure VM. [Learn more](backup-azure-restore-files-from-vm.md).
@@ -127,6 +128,45 @@ As one of the [restore options](#restore-options), you can replace an existing V
 
    ![Restore configuration wizard Replace Existing](./media/backup-azure-arm-restore-vms/restore-configuration-replace-existing.png)
 
+## Cross Region Restore
+
+As one of the [restore options](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-options), Cross Region Restore (CRR) allows you to restore Azure VMs in a secondary region, which is an Azure paired region.
+
+To see if it's enabled, follow the instructions in [Configure Cross Region Restore](backup-create-rs-vault.md#configure-cross-region-restore)
+
+### View backup items in secondary region
+
+If CRR is enabled, you can view the backup items in the secondary region.
+
+1. From the portal, go to **Recovery Services vault** > **Backup items**
+2. Click **Secondary Region** to view the items in the secondary region.
+
+![Virtual machines in secondary region](./media/backup-azure-arm-restore-vms/secbackedupitem.png)
+
+![Select Secondary Region](./media/backup-azure-arm-restore-vms/backupitems-sec.png)
+
+### Restore in secondary region
+
+The secondary region restore user experience will be similar to the primary region restore user experience. When configuring details in the Restore Configuration blade to configure your restore, you'll be prompted to provide only secondary region parameters.
+
+![Choose VM to restore](./media/backup-azure-arm-restore-vms/sec-restore.png)
+
+![Select restore point](./media/backup-azure-arm-restore-vms/sec-rp.png)
+
+![Restore configuration](./media/backup-azure-arm-restore-vms/rest-config.png)
+
+![Trigger restore in progress notification](./media/backup-azure-arm-restore-vms/restorenotifications.png)
+
+- To restore and create a VM, refer to [Create a VM](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#create-a-vm).
+- To restore as a disk, refer to [Restore disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-disks).
+
+### Monitoring secondary region restore jobs
+
+1. From the portal, go to **Recovery Services vault** > **Backup Jobs**
+2. Click **Secondary Region** to view the items in the secondary region.
+
+![Backup jobs filtered](./media/backup-azure-arm-restore-vms/secbackupjobs.png)
+
 ## Restore VMs with special configurations
 
 There are a number of common scenarios in which you might need to restore VMs.

articles/backup/backup-azure-file-folder-backup-faq.md

@@ -72,9 +72,9 @@ The MARS agent relies on NTFS, and uses the filepath length specification limite
 
 The MARS agent relies on NTFS, and allows [supported characters](/windows/desktop/FileIO/naming-a-file#naming-conventions) in file names/paths.
 
-### The warning "Azure Backups have not been configured for this server" appears.
+### The warning "Azure Backups have not been configured for this server" appears
 
-This warning can appear even though you've configured a backup policy, when the backup schedule settings stored on the local server are not the same as the settings stored in the backup vault.
+This warning can appear even though you've configured a backup policy, when the backup schedule settings stored on the local server aren't the same as the settings stored in the backup vault.
 
 * When the server or the settings have been recovered to a known good state, backup schedules can become unsynchronized.
 * If you receive this warning, [configure](backup-azure-manage-windows-server.md) the backup policy again, and then run an on-demand backup to resynchronize the local server with Azure.
@@ -87,7 +87,7 @@ The size of the cache folder determines the amount of data that you are backing
 
 * The cache folder volumes should have free space that equals at least 5-10% of the total size of backup data.
 * If the volume has less than 5% free space, either increase the volume size, or move the cache folder to a volume with enough space.
-* If you backup Windows System State, you will need an additional 30-35 GB of free space in the volume containing the cache folder.
+* If you backup Windows System State, you'll need an additional 30-35 GB of free space in the volume containing the cache folder.
 
 ### How to check if scratch folder is valid and accessible?
 
@@ -126,9 +126,9 @@ The size of the cache folder determines the amount of data that you are backing
 
 ### Where should the cache folder be located?
 
-The following locations for the cache folder are not recommended:
+The following locations for the cache folder aren't recommended:
 
-* Network share/removable media: The cache folder must be local to the server that needs backing up using online backup. Network locations or removable media like USB drives are not supported
+* Network share/removable media: The cache folder must be local to the server that needs backing up using online backup. Network locations or removable media like USB drives aren't supported.
 * Offline volumes: The cache folder must be online for expected backup using Azure Backup Agent
 
 ### Are there any attributes of the cache folder that aren't supported?
@@ -141,48 +141,51 @@ The following attributes or their combinations are not supported for the cache f
 * Sparse
 * Reparse-Point
 
-The cache folder and the metadata VHD do not have the necessary attributes for the Azure Backup agent.
+The cache folder and the metadata VHD don't have the necessary attributes for the Azure Backup agent.
 
 ### Is there a way to adjust the amount of bandwidth used for backup?
 
 Yes, you can use the **Change Properties** option in the MARS agent to adjust the bandwidth and timing. [Learn more](backup-configure-vault.md#enable-network-throttling).
 
 ## Restore
+
 ### Manage
-**Can I recover if I forgot my passphrase?**<br>
-The Azure Backup agent requires a passphrase (that you provided during registration) to decrypt the backed up data during restore. Review the scenarios below to understand your options for handling a lost passphrase:<br>
+
+**Can I recover if I forgot my passphrase?**
+The Azure Backup agent requires a passphrase (that you provided during registration) to decrypt the backed-up data during restore. Review the scenarios below to understand your options for handling a lost passphrase:
 
 | Original Machine <br> *(source machine where backups were taken)* | Passphrase | Available Options |
 | --- | --- | --- |
-| Available |Lost |If your original machine (where backups were taken) is available and still registered with the same Recovery Services vault, then you will be able to regenerate the passphrase by following these [steps](https://docs.microsoft.com/azure/backup/backup-azure-manage-mars#re-generate-passphrase).  |
+| Available |Lost |If your original machine (where backups were taken) is available and still registered with the same Recovery Services vault, then you can regenerate the passphrase by following these [steps](https://docs.microsoft.com/azure/backup/backup-azure-manage-mars#re-generate-passphrase).  |
 | Lost |Lost |Not possible to recover the data or data is not available |
 
 Consider the following conditions:
-- If you uninstall & re-register the agent on the same original machine with
-  - *Same passphrase*, then you will be able to restore your backed up data.<br>
-  - *Different passphrase*, then you will not be able to restore your backed up data.
--	If you install the agent on a *different machine* with<br>
-  - the same passphrase (used in the original machine), then you will be able to restore your backed up data.<br>
-  - a different passphrase, you will not be able to restore your backed up data.<br>
--	Additionally, if your original machine is corrupted (preventing you from regenerating the passphrase through the MARS console); but you are able to restore/access the original scratch folder used by the MARS agent, then you might be able to restore (if you forgot the password). For more assistance, contact Customer Support.
 
-**How do I recover if I lost my original machine (where backups were taken)?**<br>
+* If you uninstall and re-register the agent on the same original machine with
+  * *Same passphrase*, then you will be able to restore your backed-up data.
+  * *Different passphrase*, then you will not be able to restore your backed-up data.
+* If you install the agent on a *different machine* with
+  * *Same passphrase* (used in the original machine), then you will be able to restore your backed-up data.
+  * *Different passphrase*, you will not be able to restore your backed-up data.
+* If your original machine is corrupted (preventing you from regenerating the passphrase through the MARS console), but you can restore or access the original scratch folder used by the MARS agent, then you might be able to restore (if you forgot the password). For more assistance, contact Customer Support.
+
+**How do I recover if I lost my original machine (where backups were taken)?**
 
-If you have the same passphrase (that you provided during registration) of the original machine, then you can restore the backed up data to an alternate machine. Review the scenarios below to understand your restore options.
+If you have the same passphrase (that you provided during registration) of the original machine, then you can restore the backed-up data to an alternate machine. Review the scenarios below to understand your restore options.
 
 | Original Machine | Passphrase | Available Options |
 | --- | --- | --- |
-| Lost |Available |You can install and register the MARS agent on another machine with the same passphrase that you provided during registration of the original machine. Choose **Recovery Option** > **Another location** to perform your restore. For more information, refer to this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-windows-server#use-instant-restore-to-restore-data-to-an-alternate-machine).
+| Lost |Available |You can install and register the MARS agent on another machine with the same passphrase that you provided during registration of the original machine. Choose **Recovery Option** > **Another location** to perform your restore. For more information, see this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-windows-server#use-instant-restore-to-restore-data-to-an-alternate-machine).
 | Lost |Lost |Not possible to recover the data or data is not available |
 
 
 ### What happens if I cancel an ongoing restore job?
 
 If an ongoing restore job is canceled, the restore process stops. All files restored before the cancellation stay in configured destination (original or alternate location), without any rollbacks.
 
-### Does the MARS agent back up and restore ACLs set on files, Folders and volumes?
+### Does the MARS agent back up and restore ACLs set on files, folders, and volumes?
 
-* The MARS agent backs up ACLs set on files, folders and volumes
+* The MARS agent backs up ACLs set on files, folders, and volumes
 * For Volume Restore recovery option, the MARS agent provides an option to skip restoring ACL permissions to the file or folder being recovered
 * For the individual file and folders recovery option, the MARS agent will restore with ACL permissions (there is no option to skip ACL restore).
 

articles/backup/backup-configure-vault.md

@@ -260,17 +260,24 @@ Enable network throttling as follows:
 
 ## Run an on-demand backup
 
-1. In the MARS agent, click **Back Up Now**. This kicks off the initial replication over the network.
+1. In the MARS agent, click **Back Up Now**.
 
     ![Windows Server backup now](./media/backup-configure-vault/backup-now.png)
 
-2. In **Confirmation**, review the settings, and click **Back Up**.
-3. Click **Close** to close the wizard. If you do this before the backup finishes, the wizard continues to run in the background.
+2. If the MARS agent version is 2.0.9169.0 or newer, a custom retention can be set. In the **Retain Backup Till** section, choose a date from the presented calendar:
 
-After the initial backup is completed, the **Job completed** status appears in the Backup console.
+   ![Retain Backup calendar](./media/backup-configure-vault/mars-ondemand.png)
+
+3. In **Confirmation**, review the settings, and click **Back Up**.
+4. Click **Close** to close the wizard. If you do this before the backup finishes, the wizard continues to run in the background.
+5. After the initial backup is completed, the **Job completed** status appears in the Backup console.
 
 ## On-demand backup policy retention behavior
 
+>[!NOTE]
+>Applicable only to MARS agent versions older than 2.0.9169.0
+>
+
 * For more information, refer step 8 of [Create a backup policy](backup-configure-vault.md#create-a-backup-policy)
 
 | Backup Schedule option | How long will the backed-up data be retained?