Merge branch 'master' into x12-hippa

Author: ecfan

.openpublishing.redirection.json

@@ -727,7 +727,10 @@
       "redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
       "redirect_document_id": false
     },
-
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-boundaries.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-limits"
+    },
       {
         "source_path": "articles/cognitive-services/LUIS/luis-migration-api-authoring.md",
         "redirect_url": "/azure/cognitive-services/LUIS/luis-migration-authoring-entities",
@@ -2339,6 +2342,11 @@
       "redirect_url": "/azure/cosmos-db/analytics-usecases",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/multi-master-benefits.md",
+      "redirect_url": "/azure/cosmos-db/conflict-resolution-policies",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/sql-api-python-application.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-python",
@@ -14098,6 +14106,11 @@
       "redirect_url": "/azure/architecture/patterns/valet-key",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-api-overview.md",
+      "redirect_url": "/azure/event-hubs/event-hubs-samples",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-archive-overview.md",
       "redirect_url": "/azure/event-hubs/event-hubs-capture-overview",
@@ -14158,11 +14171,21 @@
       "redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-dotnet-framework-api-overview.md",
+      "redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-dotnet-framework-getstarted-receive-eph.md",
       "redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-dotnet-standard-api-overview.md",
+      "redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-dotnet-standard-getstarted-receive-eph.md",
       "redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
@@ -14228,6 +14251,11 @@
       "redirect_url": "/azure/event-hubs/authorize-access-azure-active-directory",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-spark-connector.md",
+      "redirect_url": "/azure/event-hubs/event-hubs-kafka-spark-tutorial",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-tutorial-virtual-networks-firewalls.md",
       "redirect_url": "/azure/event-hubs/event-hubs-service-endpoints",
@@ -17828,6 +17856,11 @@
       "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/performance-tuning-ordered-cci",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/synapse-analytics/apache-spark-notebook-create-spark-use-sql.md",
+      "redirect_url": "/azure/synapse-analytics/quickstart-apache-spark-notebook",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/sql-database/sql-database-auditing-get-started.md",
       "redirect_url": "/azure/sql-database/sql-database-auditing",
@@ -51241,6 +51274,206 @@
       "source_path": "articles/aks/kubernetes-draft.md",
       "redirect_url": "/azure/aks/quickstart-helm",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/index.yml",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-android-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-android-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-android-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-android-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-android-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-android-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-android-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-android-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-android-how-to-use-client-library.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-android-how-to-use-client-library",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-auth.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-auth",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-client-and-server-versioning.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-client-and-server-versioning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-cordova-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-cordova-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-cordova-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-cordova-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-cordova-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-cordova-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-cordova-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-cordova-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-cordova-how-to-use-client-library.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-cordova-how-to-use-client-library",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-dotnet-backend-how-to-use-server-sdk.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-dotnet-backend-how-to-use-server-sdk",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-dotnet-how-to-use-client-library.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-dotnet-how-to-use-client-library",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-html-how-to-use-client-library.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-html-how-to-use-client-library",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-ios-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-ios-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-ios-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-ios-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-ios-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-ios-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-ios-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-ios-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-ios-how-to-use-client-library.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-ios-how-to-use-client-library",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-node-backend-how-to-use-server-sdk.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-node-backend-how-to-use-server-sdk",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-offline-data-sync.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-offline-data-sync",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-value-prop.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-value-prop",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-windows-store-dotnet-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-android-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-android-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-android-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-android-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-android-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-android-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-android-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-android-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-forms-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-forms-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-forms-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-forms-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-forms-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-forms-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-forms-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-forms-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-ios-get-started-offline-data.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-ios-get-started-offline-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-ios-get-started-push.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-ios-get-started-push",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-ios-get-started-users.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-ios-get-started-users",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-ios-get-started.md",
+      "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-ios-get-started",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-domain-services/secure-remote-vm-access.md

@@ -57,6 +57,7 @@ The RD environment deployment contains a number of steps. The existing RD deploy
 
 1. Sign in to VMs created for the RD environment with an account that's part of the *Azure AD DC Administrators* group, such as *contosoadmin*.
 1. To create and configure RDS, use the existing [Remote Desktop environment deployment guide][deploy-remote-desktop]. Distribute the RD server components across your Azure VMs as desired.
+    * Specific to Azure AD DS - when you configure RD licensing, set it to **Per Device** mode, not **Per User** as noted in the deployment guide.
 1. If you want to provide access using a web browser, [set up the Remote Desktop web client for your users][rd-web-client].
 
 With RD deployed into the Azure AD DS managed domain, you can manage and use the service as you would with an on-premises AD DS domain.

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

@@ -519,11 +519,11 @@ SelectUniqueValue(uniqueValueRule1, uniqueValueRule2, uniqueValueRule3, …)
 **Description:**<br> 
 Requires a minimum of two arguments, which are unique value generation rules defined using expressions. The function evaluates each rule and then checks the value generated for uniqueness in the target app/directory. The first unique value found will be the one returned. If all of the values already exist in the target, the entry will get escrowed and the reason gets logged in the audit logs. There is no upper bound to the number of arguments that can be provided.
 
-> [!NOTE]
-> - This is a top-level function, it cannot be nested.
-> - This function cannot be applied to attributes that have a matching precedence. 	
-> - This function is only meant to be used for entry creations. When using it with an attribute, set the **Apply Mapping** property to **Only during object creation**.
-> - This function is currently only supported for "Workday to Active Directory User Provisioning". It cannot be used with other provisioning applications. 
+
+ - This is a top-level function, it cannot be nested.
+ - This function cannot be applied to attributes that have a matching precedence. 	
+ - This function is only meant to be used for entry creations. When using it with an attribute, set the **Apply Mapping** property to **Only during object creation**.
+ - This function is currently only supported for "Workday to Active Directory User Provisioning". It cannot be used with other provisioning applications. 
 
 
 **Parameters:**<br>