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

Author: dagiro

articles/cosmos-db/how-to-manage-consistency.md

@@ -1,10 +1,10 @@
 ---
 title: Manage consistency in Azure Cosmos DB
-description: Learn how to configure and manage consistency levels in Azure Cosmos DB using Azure portal, .Net SDK, Java SDK and various other SDKs
+description: Learn how to configure and manage consistency levels in Azure Cosmos DB using Azure portal, .NET SDK, Java SDK and various other SDKs
 author: markjbrown
 ms.service: cosmos-db
 ms.topic: conceptual
-ms.date: 12/02/2019
+ms.date: 04/24/2020
 ms.author: mjbrown
 ---
 
@@ -16,42 +16,32 @@ This article explains how to manage consistency levels in Azure Cosmos DB. You l
 
 ## Configure the default consistency level
 
-The [default consistency level](consistency-levels.md) is the consistency level that clients use by default. Clients can always override it.
+The [default consistency level](consistency-levels.md) is the consistency level that clients use by default.
 
 ### CLI
 
+Create a Cosmos account with Session consistency, then update the default consistency.
+
 ```azurecli
-# create with a default consistency
-az cosmosdb create --name <name of Cosmos DB Account> --resource-group <resource group name> --default-consistency-level Session
+# Create a new account with Session consistency
+az cosmosdb create --name $accountName --resource-group $resourceGroupName --default-consistency-level Session
 
 # update an existing account's default consistency
-az cosmosdb update --name <name of Cosmos DB Account> --resource-group <resource group name> --default-consistency-level Eventual
+az cosmosdb update --name $accountName --resource-group $resourceGroupName --default-consistency-level Strong
 ```
 
 ### PowerShell
 
-This example creates a new Azure Cosmos account with multiple write regions enabled, in East US and West US regions. The default consistency level is set to *Session* consistency.
+Create a Cosmos account with Session consistency, then update the default consistency.
 
 ```azurepowershell-interactive
-$locations = @(@{"locationName"="East US"; "failoverPriority"=0},
-             @{"locationName"="West US"; "failoverPriority"=1})
-
-$iprangefilter = ""
-
-$consistencyPolicy = @{"defaultConsistencyLevel"="Session"}
+# Create a new account with Session consistency
+New-AzCosmosDBAccount -ResourceGroupName $resourceGroupName `
+  -Location $locations -Name $accountName -DefaultConsistencyLevel "Session"
 
-$CosmosDBProperties = @{"databaseAccountOfferType"="Standard";
-                        "locations"=$locations;
-                        "consistencyPolicy"=$consistencyPolicy;
-                        "ipRangeFilter"=$iprangefilter;
-                        "enableMultipleWriteLocations"="true"}
-
-New-AzResource -ResourceType "Microsoft.DocumentDb/databaseAccounts" `
-  -ApiVersion "2015-04-08" `
-  -ResourceGroupName "myResourceGroup" `
-  -Location "East US" `
-  -Name "myCosmosDbAccount" `
-  -Properties $CosmosDBProperties
+# Update an existing account's default consistency
+Update-AzCosmosDBAccount -ResourceGroupName $resourceGroupName `
+  -Name $accountName -DefaultConsistencyLevel "Strong"
 ```
 
 ### Azure portal
@@ -62,8 +52,10 @@ To view or modify the default consistency level, sign in to the Azure portal. Fi
 
 ## Override the default consistency level
 
-Clients can override the default consistency level that is set by the service. 
-Consistency level can be set on a per request, which overrides the default consistency level set at the account level.
+Clients can override the default consistency level that is set by the service. Consistency level can be set on a per request, which overrides the default consistency level set at the account level.
+
+> [!TIP]
+> Consistency can only be **relaxed** at the request level. To move from weaker to stronger consistency, update the default consistency for the Cosmos account.
 
 ### <a id="override-default-consistency-dotnet"></a>.NET SDK V2
 
@@ -85,8 +77,8 @@ ItemRequestOptions requestOptions = new ItemRequestOptions { ConsistencyLevel =
 
 var response = await client.GetContainer(databaseName, containerName)
     .CreateItemAsync(
-        item, 
-        new PartitionKey(itemPartitionKey), 
+        item,
+        new PartitionKey(itemPartitionKey),
         requestOptions);
 ```
 
@@ -231,7 +223,6 @@ How eventual is eventual consistency? For the average case, can we offer stalene
 
 ![PBS graph in the Azure portal](./media/how-to-manage-consistency/pbs-metric.png)
 
-
 ## Next steps
 
 Learn more about how to manage data conflicts, or move on to the next key concept in Azure Cosmos DB. See the following articles:

articles/machine-learning/concept-enterprise-security.md

@@ -73,7 +73,7 @@ The following table lists some of the major Azure Machine Learning operations an
 If the built-in roles don't meet your needs, you can create custom roles. Custom roles are supported only for operations on the workspace and Machine Learning Compute. Custom roles can have read, write, or delete permissions on the workspace and on the compute resource in that workspace. You can make the role available at a specific workspace level, a specific resource-group level, or a specific subscription level. For more information, see [Manage users and roles in an Azure Machine Learning workspace](how-to-assign-roles.md).
 
 > [!WARNING]
-> Azure Machine Learning is not currently supported with Azure Active Directory business-to-business collaboration.
+> Azure Machine Learning is supported with Azure Active Directory business-to-business collaboration, but is not currently supported with Azure Active Directory business-to-consumer collaboration.
 
 ### Securing compute targets and data