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

Author: memildin

.openpublishing.redirection.json

@@ -48912,10 +48912,20 @@
       "redirect_url": "/azure/chef/chef-automation",
       "redirect_document_id": true
     },
-	{
-		 "source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
-		"redirect_url": "/azure/azure-monitor/overview",
-		"redirect_document_id": false 
-	}
+    {
+      "source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
+      "redirect_url": "/azure/azure-monitor/overview",
+      "redirect_document_id": false 
+    },
+    {
+      "source_path": "articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md",
+      "redirect_url": "/azure/jenkins/tutorial-build-deploy-jenkins",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
+      "redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
+      "redirect_document_id": false 
+    }
   ]
 }

articles/active-directory/saas-apps/workplacebyfacebook-provisioning-tutorial.md

@@ -48,7 +48,7 @@ We have locked down the admin credentials section for existing Workplace custome
 
 
 #### When will these changes happen?
-All new instances of Workplace will already be using the new integration / authorization method. Existing integrations will be migrated gradually in February. The migration will be completed for all tenants by the end of the Month. 
+All new instances of Workplace will already be using the new integration / authorization method. Existing integrations will be migrated gradually by May. The workplace team has provided an extension on the deadline from Feb-28 to May-1. 
 
 ## Capabilities supported
 > [!div class="checklist"]

articles/ansible/ansible-create-configure-mysql.md

@@ -18,7 +18,7 @@ ms.date: 04/30/2019
 >
 > * Create a MySql server
 > * Create a MySql database
-> * Configure a filewall rule so that an external app can connect to your server
+> * Configure a firewall rule so that an external app can connect to your server
 > * Connect to your MySql server from the Azure cloud shell
 > * Query your available MySQL servers
 > * List all databases in your connected servers

articles/backup/backup-azure-mabs-troubleshoot.md

@@ -104,7 +104,7 @@ We recommend you perform the below validation, before you start troubleshooting
 
 | Operation | Error details | Workaround |
 | --- | --- | --- |
