Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-availability-zones-regions-update

Author: rolyon

articles/active-directory/hybrid/how-to-connect-migrate-groups.md

@@ -1,5 +1,5 @@
 ---
-title: 'Azure AD Connect: Migrate groups from one forest to another | Microsoft Docs'
+title: 'Azure AD Connect: Migrate groups from one forest to another'
 description: This article describes the steps needed to successfully migrate groups from one forest to another for Azure AD Connect.
 services: active-directory
 author: billmath
@@ -16,28 +16,30 @@ ms.collection: M365-identity-device-management
 
 # Migrate groups from one forest to another for Azure AD Connect
 
-This article describes the steps needed to successfully migrate groups from one forest to another so that the migrated group objects match to the existing objects in the cloud.
+This article describes how to migrate groups from one forest to another so that the migrated group objects match the existing objects in the cloud.
 
 ## Prerequisites
 
-- Azure AD Connect version 1.5.18.0 or higher
-- Source Anchor attribute is `mS-DS-ConsistencyGuid`
+- Azure AD Connect version 1.5.18.0 or later
+- Source anchor attribute set to `mS-DS-ConsistencyGuid`
 
-Starting from version 1.5.18.0, Azure AD Connect has started supporting the use of `mS-DS-ConsistencyGuid` for groups. If `mS-DS-ConsistencyGuid` is chosen as the source anchor attribute and the value is populated in AD, Azure AD Connect uses the value of `mS-DS-ConsistencyGuid` as the immutableId. Otherwise, it falls back to using `objectGUID`. However, please note that Azure AD Connect **DOES NOT** write back the value to the `mS-DS-ConsistencyGuid` attribute in AD.
+## Migrate groups
 
-During a cross-forest move scenario where a group object is moving from one forest (say F1) to another forest (say F2), we will need to copy over either the `mS-DS-ConsistencyGuid` value (If PRESENT) or `objectGUID` value from the object in forest F1 to the `mS-DS-ConsistencyGuid` attribute of the object in F2. 
+Starting in version 1.5.18.0, Azure AD Connect supports the use of the `mS-DS-ConsistencyGuid` attribute for groups. If you choose `mS-DS-ConsistencyGuid` as the source anchor attribute and the value is populated in Active Directory, Azure AD Connect uses the value of `mS-DS-ConsistencyGuid` as the `immutableId`. Otherwise, it falls back to using `objectGUID`. But note that Azure AD Connect doesn't write the value back to the `mS-DS-ConsistencyGuid` attribute in Active Directory.
 
