Merge pull request #97931 from MicrosoftDocs/master

Merge master to live, 4:05 AM

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -567,6 +567,16 @@
       "redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-list-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-list-entity",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-regex-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-regex-entity",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-sentiment-analysis.md",
       "redirect_url": "/azure/cognitive-services/LUIS/tutorial-publish-settings",
@@ -43372,52 +43382,52 @@
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-classification-predict-churn.md",
-      "redirect_url": "how-to-designer-sample-classification-churn",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-classification-churn",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-classification-predict-credit-risk-basic.md",
-      "redirect_url": "how-to-designer-sample-classification-predict-income",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-classification-predict-income",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-classification-predict-credit-risk-cost-sensitive.md",
-      "redirect_url": "how-to-designer-sample-classification-credit-risk-cost-sensitive",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-classification-credit-risk-cost-sensitive",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-classification-predict-flight-delay.md",
-      "redirect_url": "how-to-designer-sample-classification-flight-delay",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-classification-flight-delay",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-regression-predict-automobile-price-basic.md",
-      "redirect_url": "how-to-designer-sample-regression-automobile-price-basic",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-regression-automobile-price-basic",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-regression-predict-automobile-price-compare-algorithms.md",
-      "redirect_url": "how-to-designer-sample-regression-automobile-price-compare-algorithms",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-regression-automobile-price-compare-algorithms",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-text-classification.md",
-      "redirect_url": "how-to-designer-sample-text-classification",
+      "redirect_url": "/azure/machine-learning/service/how-to-designer-sample-text-classification",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/ui-tutorial-automobile-price-deploy.md",
-      "redirect_url": "tutorial-designer-automobile-price-deploy",
+      "redirect_url": "/azure/machine-learning/service/tutorial-designer-automobile-price-deploy",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/ui-tutorial-automobile-price-train-score.md",
-      "redirect_url": "tutorial-designer-automobile-price-train-score",
+      "redirect_url": "/azure/machine-learning/service/tutorial-designer-automobile-price-train-score",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/ui-concept-visual-interface.md",
-      "redirect_url": "concept-designer",
+      "redirect_url": "/azure/machine-learning/service/concept-designer",
       "redirect_document_id": true
     },
     {

articles/active-directory/develop/v2-oauth2-implicit-grant-flow.md

@@ -150,7 +150,7 @@ For details on the query parameters in the URL, see [send the sign in request](#
 > [!TIP]
 > Try copy & pasting the below request into a browser tab! (Don't forget to replace the `login_hint` values with the correct value for your user)
 >
->`https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=6731de76-14a6-49ae-97bc-6eba6914391e&response_type=token&redirect_uri=http%3A%2F%2Flocalhost%2Fmyapp%2F&scope=https%3A%2F%2Fgraph.microsoft.com%2user.read&response_mode=fragment&state=12345&nonce=678910&prompt=none&login_hint={your-username}`
+>`https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=6731de76-14a6-49ae-97bc-6eba6914391e&response_type=token&redirect_uri=http%3A%2F%2Flocalhost%2Fmyapp%2F&scope=https%3A%2F%2Fgraph.microsoft.com%2Fuser.read&response_mode=fragment&state=12345&nonce=678910&prompt=none&login_hint={your-username}`
 >
 
 Thanks to the `prompt=none` parameter, this request will either succeed or fail immediately and return to your application. A successful response will be sent to your app at the indicated `redirect_uri`, using the method specified in the `response_mode` parameter.

articles/active-directory/hybrid/how-to-connect-sync-change-the-configuration.md

@@ -199,7 +199,7 @@ By default, the UserType attribute is not enabled for synchronization because th
 
 - Azure AD only accepts two values for the UserType attribute: **Member** and **Guest**.
 - If the UserType attribute is not enabled for synchronization in Azure AD Connect, Azure AD users created through directory synchronization would have the UserType attribute set to **Member**.
-- Azure AD does not permit the UserType attribute on existing Azure AD users to be changed by Azure AD Connect. It can only be set during the creation of the Azure AD users.
+- Azure AD does not permit the UserType attribute on existing Azure AD users to be changed by Azure AD Connect. It can only be set during the creation of the Azure AD users and [changed via Powershell](https://docs.microsoft.com/en-us/powershell/module/azuread/set-azureaduser?view=azureadps-2.0).
 
 Before enabling synchronization of the UserType attribute, you must first decide how the attribute is derived from on-premises Active Directory. The following are the most common approaches:
 

articles/active-directory/manage-apps/configure-user-consent.md

@@ -24,6 +24,8 @@ For more information on consenting to applications, see [Azure Active Directory
 
 Granting admin consent requires you to sign in as global administrator, an application administrator, or a cloud application administrator.
 
+To grant admin consent to permissions on Microsoft Graph and Azure AD Graph, you need global administrator privileges. 
+
 To restrict access to applications, you need to require user assignment and then assign users or groups to the application.  For more information, see [Methods for assigning users and groups](methods-for-assigning-users-and-groups.md).
 
 ## Grant admin consent to enterprise apps in the Azure portal

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

@@ -174,7 +174,7 @@ This section guides you through the steps to configure the Azure AD provisioning
 
 	![G Suite Group Mappings](media/google-apps-provisioning-tutorial/groupmappings.png)
 
-12. Review the group attributes that are synchronized from Azure AD to G Suite in the **Attribute Mapping** section. The attributes selected as **Matching** properties are used to match the groups in G Suite for update operations. Select the **Save** button to commit any changes.
+12. Review the group attributes that are synchronized from Azure AD to G Suite in the **Attribute Mapping** section. The attributes selected as **Matching** properties are used to match the groups in G Suite for update operations. Select the **Save** button to commit any changes. The UI displays the default set of attribute mappings between Azure AD and G Suite. You can choose to add additional attributes such as Org Unit by clicking add new mapping. 
 
     ![G Suite Group Attributes](media/google-apps-provisioning-tutorial/groupattributes.png)
 

articles/active-directory/saas-apps/media/slack-provisioning-tutorial/slackauthorize.png

@@ -63,13 +63,13 @@ This section guides you through connecting your Azure AD to Slack's user account
 
 4. Set the **Provisioning Mode** to **Automatic**.
 
-   ![Slack Provisioning](./media/slack-provisioning-tutorial/Slack1.PNG)
+   ![Slack Provisioning](./media/slack-provisioning-tutorial/slack1.png)
 
 5. Under the **Admin Credentials** section, click **Authorize**. This opens a Slack authorization dialog in a new browser window.
 
 6. In the new window, sign into Slack using your Team Admin account. in the resulting authorization dialog, select the Slack team that you want to enable provisioning for, and then select **Authorize**. Once completed, return to the Azure portal to complete the provisioning configuration.
 
-    ![Authorization Dialog](./media/slack-provisioning-tutorial/Slack3.PNG)
+    ![Authorization Dialog](./media/slack-provisioning-tutorial/slackauthorize.png)
 
 7. In the Azure portal, click **Test Connection** to ensure Azure AD can connect to your Slack app. If the connection fails, ensure your Slack account has Team Admin permissions and try the "Authorize" step again.
 

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

@@ -126,9 +126,6 @@
     - name: Initialize cluster nodes
       href: /azure/databricks/clusters/init-scripts
       maintainContext: true
-    - name: Custom containers
-      href: /azure/databricks/clusters/custom-containers
-      maintainContext: true 
     - name: GPU-enabled clusters
       href: /azure/databricks/clusters/gpu
       maintainContext: true 
@@ -226,9 +223,6 @@
     maintainContext: true
   - name: Data
     items:
-    - name: Databricks File System (DBFS)
-      href: /azure/databricks/data/databricks-file-system
-      maintainContext: true
     - name: Databases and tables
       href: /azure/databricks/data/tables
       maintainContext: true
@@ -317,6 +311,9 @@
       - name: ZIP files
         href: /azure/databricks/data/data-sources/zip-files
         maintainContext: true 
+    - name: Databricks File System (DBFS)
+      href: /azure/databricks/data/databricks-file-system
+      maintainContext: true
     - name: FileStore
       href: /azure/databricks/data/filestore
       maintainContext: true
@@ -832,6 +829,9 @@
       - name: Model inference performance tuning
         href: /azure/databricks/applications/deep-learning/inference/model-inference-performance
         maintainContext: true
+        name: Reference solution for distributed image model inference
+        href: /azure/databricks/applications/deep-learning/reference-solutions/images-etl-inference
+        maintainContext: true
   - name: MLflow
     items: 
     - name: MLflow overview
@@ -1066,9 +1066,6 @@
       - name: Cluster configuration overview
         href: /azure/databricks/administration-guide/clusters/index
         maintainContext: true
-      - name: Enable Container Services
-        href: /azure/databricks/administration-guide/clusters/container-services
-        maintainContext: true
       - name: Enable Databricks Runtime for Genomics
         href: /azure/databricks/administration-guide/clusters/genomics-runtime
         maintainContext: true
@@ -1138,9 +1135,6 @@
       - name: Configuration setting overwrites default  settings
         href: /azure/databricks/kb/clusters/conf-overwrites-default-settings
         maintainContext: true 
-      - name: Run JNI libraries on single-core executors
-        href: /azure/databricks/kb/clusters/multiple-executors-single-worker
-        maintainContext: true 
       - name: Overwrite log4j configurations
         href: /azure/databricks/kb/clusters/overwrite-log4j-logs
         maintainContext: true 
@@ -1545,6 +1539,9 @@
       - name: Platform release notes 
         href: /azure/databricks/release-notes/product/index
         maintainContext: true
+      - name: December 2019
+        href: /azure/databricks/release-notes/product/2019/december
+        maintainContext: true
       - name: November 2019
         href: /azure/databricks/release-notes/product/2019/november
         maintainContext: true

articles/azure-databricks/TOC.yml

@@ -124,7 +124,8 @@ Sign in to the [Azure portal](https://portal.azure.com/).
 
 4. Once your Azure Databricks workspace is open in a separate window, append **#secrets/createScope** to the URL. The URL should have the following format: 
 
-   **https://<\location>.azuredatabricks.net/#secrets/createScope**.
+   **https://<\location>.azuredatabricks.net/?o=<\orgID>#secrets/createScope**.
+   
 
 5. Enter a scope name, and enter the Azure Key Vault DNS name and Resource ID you saved earlier. Save the scope name in a text editor for use later in this tutorial. Then, select **Create**.
 

articles/azure-databricks/store-secrets-azure-key-vault.md

@@ -50,7 +50,7 @@ Durable Functions 2.x introduces several breaking changes. Durable Functions 1.x
 Durable Functions 2.x uses a new host.json schema. The main changes from 1.x include:
 
 * `"storageProvider"` (and the `"azureStorage"` subsection) for storage-specific configuration.
-* `"tracking"` for tracking and logging configuration.
+* `"tracing"` for tracing and logging configuration.
 * `"notifications"` (and the `"eventGrid"` subsection) for event grid notification configuration.
 
 See the [Durable Functions host.json reference documentation](durable-functions-bindings.md#durable-functions-2-0-host-json) for details.