-| Setting up email notifications using an Office 365 account |Error ID: 2013| **Cause:**<br> Trying to use Office 365 account <br>**Recommended action:**<ol><li> The first thing to ensure is that “Allow Anonymous Relay on a Receive Connector” for your DPM server is set up on Exchange. For more information about how to configure this, see [Allow Anonymous Relay on a Receive Connector](https://docs.microsoft.com/previous-versions/office/exchange-server-2010/bb232021(v=exchg.141)).</li> <li> If you can't use an internal SMTP relay and need to set up by using your Office 365 server, you can set up IIS to be a relay. Configure the DPM server to [relay the SMTP to O365 using IIS](https://docs.microsoft.com/previous-versions/tn-archive/aa995718(v=exchg.65)).<br><br>  Be sure to use the user\@domain.com format and *not* domain\user.<br><br><li>Point DPM to use the local server name as SMTP server, port 587. Then point it to the user email that the emails should come from.<li> The username and password on the DPM SMTP setup page should be for a domain account in the domain that DPM is on. </li><br> When you are changing the SMTP server address, make the change to the new settings, close the settings box, and then reopen it to be sure it reflects the new value.  Simply changing and testing might not always cause the new settings to take effect, so testing it this way is a best practice.<br><br>At any time during this process, you can clear these settings by closing the DPM console and editing the following registry keys: **HKLM\SOFTWARE\Microsoft\Microsoft Data Protection Manager\Notification\ <br/> Delete SMTPPassword and SMTPUserName keys**. You can add them back to the UI when you launch it again.
+| Setting up email notifications using an Office 365 account |Error ID: 2013| **Cause:**<br> Trying to use Office 365 account <br>**Recommended action:**<ol><li> The first thing to ensure is that “Allow Anonymous Relay on a Receive Connector” for your DPM server is set up on Exchange. For more information about how to configure this, see [Allow Anonymous Relay on a Receive Connector](https://docs.microsoft.com/exchange/mail-flow/connectors/allow-anonymous-relay?view=exchserver-2019).</li> <li> If you can't use an internal SMTP relay and need to set up by using your Office 365 server, you can set up IIS to be a relay. Configure the DPM server to [relay the SMTP to O365 using IIS](https://docs.microsoft.com/exchange/mail-flow/test-smtp-with-telnet?view=exchserver-2019)).<br><br>  Be sure to use the user\@domain.com format and *not* domain\user.<br><br><li>Point DPM to use the local server name as SMTP server, port 587. Then point it to the user email that the emails should come from.<li> The username and password on the DPM SMTP setup page should be for a domain account in the domain that DPM is on. </li><br> When you are changing the SMTP server address, make the change to the new settings, close the settings box, and then reopen it to be sure it reflects the new value.  Simply changing and testing might not always cause the new settings to take effect, so testing it this way is a best practice.<br><br>At any time during this process, you can clear these settings by closing the DPM console and editing the following registry keys: **HKLM\SOFTWARE\Microsoft\Microsoft Data Protection Manager\Notification\ <br/> Delete SMTPPassword and SMTPUserName keys**. You can add them back to the UI when you launch it again.
 
 ## Common issues
 

articles/backup/backup-azure-restore-system-state.md

@@ -153,7 +153,7 @@ Once you have recovered System State as files using Azure Recovery Services Agen
 System State backup includes Active Directory data. Use the following steps to restore Active Directory Domain Service (AD DS) from its current state to a previous state.
 
 1. Restart the domain controller in Directory Services Restore Mode (DSRM).
-2. Follow the steps [here](https://docs.microsoft.com/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc794755(v=ws.10)) to use Windows Server Backup cmdlets to recover AD DS.
+2. Follow the steps [here](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/ad-forest-recovery-nonauthoritative-restore) to use Windows Server Backup cmdlets to recover AD DS.
 
 ## Troubleshoot failed System State restore
 

articles/backup/backup-azure-troubleshoot-slow-backup-performance-issue.md

@@ -39,7 +39,7 @@ We also strongly recommend that you review the [Azure Backup service FAQ](backup
 
 Bottlenecks on the computer that's being backed up can cause delays. For example, the computer's ability to read or write to disk, or available bandwidth to send data over the network, can cause bottlenecks.
 
-Windows provides a built-in tool called [Performance Monitor](https://docs.microsoft.com/previous-versions/technet-magazine/cc718984(v=msdn.10)) (Perfmon) to detect these bottlenecks.
+Windows provides a built-in tool called [Performance Monitor](hhttps://techcommunity.microsoft.com/t5/ask-the-performance-team/windows-performance-monitor-overview/ba-p/375481) (Perfmon) to detect these bottlenecks.
 
 Here are some performance counters and ranges that can be helpful in diagnosing bottlenecks for optimal backups.
 

articles/backup/backup-sql-server-azure-troubleshoot.md

@@ -65,7 +65,7 @@ If the SQL VM needs to be registered in the new vault, then it must be unregiste
 
 | Error message | Possible causes | Recommended action |
 |---|---|---|
-| Azure Backup is not able to connect to the SQL instance. | Azure Backup can't connect to the SQL Server instance. | Use the additional details on the Azure portal error menu to narrow down the root causes. Refer to [SQL backup troubleshooting](https://docs.microsoft.com/sql/database-engine/configure-windows/troubleshoot-connecting-to-the-sql-server-database-engine) to fix the error.<br/><ul><li>If the default SQL settings don't allow remote connections, change the settings. See the following articles for information about changing the settings:<ul><li>[MSSQLSERVER_-1](/previous-versions/sql/sql-server-2016/bb326495(v=sql.130))</li><li>[MSSQLSERVER_2](/sql/relational-databases/errors-events/mssqlserver-2-database-engine-error)</li><li>[MSSQLSERVER_53](/sql/relational-databases/errors-events/mssqlserver-53-database-engine-error)</li></ul></li></ul><ul><li>If there are login issues, use these links to fix them:<ul><li>[MSSQLSERVER_18456](/sql/relational-databases/errors-events/mssqlserver-18456-database-engine-error)</li><li>[MSSQLSERVER_18452](/sql/relational-databases/errors-events/mssqlserver-18452-database-engine-error)</li></ul></li></ul> |
+| Azure Backup is not able to connect to the SQL instance. | Azure Backup can't connect to the SQL Server instance. | Use the additional details on the Azure portal error menu to narrow down the root causes. Refer to [SQL backup troubleshooting](https://docs.microsoft.com/sql/database-engine/configure-windows/troubleshoot-connecting-to-the-sql-server-database-engine) to fix the error.<br/><ul><li>If the default SQL settings don't allow remote connections, change the settings. See the following articles for information about changing the settings:<ul><li>[MSSQLSERVER_-1](https://docs.microsoft.com/sql/relational-databases/errors-events/mssqlserver-1-database-engine-error?view=sql-server-ver15)</li><li>[MSSQLSERVER_2](/sql/relational-databases/errors-events/mssqlserver-2-database-engine-error)</li><li>[MSSQLSERVER_53](/sql/relational-databases/errors-events/mssqlserver-53-database-engine-error)</li></ul></li></ul><ul><li>If there are login issues, use these links to fix them:<ul><li>[MSSQLSERVER_18456](/sql/relational-databases/errors-events/mssqlserver-18456-database-engine-error)</li><li>[MSSQLSERVER_18452](/sql/relational-databases/errors-events/mssqlserver-18452-database-engine-error)</li></ul></li></ul> |
 
 ### UserErrorParentFullBackupMissing
 
@@ -101,7 +101,7 @@ If the SQL VM needs to be registered in the new vault, then it must be unregiste
 
 | Error message | Possible causes | Recommended action |
 |---|---|---|
-| The log backup used for recovery contains bulk-logged changes. It cannot be used to stop at an arbitrary point in time as per the SQL guidelines. | When a database is in bulk-logged recovery mode, the data between a bulk-logged transaction and the next log transaction can't be recovered. | Choose a different point in time for recovery. [Learn more](https://docs.microsoft.com/previous-versions/sql/sql-server-2008-r2/ms186229(v=sql.105)).
+| The log backup used for recovery contains bulk-logged changes. It cannot be used to stop at an arbitrary point in time as per the SQL guidelines. | When a database is in bulk-logged recovery mode, the data between a bulk-logged transaction and the next log transaction can't be recovered. | Choose a different point in time for recovery. [Learn more](https://docs.microsoft.com/sql/relational-databases/backup-restore/recovery-models-sql-server?view=sql-server-ver15).
 
 ### FabricSvcBackupPreferenceCheckFailedUserError
 

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

@@ -100,12 +100,12 @@ Recovery points on DPM/MABS disk | 64 for file servers, and 448 for app servers.
 
 ## Supported restore methods
 
-**Restore method** | **Details**
+**Restore option** | **Details**
 --- | ---
-Create a new VM | You can create a VM during the restore process. <br/><br/> This option gets a basic VM up and running. You can specify the VM name, resource group,  virtual network, subnet, and storage.  
-Restore a disk | You can restore a disk and use it to create a VM.<br/><br/> When you select this option, Azure Backup copies data from the vault to a storage account that you select. The restore job generates a template. You can download this template, use it to specify custom VM settings, and create a VM.<br/><br/> This option allows you to specify more settings that the previous option to create a VM.<br/><br/>
-Replace an existing disk | You can restore a disk and then use the restored disk to replace a disk that's currently on a VM.
-Restore files | You can recover files from a selected recovery point. You download a script to mount the VM disk from the recovery point. You then browse through the disk volumes to find the files/folders you want to recover and unmount the disk when you're done.
+**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 isn't supported for VMs with linked resources (like [user-assigned managed-identity](https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview) or [Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)) because the backup client-app doesn't have permissions on these resources while performing the restore.
+**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.
 
 ## Support for file-level restore
 

articles/cognitive-services/Speech-Service/language-support.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: conceptual
-ms.date: 01/31/2020
+ms.date: 02/19/2020
 ms.author: dapine
 ms.custom: seodec18
 ---
@@ -90,9 +90,10 @@ For more information about regional availability, see [regions](regions.md#stand
 Locale | Language | Gender | Full service name mapping | Short voice name
 --------|----------|--------|---------|------------
 `de-DE` | German (Germany) | Female | "Microsoft Server Speech Text to Speech Voice (de-DE, KatjaNeural)" | "de-DE-KatjaNeural"
-`en-US` | English (US) | Male | "Microsoft Server Speech Text to Speech Voice (en-US, GuyNeural)" | "en-US-GuyNeural"
 `en-US` | English (US) | Female | "Microsoft Server Speech Text to Speech Voice (en-US, JessaNeural)" | "en-US-JessaNeural"
+`en-US` | English (US) | Male | "Microsoft Server Speech Text to Speech Voice (en-US, GuyNeural)" | "en-US-GuyNeural"
 `it-IT` | Italian (Italy) | Female |"Microsoft Server Speech Text to Speech Voice (it-IT, ElsaNeural)" | "it-IT-ElsaNeural"
+`pt-BR` | Portuguese (Brazil) | Female | "Microsoft Server Speech Text to Speech Voice (pt-BR, FranciscaNeural)" | "pt-BR-FranciscaNeural"
 `zh-CN` | Chinese (Mainland) | Female | "Microsoft Server Speech Text to Speech Voice (zh-CN, XiaoxiaoNeural)" | "zh-CN-XiaoxiaoNeural"
 
 To learn how you can configure and adjust neural voices, see [Speech synthesis markup language](speech-synthesis-markup.md#adjust-speaking-styles).

articles/docker/index.md

@@ -27,7 +27,7 @@ ms.author: gwallace
 <ol>
   <li><a href="/azure/app-service/containers/tutorial-python-postgresql-app">Build Python and PostgreSQL with Docker</a></li>
   <li><a href="/azure/container-service/container-service-docker-swarm-mode-setup-ci-cd-acs-engine">CI/CD with Docker Swarm and Azure DevOps Services</a></li>
-  <li><a href="/azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd">Integrate Docker, Jenkins, and Linux VMs</a></li>
+  <li><a href="/azure/jenkins/tutorial-jenkins-github-docker-cicd">Integrate Docker, Jenkins, and Linux VMs</a></li>
 </ol>
 <h2>Resources</h2>
 <p>See the following links for additional reference materials and tools for working with Docker on Azure.</p>