Merge pull request #103113 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: huypub

articles/backup/backup-support-matrix-iaas.md

@@ -21,7 +21,7 @@ Here's how you can back up and restore Azure VMs with the Azure Backup service.
 
 **Scenario** | **Backup** | **Agent** |**Restore**
 --- | --- | --- | ---
-Direct backup of Azure VMs  | Back up the entire VM.  | No agent is needed on the Azure VM. Azure Backup installs and uses an extension to the [Azure VM agent](https://docs.microsoft.com/azure/virtual-machines/extensions/agent-windows) that is running on the VM. | Restore as follows:<br/><br/> - **Create a basic VM**. This is useful if the VM has no special configuration such as multiple IP addresses.<br/><br/> - **Restore the VM disk**. Restore the disk. Then attach it to an existing VM, or create a new VM from the disk by using PowerShell.<br/><br/> - **Replace VM disk**. If a VM exists and it uses managed disks (unencrypted), you can restore a disk and use it to replace an existing disk on the VM.<br/><br/> - **Restore specific files/folders**. You can restore files/folders from a VM instead of from the entire VM.
+Direct backup of Azure VMs  | Back up the entire VM.  | No additional agent is needed on the Azure VM. Azure Backup installs and uses an extension to the [Azure VM agent](https://docs.microsoft.com/azure/virtual-machines/extensions/agent-windows) that is running on the VM. | Restore as follows:<br/><br/> - **Create a basic VM**. This is useful if the VM has no special configuration such as multiple IP addresses.<br/><br/> - **Restore the VM disk**. Restore the disk. Then attach it to an existing VM, or create a new VM from the disk by using PowerShell.<br/><br/> - **Replace VM disk**. If a VM exists and it uses managed disks (unencrypted), you can restore a disk and use it to replace an existing disk on the VM.<br/><br/> - **Restore specific files/folders**. You can restore files/folders from a VM instead of from the entire VM.
 Direct backup of Azure VMs (Windows only)  | Back up specific files/folders/volume. | Install the [Azure Recovery Services agent](backup-azure-file-folder-backup-faq.md).<br/><br/> You can run the MARS agent alongside the backup extension for the Azure VM agent to back up the VM at file/folder level. | Restore specific folders/files.
 Back up Azure VM to backup server  | Back up files/folders/volumes; system state/bare metal files; app data to System Center DPM or to Microsoft Azure Backup Server (MABS).<br/><br/> DPM/MABS then backs up to the backup vault. | Install the DPM/MABS protection agent on the VM. The MARS agent is installed on DPM/MABS.| Restore files/folders/volumes; system state/bare metal files; app data.
 

articles/lab-services/classroom-labs/how-to-create-manage-template.md

@@ -35,17 +35,15 @@ Use the following steps to set title and description for the first time, and upd
 ## Update a template VM
 Use the following steps to update a template VM.  
 
-1. On the **Template** page, select **Customize template** on the toolbar. 
-2. On the **Customize template** dialog, select **Continue**. Once you start the template and make changes, it will no longer have the same setup as the virtual machines last published to your users. Template changes will not be reflected on your users' existing virtual machines until after you publish again.
-
-    ![Customize dialog box](../media/how-to-create-manage-template/customize-template-dialog.png)
 1. Wait until the template VM is started, and then select **Connect to template** on the toolbar to connect to the template VM, and follow instructions. If it's a Windows machine, you will see an option to download the RDP file. 
+1. Once you connect to the template and make changes, it will no longer have the same setup as the virtual machines last published to your users. Template changes will not be reflected on your users' existing virtual machines until after you publish again.
 
     ![Connect to the template VM](../media/how-to-create-manage-template/connect-template-vm.png)
+    
 1. Install any software that's required for students to do the lab (for example, Visual Studio, Azure Storage Explorer, etc.). 
-2. Disconnect (close your remote desktop session) from the template VM. 
-3. **Stop** the template VM by selecting **Stop template**. 
-4. Follow steps in the next section to **publish** the updated template VM. 
+1. Disconnect (close your remote desktop session) from the template VM. 
+1. **Stop** the template VM by selecting **Stop template**. 
+1. Follow steps in the next section to **Publish** the updated template VM. 
 
 ## Publish the template VM  
 If you don't publish the template while creating the lab, you can publish it later. Before publishing, you may want to connect to the template VM, and update it with any software. When you publish a template, Azure Lab Services creates VMs in the lab by using the template. The number of VMs created in this process are the number of VMs you specified when you published it for the first time or what you specified on the Virtual machine pool page. All virtual machines have the same configuration as the template. 
@@ -57,7 +55,7 @@ If you don't publish the template while creating the lab, you can publish it lat
 
     > [!IMPORTANT]
     > Once a template is published, it can't be unpublished. You can republish the template though. 
-4. You can see the status of the publishing process on the Template page. Wait for the status of the template to change to **Published**. 
+1. You can see the status of the publishing process on the Template page. Wait for the status of the template to change to **Published**. 
 
     ![Publish status](../media/how-to-create-manage-template/publish-status.png)
 1. Switch to the **Virtual machines** page, and confirm that you see virtual machines that are in **Unassigned** state. These VMs are not assigned to students yet. Wait until the VMs are created. They should be in **Stopped** state. You can start a student VM, connect to the VM, stop the VM, and delete the VM on this page. You can start them on this page or let your students start the VMs. 

articles/storage/common/storage-ref-azcopy-sync.md

@@ -136,13 +136,13 @@ azcopy sync "https://[account].file.core.windows.net/[share]/[path/to/dir]?[SAS]
 
 **--exclude-path** string Exclude these paths when copying. This option does not support wildcard characters (*). Checks relative path prefix(For example: myFolder;myFolder/subDirName/file.pdf). When used in combination with account traversal, paths do not include the container name.
 
-**--exclude-pattern** string      Exclude files where the name matches the pattern list. For example: *.jpg;*.pdf;exactName
+**--exclude-pattern** string      Exclude files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName
 
 **-h, --help**                        help for sync
 
 **--include-attributes** string   (Windows only) Include only files whose attributes match the attribute list. For example: A;S;R
 
-**--include-pattern** string      Include only files where the name matches the pattern list. For example: *.jpg;*.pdf;exactName
+**--include-pattern** string      Include only files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName
 
 **--log-level** string            Define the log verbosity for the log file, available levels: INFO(all requests and responses), WARNING(slow responses), ERROR(only failed requests), and NONE(no output logs). (default INFO). (default "INFO")