Merge pull request MicrosoftDocs#70384 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 78718c31c4ec · 2019-03-21T14:31:28.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/machine-learning/service/resource-known-issues.md b/articles/machine-learning/service/resource-known-issues.md
@@ -52,7 +52,7 @@ Databricks and Azure Machine Learning issues.
 Azure Machine Learning SDK installation fails on Azure Databricks when more packages are installed. Some packages, such as `psutil`, can cause conflicts. To avoid installation errors, install packages by freezing the library version. This issue is related to Databricks and not to the Azure Machine Learning service SDK. You might experience this issue with other libraries, too. Example:
 
 ```python
-pstuil cryptography==1.5 pyopenssl==16.0.0 ipython==2.2.0
+psutil cryptography==1.5 pyopenssl==16.0.0 ipython==2.2.0
 ```
 
 Alternatively, you can use init scripts if you keep facing install issues with Python libraries. This approach isn't officially supported. For more information, see [Cluster-scoped init scripts](https://docs.azuredatabricks.net/user-guide/clusters/init-scripts.html#cluster-scoped-init-scripts).
diff --git a/articles/notification-hubs/notification-hubs-enterprise-push-notification-architecture.md b/articles/notification-hubs/notification-hubs-enterprise-push-notification-architecture.md
@@ -21,7 +21,7 @@ ms.author: jowargo
 
 Enterprises today are gradually moving towards creating mobile applications for either their end users (external) or for the employees (internal). They have existing backend systems in place be it mainframes or some LoB applications, which must be integrated into the mobile application architecture. This guide talks about how best to do this integration recommending possible solution to common scenarios.
 
-A frequent requirement is for sending push notification to the users through their mobile application when an event of interest occurs in the backend systems. for example, a bank customer who has the bank's banking app on an iPhone wants to be notified when a debit is made above a certain amount from the account or an intranet scenario where an employee from finance department who has a budget approval app on a Windows Phone wants to be notified when the approval request is received.
+A frequent requirement is for sending push notification to the users through their mobile application when an event of interest occurs in the backend systems. For example, a bank customer who has the bank's banking app on an iPhone wants to be notified when a debit is made above a certain amount from the account or an intranet scenario where an employee from finance department who has a budget approval app on a Windows Phone wants to be notified when the approval request is received.
 
 The bank account or approval processing is likely to be done in some backend system, which must initiate a push to the user. There may be multiple such backend systems, which must all build the same kind of logic to push when an event triggers a notification. The complexity here lies in integrating several backend systems together with a single push system where the end users may have subscribed to different notifications and there may even be multiple mobile applications. For example,  intranet mobile apps where one mobile application may want to receive notifications from multiple such backend systems. The backend systems do not know or need to know of push semantics/technology so a common solution here traditionally has been to introduce a component, which polls the backend systems for any events of interest and is responsible for sending the push messages to the client.
 
@@ -261,7 +261,7 @@ The full sample code is available at [Notification Hub Samples]. It is split int
 ### Running the sample
 
 1. Ensure that your WebJob is running successfully and scheduled to run continuously.
-2. Run the **EnterprisePushMobileApp, which starts the Windows Store app.
+2. Run the **EnterprisePushMobileApp**, which starts the Windows Store app.
 3. Run the **EnterprisePushBackendSystem** console application, which simulates the LoB backend and starts sending messages and you should see toast notifications appearing like the following image:
 
     ![][5]
diff --git a/articles/virtual-desktop/connect-web.md b/articles/virtual-desktop/connect-web.md
@@ -30,9 +30,9 @@ While any HTML5-capable browser should work, we officially support the following
 
 ## Access remote resources feed
 
-In a browser, navigate to the web client URL your admin gave you to access the client and sign in with your user account.
+In a browser, navigate to the [Windows Virtual Desktop web client](https://rdweb.wvd.microsoft.com/webclient) and sign in with your user account.
 
 >[!NOTE]
 >If you are already signed in using an Azure AD account that is different than the one you would like to use for Windows Virtual Desktop, you may need to sign out or use a private browser window.
 
-After signing in, you should now see a list of resources. You can launch resources by selecting them like you would a normal app in the **All Resources** tab.
+After signing in, you should now see a list of resources. You can launch resources by selecting them like you would a normal app in the **All Resources** tab.
diff --git a/articles/virtual-desktop/create-host-pools-user-profile.md b/articles/virtual-desktop/create-host-pools-user-profile.md
@@ -11,7 +11,7 @@ ms.author: helohr
 ---
 # Set up a user profile share for a host pool
 
-The Windows Virtual Desktop service (preview) offers FSLogix profile containers as the recommended user profile solution. We don't recommend using the FSLogix profile container solution, and it will be deprecated in future versions of Windows Virtual Desktop.
+The Windows Virtual Desktop service (preview) offers FSLogix profile containers as the recommended user profile solution. We don't recommend using the User Profile Disk (UPD) solution, and it will be deprecated in future versions of Windows Virtual Desktop.
 
 This section will tell you how to set up a FSLogix profile container share for a host pool.
 
diff --git a/articles/virtual-desktop/overview.md b/articles/virtual-desktop/overview.md
@@ -92,4 +92,4 @@ Visit the [Windows Virtual Desktop Tech Community](https://techcommunity.microso
 To get started, you'll need to create a tenant. To learn more about how to create a tenant, continue to the tenant creation tutorial.
 
 > [!div class="nextstepaction"]
-> [Create a host pool with Azure Marketplace](tenant-setup-azure-active-directory.md)
+> [Create a tenant in Windows Virtual Desktop](tenant-setup-azure-active-directory.md)
diff --git a/articles/virtual-machines/workloads/sap/sap-ha-availability-zones.md b/articles/virtual-machines/workloads/sap/sap-ha-availability-zones.md
@@ -90,7 +90,7 @@ In making these decisions, also take into account SAP's network latency recommen
 > It's expected that the measurements described earlier will provide different results in every Azure region that supports [Availability Zones](https://docs.microsoft.com/azure/availability-zones/az-overview). Even if your network latency requirements are the same, you might need to adopt different deployment strategies in different Azure regions because the network latency between zones can be different. In some Azure regions, the network latency among the three different zones can be vastly different. In other regions, the network latency among the three different zones might be more uniform. The claim that there is always a network latency  between 1 and 2 milliseconds  is not correct. The network latency across Availability Zones in Azure regions can't be generalized.
 
 ## Active/Active deployment
-This deployment architecture is called active/active because you deploy your active SAP dialog instances across two or three zones. The SAP Central Services instance that uses enqueue replication will be deployed between two zones. The same is true for the DBMS layer, which will be deployed across the same zones as SAP Central Service.
+This deployment architecture is called active/active because you deploy your active SAP application servers across two or three zones. The SAP Central Services instance that uses enqueue replication will be deployed between two zones. The same is true for the DBMS layer, which will be deployed across the same zones as SAP Central Service.
 
 When considering this configuration, you need to find the two Availability Zones in your region that offer cross-zone network latency that's acceptable for your workload and your synchronous DBMS replication. You also want to be sure the delta between network latency within the zones you selected and the cross-zone network latency isn't too large. This is because you don't want large variations, depending on whether a job runs in-zone with the DBMS server or across zones, in the running times of your business processes or batch jobs. Some variations are acceptable, but not factors of difference.
 
