Merge pull request #84982 from MicrosoftDocs/repo_sync_working_branch

rmca14 · web-flow · commit 765a26c33cf2 · 2019-08-12T10:03:41.000-07:00
Resolve syncing conflicts from repo_sync_working_branch to master
diff --git a/articles/active-directory-b2c/active-directory-b2c-setup-qq-app.md b/articles/active-directory-b2c/active-directory-b2c-setup-qq-app.md
@@ -26,7 +26,7 @@ To use a QQ account as an identity provider in Azure Active Directory (Azure AD)
 ### Register for the QQ developer program
 
 1. Sign in to the [QQ developer portal](http://open.qq.com) with your QQ account credentials.
-2. After signing in, go to [http://open.qq.com/reg](http://open.qq.com/reg) to register yourself as a developer.
+2. After signing in, go to [https://open.qq.com/reg](https://open.qq.com/reg) to register yourself as a developer.
 3. Select **个人** (individual developer).
 4. Enter the required information and select **下一步** (next step).
 5. Complete the email verification process. You will need to wait a few days to be approved after registering as a developer. 
diff --git a/articles/active-directory/conditional-access/best-practices.md b/articles/active-directory/conditional-access/best-practices.md
@@ -47,7 +47,8 @@ More than one Conditional Access policy may apply when you access a cloud app. I
 All policies are enforced in two phases:
 
 - In the **first** phase, all policies are evaluated and all access controls that aren't satisfied are collected. 
-- In the **second** phase, you are prompted to satisfy the requirements you haven't met. If any one of the policies block access, you are blocked and not prompted to satisfy other policy controls. If policies do not block you, you are prompted to satisfy other policy controls in the following order:
+
+- In the **second** phase, you are prompted to satisfy the requirements you haven't met. If any one of the policies block access, you are blocked and not prompted to satisfy other policy controls. If none of the policies block you, you are prompted to satisfy other policy controls in the following order:
 
    ![Order](./media/best-practices/06.png)
     
diff --git a/articles/active-directory/hybrid/how-to-connect-sso-quick-start.md b/articles/active-directory/hybrid/how-to-connect-sso-quick-start.md
@@ -139,7 +139,7 @@ There are two ways to modify users' Intranet zone settings:
 
     ![Single sign-on](./media/how-to-connect-sso-quick-start/sso7.png)
 
-6. Browse to **User Configuration** > **Administrative Templates** **Policy** > **> **Windows Components** > **Internet Explorer** > **Internet Control Panel** > **Security Page** > **Intranet Zone**. Then select **Allow updates to status bar via script**.
+6. Browse to **User Configuration** > **Policy** > **Administrative Templates** > **Windows Components** > **Internet Explorer** > **Internet Control Panel** > **Security Page** > **Intranet Zone**. Then select **Allow updates to status bar via script**.
 
     ![Single sign-on](./media/how-to-connect-sso-quick-start/sso11.png)
 
diff --git a/articles/active-directory/manage-apps/isv-choose-multi-tenant-federation.md b/articles/active-directory/manage-apps/isv-choose-multi-tenant-federation.md
@@ -67,7 +67,7 @@ For information on how to register your application and implement these protocol
 
 Security Assertion Markup Language (SAML) is usually used for web applications. See [How Azure uses the SAML protocol](../develop/active-directory-saml-protocol-reference.md) for an overview. 
 
-Web Services Federation (WSFed) is an [industry standard](http://docs.oasis-open.org/wsfed/federation/v1.2/ws-federation.html) generally used for web applications that are developed using the .Net platform.
+Web Services Federation (WSFed) is an [industry standard](https://docs.oasis-open.org/wsfed/federation/v1.2/ws-federation.html) generally used for web applications that are developed using the .Net platform.
 
 ### Benefits
 
diff --git a/articles/active-directory/manage-apps/methods-for-assigning-users-and-groups.md b/articles/active-directory/manage-apps/methods-for-assigning-users-and-groups.md
@@ -78,7 +78,7 @@ To assign one or more users to an application directly, follow the steps below:
 
 15. Click the **Assign** button to assign the application to the selected users.
 
-After a short period of time, the users you have selected be able to launch these applications using the methods described in the solution description section.
+After a short period of time, the users you have selected will be able to launch these applications using the methods described in the solution description section.
 
 ## Assign groups
 
@@ -116,7 +116,7 @@ To assign one or more groups to an application directly, follow the steps below:
 
 15. Click the **Assign** button to assign the application to the selected groups.
 
-After a short period of time, the users within the groups you have selected be able to launch these applications using the methods described in the solution description section. If these are dynamic groups, there may be some additional processing delay in these assignments appearing for users within these assigned groups.
+After a short period of time, the users within the groups you have selected will be able to launch these applications using the methods described in the solution description section. If these are dynamic groups, there may be some additional processing delay in these assignments appearing for users within these assigned groups.
 
 ## Enable self-service application access
 
@@ -161,7 +161,7 @@ To enable self-service application access to an application, follow the steps be
 
 Once you complete Self-service application configuration, users can navigate to their [Application Access Panel](https://myapps.microsoft.com/) and click the **+Add** button to find the apps to which you have enabled Self-service access. Business approvers also see a notification in their [Application Access Panel](https://myapps.microsoft.com/). You can enable an email notifying them when a user has requested access to an application that requires their approval. 
 
-These approvals support single approval workflows only, meaning that if you specify multiple approvers, any single approver may approver access to the application.
+These approvals support single approval workflows only, meaning that if you specify multiple approvers, any single approver may approve access to the application.
 
 ## Next steps
 [Provide single sign-on to your apps with Application Proxy](application-proxy-configure-single-sign-on-with-kcd.md)
diff --git a/articles/active-directory/saas-apps/netsuite-tutorial.md b/articles/active-directory/saas-apps/netsuite-tutorial.md
@@ -118,7 +118,7 @@ To configure Azure AD single sign-on with NetSuite, perform the following steps:
 	`https://<tenant-name>.na2.sandbox.NetSuite.com/saml2/acs`
 
 	> [!NOTE]
-	> The value is not real. Update the value with the actual Reply URL. Contact [NetSuite Client support team](http://www.netsuite.com/portal/services/support-services/suitesupport.shtml) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+	> The value is not real. Update the value with the actual Reply URL. Contact [NetSuite Client support team](https://www.netsuite.com/portal/services/support-services/suitesupport.shtml) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
 5. NetSuite application expects the SAML assertions in a specific format. Configure the following claims for this application. You can manage the values of these attributes from the **User Attributes** section on application integration page. On the **Set up Single Sign-On with SAML** page, click **Edit** button to open **User Attributes** dialog.
 
diff --git a/articles/aks/operator-best-practices-multi-region.md b/articles/aks/operator-best-practices-multi-region.md
@@ -104,7 +104,7 @@ Your applications might use Azure Storage for their data. Because your applicati
 
 Your applications might require persistent storage even after a pod is deleted. In Kubernetes, you can use persistent volumes to persist data storage. Persistent volumes are mounted to a node VM and then exposed to the pods. Persistent volumes follow pods even if the pods are moved to a different node inside the same cluster.
 
-The replication strategy you use depends on your storage solution. Common storage solutions such as [Gluster](https://docs.gluster.org/en/latest/Administrator%20Guide/Geo%20Replication/), [Ceph](http://docs.ceph.com/docs/master/cephfs/disaster-recovery/), [Rook](https://rook.io/docs/rook/master/disaster-recovery.html), and [Portworx](https://docs.portworx.com/scheduler/kubernetes/going-production-with-k8s.html#disaster-recovery-with-cloudsnaps) provide their own guidance about disaster recovery and replication.
+The replication strategy you use depends on your storage solution. Common storage solutions such as [Gluster](https://docs.gluster.org/en/latest/Administrator%20Guide/Geo%20Replication/), [Ceph](https://docs.ceph.com/docs/master/cephfs/disaster-recovery/), [Rook](https://rook.io/docs/rook/master/disaster-recovery.html), and [Portworx](https://docs.portworx.com/scheduler/kubernetes/going-production-with-k8s.html#disaster-recovery-with-cloudsnaps) provide their own guidance about disaster recovery and replication.
 
 The typical strategy is to provide a common storage point where applications can write their data. This data is then replicated across regions and then accessed locally.
 
diff --git a/articles/application-gateway/application-gateway-configure-ssl-policy-powershell.md b/articles/application-gateway/application-gateway-configure-ssl-policy-powershell.md
@@ -113,7 +113,6 @@ The following example sets a custom SSL policy on an application gateway. It set
 
 > [!IMPORTANT]
 > At least one cipher suite from the following list must be selected when configuring a custom SSL policy. Application gateway uses RSA SHA256 cipher suites for backend management.
-> * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
 > * TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
 > * TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
 > * TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
diff --git a/articles/application-gateway/self-signed-certificates.md b/articles/application-gateway/self-signed-certificates.md
@@ -145,7 +145,7 @@ The following configuration is an example [virtual host configured for SSL](http
 
 ### NGINX
 
-The following configuration is an example [NGINX server block](http://nginx.org/docs/http/configuring_https_servers.html) with SSL configuration:
+The following configuration is an example [NGINX server block](https://nginx.org/docs/http/configuring_https_servers.html) with SSL configuration:
 
 ![NGINX with SSL](media/self-signed-certificates/nginx-ssl.png)
 
diff --git a/articles/azure-functions/durable/durable-functions-unit-testing.md b/articles/azure-functions/durable/durable-functions-unit-testing.md
@@ -83,11 +83,11 @@ Next `CreateCheckStatusResponse` is mocked to always return an empty HTTP 200 re
         });
 ```
 
-`TraceWriter` is also mocked:
+`ILogger` is also mocked:
 
 ```csharp
-    // Mock TraceWriter
-    var traceWriterMock = new Mock<TraceWriter>(TraceLevel.Info);
+    // Mock ILogger
+    var loggerMock = new Mock<ILogger>();
 
 ```  
 
@@ -103,7 +103,7 @@ Now the `Run` method is called from the unit test:
         },
         durableOrchestrationClientBaseMock.Object,
         functionName,
-        traceWriterMock.Object);
+        loggerMock.Object);
  ```
 
  The last step is to compare the output with the expected value:
diff --git a/articles/azure-supportability/create-manage-support-requests-using-access-control.md b/articles/azure-supportability/create-manage-support-requests-using-access-control.md
@@ -61,7 +61,7 @@ Let’s take an example – you are the owner of Subscription "Visual Studio MSD
 Joe is your peer who is a resource owner to some of the resource groups in this subscription and has read permission to the subscription.
 You wish to give access to your peer, Joe, the ability to create and manage support tickets for the resources under this subscription.
 
-1. The first step is to go to the subscription and under "Settings" you see a list of users. Click the user Joe who has reader access on the Subscription and let’s assign a new custom role to him.
+1. The first step is to go to the subscription. Under **Settings**, you see a list of users. Select the user Joe, who has reader access on the subscription. Let's assign a new custom role to Joe.
 
     ![Add role](./media/create-manage-support-requests-using-access-control/add-role.png)
 
@@ -81,7 +81,7 @@ You wish to give access to your peer, Joe, the ability to create and manage supp
 
     ![User added](./media/create-manage-support-requests-using-access-control/user-added.png)
 
-    When Joe logs in the portal, he sees the subscription to which he was added.
+    When Joe sign in to the portal, Joe sees the subscription to which Joe was added.
 
 7. Joe clicks "New Support request" from the "Help and Support" blade and can create support requests for "Visual Studio Ultimate with MSDN"
 
@@ -93,15 +93,15 @@ You wish to give access to your peer, Joe, the ability to create and manage supp
 ## Remove support request access in the Azure portal
 
 Just as it is possible to grant access to a user to create and manage support requests, it's possible to remove access for the user as well.
-To remove the ability to create and manage support requests, go to the Subscription, click "Settings" and click the user (in this case, Joe).
-Right-click the role name, "Support Request Contributor" and click "Remove"
+
+To remove the ability to create and manage support requests, go to the Subscription, click "Settings" and click the user (in this case, Joe). Right-click the role name, "Support Request Contributor" and click "Remove"
 
 ![Remove support request access](./media/create-manage-support-requests-using-access-control/remove-support-request-access.png)
 
-When Joe logs in to the portal and tries to create a support request, he encounters the following error
+When Joe logs in to the portal and tries to create a support request, Joe encounters the following error:
 
 ![Subscription error-2](./media/create-manage-support-requests-using-access-control/subscription-error-2.png)
 
-Joe cannot see any support requests when he clicks "All support requests"
+Joe cannot see any support requests when Joe selects "All support requests"
 
 ![case details view-2](./media/create-manage-support-requests-using-access-control/case-details-view-2.png)
diff --git a/articles/cosmos-db/set-throughput.md b/articles/cosmos-db/set-throughput.md
@@ -36,7 +36,7 @@ The following image shows how a physical partition hosts one or more logical par
 
 ## Set throughput on a database
 
-When you provision throughput on an Azure Cosmos database, the throughput is shared across all the containers in the database. An exception is if you specified a provisioned throughput on specific containers in the database. Sharing the database-level provisioned throughput among its containers is analogous to hosting a database on a cluster of machines. Because all containers within a database share the resources available on a machine, you naturally do not get predictable performance on any specific container. To learn how to configure provisioned throughput on a database, see [Configure provisioned throughput on an Azure Cosmos database](how-to-provision-database-throughput.md).
+When you provision throughput on an Azure Cosmos database, the throughput is shared across all the containers (called shared database containers) in the database. An exception is if you specified a provisioned throughput on specific containers in the database. Sharing the database-level provisioned throughput among its containers is analogous to hosting a database on a cluster of machines. Because all containers within a database share the resources available on a machine, you naturally do not get predictable performance on any specific container. To learn how to configure provisioned throughput on a database, see [Configure provisioned throughput on an Azure Cosmos database](how-to-provision-database-throughput.md).
 
 Setting throughput on an Azure Cosmos database guarantees that you receive the provisioned throughput for that database all the time. Because all containers within the database share the provisioned throughput, Azure Cosmos DB doesn't provide any predictable throughput guarantees for a particular container in that database. The portion of the throughput that a specific container can receive is dependent on:
 
@@ -56,7 +56,7 @@ All containers created inside a database with provisioned throughput must be cre
 
 If the workload on a logical partition consumes more than the throughput that's allocated to a specific logical partition, your operations are rate-limited. When rate-limiting occurs, you can either increase the throughput for the entire database or retry the operations. For more information on partitioning, see [Logical partitions](partition-data.md).
 
-Multiple logical partitions that belong to different containers that share the throughput provisioned to a database can be hosted on a single physical partition. While a single logical partition of a container is always scoped within a physical partition, *"L"* logical partitions across *"C"* containers that share the provisioned throughput of a database can be mapped and hosted on *"R"* physical partitions. 
+The shards of shared database containers are co-located, and up to 25 containers can potentially use the provisioned throughput. Beyond 25 containers, for every additional 25 containers added throughput accessible for all the containers reduces linearly.
 
 The following image shows how a physical partition can host one or more logical partitions that belong to different containers within a database:
 
@@ -74,6 +74,9 @@ You can combine the two models. Provisioning throughput on both the database and
 * The *"K"* RUs throughput is shared across the four containers *A*, *C*, *D*, and *E*. The exact amount of throughput available to *A*, *C*, *D*, or *E* varies. There are no SLAs for each individual container’s throughput.
 * The container named *B* is guaranteed to get the *"P"* RUs throughput all the time. It's backed by SLAs.
 
+> [!NOTE]
+> A container with provisioned throughput cannot be converted to shared database container. Conversely a shared database container cannot be converted to have a dedicated throughput.
+
 ## Update throughput on a database or a container
 
 After you create an Azure Cosmos container or a database, you can update the provisioned throughput. There is no limit on the maximum provisioned throughput that you can configure on the database or the container. The minimum provisioned throughput depends on the following factors: 
diff --git a/articles/data-factory/tutorial-incremental-copy-change-tracking-feature-powershell.md b/articles/data-factory/tutorial-incremental-copy-change-tracking-feature-powershell.md
@@ -366,7 +366,7 @@ In this step, you create a dataset for storing the change tracking version.
     ```
 
     You create the table table_store_ChangeTracking_version as part of the prerequisites.
-2.  Run the Set-AzDataFactoryV2Dataset cmdlet to create the dataset: WatermarkDataset
+2.  Run the Set-AzDataFactoryV2Dataset cmdlet to create the dataset: ChangeTrackingDataset
     
     ```powershell
     Set-AzDataFactoryV2Dataset -DataFactoryName $dataFactoryName -ResourceGroupName $resourceGroupName -Name "ChangeTrackingDataset" -File ".\ChangeTrackingDataset.json"
diff --git a/articles/healthcare-apis/index.yml b/articles/healthcare-apis/index.yml
@@ -22,7 +22,7 @@ sections:
 - title: 5-Minute Quickstarts
   items:
     - type: paragraph
-      text: Learn how Azure API for FHIR Preview can power healthcare iteroperability in Azure by selecting an arrow link <img src="media/index/link.jpg" height="15" width="15"></img>.
+      text: Learn how Azure API for FHIR Preview can power healthcare interoperability in Azure by selecting an arrow link <img src="media/index/link.jpg" height="15" width="15"></img>.
     - type: table
       style: dataMatrix
       columns:
@@ -46,4 +46,4 @@ sections:
           - href: fhir-oss-portal-quickstart.md
           - href: fhir-oss-powershell-quickstart.md
           - href: fhir-oss-cli-quickstart.md
-  
+          
diff --git a/articles/iot-hub/iot-hub-device-sdk-platform-support.md b/articles/iot-hub/iot-hub-device-sdk-platform-support.md
diff --git a/includes/data-lake-storage-gen1-rename-note.md b/includes/data-lake-storage-gen1-rename-note.md
diff --git a/includes/install-dev-tools.md b/includes/install-dev-tools.md