-Please use the following scripts as guideline to see how you can migrate a single group from forest F1 to forest F2. Please feel free to use this as a guideline to do the migration for multiple groups.
+During a cross-forest move, when a group object is moving from one forest (say F1) to another forest (say F2), you need to copy either the `mS-DS-ConsistencyGuid` value (if it's present) or the `objectGUID` value from the object in forest F1 to the `mS-DS-ConsistencyGuid` attribute of the object in F2.
 
-First, we get the `objectGUID` and `mS-DS-ConsistencyGuid` of group object in forest F1. These attributes are exported to a CSV file.
+Use the following scripts as a guide to learn how to migrate a single group from one forest to another. You can also use these scripts as a guide for the migration of multiple groups. The scripts use the forest name F1 for the source forest and F2 for the destination forest.
+
+First, we get the `objectGUID` and `mS-DS-ConsistencyGuid` of the group object in forest F1. These attributes are exported to a CSV file.
 ```
 <#
 DESCRIPTION
 ============
 This script will take DN of a group as input.
 It then copies the objectGUID and mS-DS-ConsistencyGuid values along with other attributes of the given group to a CSV file.
 
-This CSV file can then be used as input to Export-Group script
+This CSV file can then be used as input to the Export-Group script.
 #>
 Param(
        [ValidateNotNullOrEmpty()]
@@ -77,15 +79,15 @@ $results | Export-Csv "$outputCsv" -NoTypeInformation
 
 ```
 
-Next, we use the generated output CSV file to stamp the `mS-DS-ConsistencyGuid` attribute on the target object in forest F2.
+Next, we use the generated output CSV file to stamp the `mS-DS-ConsistencyGuid` attribute on the target object in forest F2:
 
 
 ```
 <#
 DESCRIPTION
 ============
-This script will take DN of a group as input and the CSV file that was generated by Import-Group script
-It copies either the objectGUID or mS-DS-ConsistencyGuid value from CSV file to the given object.
+This script will take DN of a group as input and the CSV file that was generated by the Import-Group script.
+It copies either the objectGUID or the mS-DS-ConsistencyGuid value from the CSV file to the given object.
 
 #>
 Param(
@@ -119,4 +121,4 @@ Set-ADGroup -Identity $dn -Replace @{'mS-DS-ConsistencyGuid'=$targetGuid} -Error
 ```
 
 ## Next steps
-Learn more about [Integrating your on-premises identities with Azure Active Directory](whatis-hybrid-identity.md).
+Learn more about [integrating your on-premises identities with Azure Active Directory](whatis-hybrid-identity.md).

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

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 12/10/2019
+ms.date: 04/28/2020
 ms.author: jeedes
 
 ms.collection: M365-identity-device-management
@@ -30,25 +30,16 @@ If you have an existing integration with Workplace by Facebook, please see the b
 * Changes on the Azure AD side: The authorization method to provision users in Workplace has historically been a long lived secret token. Soon you will see the authorization method changed to the OAuth authorization grant. 
 * Changes on the Workplace side: Previously the Azure AD app was a custom integration in Workplace by Facebook. Now you will see Azure AD in the Workplace integrations directory as a third party application. 
 
- 
-
 #### What do I need to do to migrate my existing custom integration to the new application?
-If you have an existing Workplace integration with a valid token, **no action is required**. We are automatically migrating customers each week to the new application. This is done completely behind the scenes. If you can't wait and want to move to the new application manually, you can add a new instance of Workplace from the gallery, and configure provisioning again. All new instances of Workplace will automatically be using the new application version. 
-
+If you have an existing Workplace integration with a valid token, no action is required. **As of 04/28/2020 we have automatically migrated all applications that are not in quarantine due to invalid credentials.**
 
-If your Workplace integration is in quarantine, you will need to supply a valid token again in order for us to migrate you. The admin credentials section will be greyed out, but you can append the following (**?Microsoft_AAD_IAM_userProvisioningEnableCredentialsOverride=true**) to your URL to save credentials again. 
-
-https://portal.azure.com/?Microsoft_AAD_IAM_userProvisioningEnableCredentialsOverride=true
-
 #### How can I tell if my application has been migrated? 
-When your application is migrated, the banner in the authorization section about upcomming changes will be removed and the secret token field will be replaced with a blue authorize button. 
+* In the Azure Portal: When your application is migrated, the banner in the authorization section about upcoming changes will be removed and the secret token field will be replaced with a blue authorize button. 
+* In the Workplace by Facebook portal: Review the Azure AD app to ensure that it is approved.  
 
 #### The admin credentials section is greyed out on my application and I can't save. Why?
-We have locked down the admin credentials section for existing Workplace customers. When your tenant has been migrated to the new Workplace application you will be able to update the admin credentials section again. If you can't wait, you can use the URL above to edit your application. 
+We have locked down the admin credentials section for Workplace customers that have not migrated. Please use the following URL if the admin credentials section is greyed out and you need to authorize access again. **?Microsoft_AAD_IAM_userProvisioningEnableCredentialsOverride=true** (https://portal.azure.com/?Microsoft_AAD_IAM_userProvisioningEnableCredentialsOverride=true)
 
- 
-#### 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 by May. The workplace team has provided an extension on the deadline from Feb-28 to May-1. 
 
 ## Capabilities supported
 > [!div class="checklist"]

articles/batch/batch-apis-tools.md

@@ -32,7 +32,7 @@ Your applications and services can issue direct REST API calls or use one or mor
 | --- | --- | --- | --- | --- | --- |
 | **Batch REST** |[docs.microsoft.com][batch_rest] |N/A |- |- | [Supported Versions](/rest/api/batchservice/batch-service-rest-api-versioning) |
 | **Batch .NET** |[docs.microsoft.com][api_net] |[NuGet][api_net_nuget] |[Tutorial](tutorial-parallel-dotnet.md) |[GitHub][api_sample_net] | [Release Notes](https://aka.ms/batch-net-dataplane-changelog) |
-| **Batch Python** |[docs.microsoft.com][api_python] |[PyPI][api_python_pypi] |[Tutorial](tutorial-parallel-python.md)|[GitHub][api_sample_python] | [Readme](https://github.com/Azure/azure-sdk-for-python/blob/master/doc/batch.rst) |
+| **Batch Python** |[docs.microsoft.com][api_python] |[PyPI][api_python_pypi] |[Tutorial](tutorial-parallel-python.md)|[GitHub][api_sample_python] | [Readme](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/batch/azure-batch/README.md) |
 | **Batch Node.js** |[docs.microsoft.com][api_nodejs] |[npm][api_nodejs_npm] |[Tutorial](batch-nodejs-get-started.md) |- | [Readme](https://github.com/Azure/azure-sdk-for-node/tree/master/lib/services/batch) |
 | **Batch Java** |[docs.microsoft.com][api_java] |[Maven][api_java_jar] |- |[Readme][api_sample_java] | [Readme](https://github.com/Azure/azure-batch-sdk-for-java)|
 

articles/batch/batch-mpi.md

@@ -176,9 +176,7 @@ The following environment variables are created by the Batch service for use by
 For full details on these and the other Batch compute node environment variables, including their contents and visibility, see [Compute node environment variables][msdn_env_var].
 
 > [!TIP]
-> The Batch Linux MPI code sample contains an example of how several of these environment variables can be used. The [coordination-cmd][coord_cmd_example] Bash script downloads common application and input files from Azure Storage, enables a Network File System (NFS) share on the master node, and configures the other nodes allocated to the multi-instance task as NFS clients.
->
->
+> The Batch Linux MPI code sample contains an example of how several of these environment variables can be used.
 
 ## Resource files
 There are two sets of resource files to consider for multi-instance tasks: **common resource files** that *all* tasks download (both primary and subtasks), and the **resource files** specified for the multi-instance task itself, which *only the primary* task downloads.

articles/batch/batch-task-output-file-conventions.md

@@ -177,7 +177,7 @@ foreach (CloudTask task in myJob.ListTasks())
 
 ## View output files in the Azure portal
 
-The Azure portal displays task output files and logs that are persisted to a linked Azure Storage account using the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions). You can implement these conventions yourself in the a language of your choice, or you can use the File Conventions library in your .NET applications.
+The Azure portal displays task output files and logs that are persisted to a linked Azure Storage account using the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files). You can implement these conventions yourself in the a language of your choice, or you can use the File Conventions library in your .NET applications.
 
 To enable the display of your output files in the portal, you must satisfy the following requirements:
 

articles/batch/batch-task-output-files.md

@@ -22,7 +22,7 @@ Azure Batch provides more than one way to persist task output. Using the Batch s
 - You want to write code to persist task output from within your client application, without modifying the application that your task is running.
 - You want to persist output from Batch tasks and job manager tasks in pools created with the virtual machine configuration.
 - You want to persist output to an Azure Storage container with an arbitrary name.
-- You want to persist output to an Azure Storage container named according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions). 
+- You want to persist output to an Azure Storage container named according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files). 
 
 If your scenario differs from those listed above, you may need to consider a different approach. For example, the Batch service API does not currently support streaming output to Azure Storage while the task is running. To stream output, consider using the Batch File Conventions library, available for .NET. For other languages, you'll need to implement your own solution. For more information on other options for persisting task output, see [Persist job and task output to Azure Storage](batch-task-output.md).
 
@@ -152,7 +152,7 @@ there are many contributing factors to upload performance, including the size of
 
 ## Use the Batch service API with the Batch File Conventions standard
 
-When you persist task output with the Batch service API, you can name your destination container and blobs however you like. You can also choose to name them according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions). The File Conventions standard determines the names of the destination container and blob in Azure Storage for a given output file based on the names of the job and task. If you do use the File Conventions standard for naming output files, then your output files are available for viewing in the [Azure portal](https://portal.azure.com).
+When you persist task output with the Batch service API, you can name your destination container and blobs however you like. You can also choose to name them according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files). The File Conventions standard determines the names of the destination container and blob in Azure Storage for a given output file based on the names of the job and task. If you do use the File Conventions standard for naming output files, then your output files are available for viewing in the [Azure portal](https://portal.azure.com).
 
 If you are developing in C#, you can use the methods built into the [Batch File Conventions library for .NET](https://www.nuget.org/packages/Microsoft.Azure.Batch.Conventions.Files). This library creates the properly named containers and blob paths for you. For example, you can call the API to get the correct name for the container, based on the job name: