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

Author: davidsmatlak

articles/active-directory/users-groups-roles/TOC.yml

@@ -68,7 +68,7 @@
       href: /azure/active-directory/b2b/use-dynamic-groups?context=azure/active-directory/users-groups-roles/context/ugr-context
   - name: Manage your directory
     items:
-    - name: Administer your directory    
+    - name: Azure AD organizations    
       href: /azure/active-directory/fundamentals/active-directory-administer?context=azure/active-directory/users-groups-roles/context/ugr-context
     - name: Manage domain names
       href: domains-manage.md
@@ -84,7 +84,7 @@
       href: /azure/active-directory/connect/active-directory-aadconnect?context=azure/active-directory/users-groups-roles/context/ugr-context
   - name: Manage groups
     items: 
-    - name: Manage access with Azure AD groups
+    - name: Manage access with groups
       href: /azure/active-directory/fundamentals/active-directory-manage-groups?context=azure/active-directory/users-groups-roles/context/ugr-context  
     - name: Create a group (Azure portal)    
       href: /azure/active-directory/fundamentals/active-directory-groups-create-azure-portal?context=azure/active-directory/users-groups-roles/context/ugr-context
@@ -134,6 +134,8 @@
       href: groups-assign-sensitivity-labels.md
   - name: Assign licenses
     items:
+    - name: Assign licenses to users    
+      href: /azure/active-directory/fundamentals/license-users-groups?context=azure/active-directory/users-groups-roles/context/ugr-context
     - name: Assign licenses to a group    
       href: licensing-groups-assign.md
     - name: Resolve group license problems   

articles/active-directory/users-groups-roles/my-staff-configure.md

@@ -9,7 +9,7 @@ ms.topic: article
 ms.service: active-directory
 ms.subservice: user-help
 ms.workload: identity
-ms.date: 05/01/2020
+ms.date: 05/08/2020
 ms.author: curtand
 ms.reviewer: sahenry
 ms.custom: oldportal;it-pro;

articles/azure-databricks/TOC.yml

@@ -37,14 +37,16 @@
   - name: Language guides
     items:
     - name: Python
-      href: /azure/databricks/languages/python
-      maintainContext: true
-    - name: Koalas
-      href: /azure/databricks/languages/koalas
-      maintainContext: true
+      items:
+      - name: Python overview
+        href: /azure/databricks/languages/python
+        maintainContext: true
+      - name: Koalas
+        href: /azure/databricks/languages/koalas
+        maintainContext: true
     - name: R
       items:
-      - name: R guide
+      - name: R overview
         href: /azure/databricks/spark/latest/sparkr/index
         maintainContext: true
       - name: SparkR overview
@@ -281,9 +283,6 @@
     - name: Databricks Runtime
       href: /azure/databricks/runtime/dbr
       maintainContext: true
-    - name: Databricks Runtime with Conda
-      href: /azure/databricks/runtime/conda
-      maintainContext: true
     - name: Databricks Runtime for Machine Learning
       href: /azure/databricks/runtime/mlruntime
       maintainContext: true
@@ -307,6 +306,9 @@
     - name: Get workspace, cluster, notebook, and job identifiers
       href: /azure/databricks/workspace/workspace-details
       maintainContext: true
+    - name: Migrate to per-workspace URLs
+      href: /azure/databricks/workspace/migrate-workspace-urls
+      maintainContext: true
   - name: Clusters
     items:
     - name: Clusters overview
@@ -452,9 +454,6 @@
       - name: Azure Data Lake Storage
         href: /azure/databricks/data/data-sources/azure/azure-datalake
         maintainContext: true
-      - name: Azure Data Lake Storage credential passthrough
-        href: /azure/databricks/data/data-sources/azure/adls-passthrough
-        maintainContext: true 
       - name: Cosmos DB
         href: /azure/databricks/data/data-sources/azure/cosmosdb-connector
         maintainContext: true 
@@ -1027,7 +1026,7 @@
         href: /azure/databricks/security/access-control/pool-acl
         maintainContext: true  
       - name: Jobs access control
-        href: /azure/databricks/security/access-control/jobs-acl
+        href: /azure/databricks/security/access-control/job-acl
         maintainContext: true
       - name: Table access control
         items:
@@ -1110,7 +1109,7 @@
       - name: Provision users and groups using SCIM
         href: /azure/databricks/administration-guide/users-groups/scim/index
         maintainContext: true
-      - name: Configure SCIM provisioning for AAD
+      - name: Configure SCIM provisioning for Azure AD
         href: /azure/databricks/administration-guide/users-groups/scim/aad
         maintainContext: true
     - name: Manage access control
@@ -1139,9 +1138,6 @@
       - name: Conditional access
         href: /azure/databricks/administration-guide/access-control/conditional-access
         maintainContext: true
-      - name: Enable Azure Data Lake Storage credential passthrough
-        href: /azure/databricks/administration-guide/access-control/credential-passthrough
-        maintainContext: true
     - name: Manage workspace objects and behavior
       items:
       - name: Manage workspaces overview
@@ -1619,21 +1615,35 @@
         maintainContext: true
       - name: Authentication
         items:
-        - name: Personal access tokens
+        - name: Azure Databricks personal access tokens
           href: /azure/databricks/dev-tools/api/latest/authentication
           maintainContext: true
-        - name: Azure Active Directory (AAD) tokens
+        - name: Azure Active Directory tokens
           items:
-          - name: AAD token authentication overview
+          - name: Azure AD token authentication overview
             href: /azure/databricks/dev-tools/api/latest/aad/index
             maintainContext: true
-          - name: Get an AAD token using the AAD Authentication Library
+          - name: Get an Azure AD token using the Azure AD Authentication Library
             href: /azure/databricks/dev-tools/api/latest/aad/app-aad-token
             maintainContext: true
-          - name: Get an AAD token using a service principal
+          - name: Get an Azure AD token using a service principal
             href: /azure/databricks/dev-tools/api/latest/aad/service-prin-aad-token
             maintainContext: true
-          - name: Troubleshoot AAD access tokens
+          - name: Troubleshoot Azure AD access tokens
+            href: /azure/databricks/dev-tools/api/latest/aad/troubleshoot-aad-token
+          maintainContext: true
+        - name: Azure Active Directory (Azure AD) tokens
+          items:
+          - name: Azure AD token authentication overview
+            href: /azure/databricks/dev-tools/api/latest/aad/index
+            maintainContext: true
+          - name: Get an Azure AD token using the AAD Authentication Library
+            href: /azure/databricks/dev-tools/api/latest/aad/app-aad-token
+            maintainContext: true
+          - name: Get an Azure AD token using a service principal
+            href: /azure/databricks/dev-tools/api/latest/aad/service-prin-aad-token
+            maintainContext: true
+          - name: Troubleshoot Azure AD access tokens
             href: /azure/databricks/dev-tools/api/latest/aad/troubleshoot-aad-token
             maintainContext: true
       - name: Clusters
@@ -1666,7 +1676,7 @@
           - name: SCIM API (Users)
             href: /azure/databricks/dev-tools/api/latest/scim/scim-users
           - name: SCIM API (Groups)
-            href: /azure/databricks/dev-tools/api/latest/scim/scim-groups
+            href: /azure/databricks/dev-tools/api/latest/scim/scim-group
         maintainContext: true 
       - name: Secrets
         href: /azure/databricks/dev-tools/api/latest/secrets
@@ -1760,6 +1770,9 @@
       - name: Platform release notes 
         href: /azure/databricks/release-notes/product/index
         maintainContext: true
+      - name: May 2020
+        href: /azure/databricks/release-notes/product/2020/may
+        maintainContext: true
       - name: April 2020
         href: /azure/databricks/release-notes/product/2020/april
         maintainContext: true
@@ -1851,12 +1864,21 @@
         - name: Runtime releases
           href: /azure/databricks/release-notes/runtime/releases
           maintainContext: true
+        - name: Databricks Runtime 7.0 Genomics (Beta)
+          href: /azure/databricks/release-notes/runtime/7.0genomics
+          maintainContext: true
         - name: Databricks Runtime 7.0 ML (Beta)
           href: /azure/databricks/release-notes/runtime/7.0ml
           maintainContext: true
         - name: Databricks Runtime 7.0 (Beta)
           href: /azure/databricks/release-notes/runtime/7.0
           maintainContext: true
+        - name: Databricks Runtime 6.6 Genomics (Beta)
+          href: /azure/databricks/release-notes/runtime/6.6genomics
+          maintainContext: true
+        - name: Databricks Runtime 6.6 (Beta)
+          href: /azure/databricks/release-notes/runtime/6.6
+          maintainContext: true
         - name: Databricks Runtime 6.5
           href: /azure/databricks/release-notes/runtime/6.5
           maintainContext: true
@@ -1902,27 +1924,18 @@
         - name: Databricks Runtime 6.0
           href: /azure/databricks/release-notes/runtime/6.0
           maintainContext: true
-        - name: Databricks Runtime 6.0 with Conda
-          href: /azure/databricks/release-notes/runtime/6.0conda
-          maintainContext: true
         - name: Databricks Runtime 6.0 ML
           href: /azure/databricks/release-notes/runtime/6.0ml
           maintainContext: true
         - name: Databricks Runtime 5.5
           href: /azure/databricks/release-notes/runtime/5.5
           maintainContext: true 
-        - name: Databricks Runtime 5.5 with Conda
-          href: /azure/databricks/release-notes/runtime/5.5conda
-          maintainContext: true 
         - name: Databricks Runtime 5.5 ML
           href: /azure/databricks/release-notes/runtime/5.5ml
           maintainContext: true
         - name: Databricks Runtime 5.4
           href: /azure/databricks/release-notes/runtime/5.4
           maintainContext: true 
-        - name: Databricks Runtime 5.4 with Conda
-          href: /azure/databricks/release-notes/runtime/5.4conda
-          maintainContext: true 
         - name: Databricks Runtime 5.4 ML
           href: /azure/databricks/release-notes/runtime/5.4ml
           maintainContext: true
@@ -1938,21 +1951,12 @@
         - name: Databricks Runtime 5.2
           href: /azure/databricks/release-notes/runtime/5.2
           maintainContext: true 
-        - name: Databricks Runtime 5.2 ML
-          href: /azure/databricks/release-notes/runtime/5.2ml
-          maintainContext: true
         - name: Databricks Runtime 5.1
           href: /azure/databricks/release-notes/runtime/5.1
           maintainContext: true 
-        - name: Databricks Runtime 5.1 ML 
-          href: /azure/databricks/release-notes/runtime/5.1ml
-          maintainContext: true
         - name: Databricks Runtime 5.0
           href: /azure/databricks/release-notes/runtime/5.0
           maintainContext: true 
-        - name: Databricks Runtime 5.0 ML 
-          href: /azure/databricks/release-notes/runtime/5.0ml
-          maintainContext: true
         - name: Databricks Runtime 4.3
           href: /azure/databricks/release-notes/runtime/4.3
           maintainContext: true
@@ -1962,9 +1966,6 @@
         - name: Databricks Runtime 4.1
           href: /azure/databricks/release-notes/runtime/4.1
           maintainContext: true 
-        - name: Databricks Runtime 4.1 ML 
-          href: /azure/databricks/release-notes/runtime/4.1ml
-          maintainContext: true
         - name: Databricks Runtime 4.0
           href: /azure/databricks/release-notes/runtime/4.0
           maintainContext: true

articles/azure-monitor/app/pricing.md

@@ -4,7 +4,7 @@ description: Manage telemetry volumes and monitor costs in Application Insights.
 ms.topic: conceptual
 author: DaleKoetke
 ms.author: dalek
-ms.date: 11/27/2019
+ms.date: 5/7/2020
 
 ms.reviewer: mbullwin
 ---
@@ -58,7 +58,7 @@ E. Set the daily data volume cap.
 
 To investigate your Application Insights usage more deeply, open the **Metrics** page, add the metric named "Data point volume", and then select the *Apply splitting* option to split the data by "Telemetry item type".
 
-Application Insights charges are added to your Azure bill. You can see details of your Azure bill in the **Billing** section of the Azure portal, or in the [Azure billing portal](https://account.windowsazure.com/Subscriptions).
+Application Insights charges are added to your Azure bill. You can see details of your Azure bill in the **Cost Management + Billing** section of the Azure portal, or in the [Azure billing portal](https://account.windowsazure.com/Subscriptions).  [See below](https://docs.microsoft.com/azure/azure-monitor/app/pricing#viewing-application-insights-usage-on-your-azure-bill) for details on using this for Application Insights. 
 
 ![In the left menu, select Billing](./media/pricing/02-billing.png)
 
@@ -125,7 +125,7 @@ dependencies
 
 ## Viewing Application Insights usage on your Azure bill
 
-Azure provides a great deal of useful functionality in the [Azure Cost Management + Billing](https://docs.microsoft.com/azure/cost-management/quick-acm-cost-analysis?toc=/azure/billing/TOC.json) hub. For instance, the "Cost analysis" functionality enables you to view your spends for Azure resources. Adding a filter by resource type (to microsoft.insights/components for Application Insights) will allow you to track your spending.
+Azure provides a great deal of useful functionality in the [Azure Cost Management + Billing](https://docs.microsoft.com/azure/cost-management/quick-acm-cost-analysis?toc=/azure/billing/TOC.json) hub. For instance, the "Cost analysis" functionality enables you to view your spends for Azure resources. Adding a filter by resource type (to microsoft.insights/components for Application Insights) will allow you to track your spending. Then for "Group by" select "Meter category" or "Meter".  For Application Insights resources on the current pricing plans, most usage will show up as Log Analytics for the Meter category since there is a single logs backend for all Azure Monitor components. 
 
 More understanding of your usage can be gained by [downloading your usage from the Azure portal](https://docs.microsoft.com/azure/billing/billing-download-azure-invoice-daily-usage-date#download-usage-in-azure-portal).
 In the downloaded spreadsheet, you can see usage per Azure resource per day. In this Excel spreadsheet, usage from your Application Insights resources can be found by first filtering on the "Meter Category" column to show "Application Insights" and "Log Analytics", and then adding a filter on the "Instance ID" column which is "contains microsoft.insights/components".  Most Application Insights usage is reported on meters with the Meter Category of Log Analytics, since there is a single logs backend for all Azure Monitor components.  Only Application Insights resources on legacy pricing tiers and multi-step web tests are reported with a Meter Category of Application Insights.  The usage is shown in the "Consumed Quantity" column and the unit for each entry is shown in the "Unit of Measure" column.  More details are available to help you [understand your Microsoft Azure bill](https://docs.microsoft.com/azure/billing/billing-understand-your-bill).
@@ -208,7 +208,7 @@ In each retained record, `itemCount` indicates the number of original records th
 
 ## Change the data retention period
 
-The default retention for Application Insights resources is 90 days. Different retention periods can be selected for each Application Insights resource. The full set of available retention periods is 30, 60, 90, 120, 180, 270, 365, 550 or 730 days.
+The default retention for Application Insights resources is 90 days. Different retention periods can be selected for each Application Insights resource. The full set of available retention periods is 30, 60, 90, 120, 180, 270, 365, 550 or 730 days. [Learn more](https://azure.microsoft.com/pricing/details/monitor/) about pricing for longer data retention. 
 
 To change the retention, from your Application Insights resource, go to the **Usage and Estimated Costs** page and select the **Data Retention** option:
 

articles/bastion/media/bastion-nsg/nsg-architecture.png

@@ -8,10 +8,10 @@
     href: cdn-features.md    
 - name: Quickstarts
   items:
-  - name: Create a profile and endpoint
-    href: cdn-create-new-endpoint.md
   - name: Integrate a storage account
     href: cdn-create-a-storage-account-with-cdn.md    
+  - name: Create a profile and endpoint
+    href: cdn-create-new-endpoint.md
   - name: Create a profile by using an Azure Resource Manager template
     href: create-profile-resource-manager-template.md
 - name: Tutorials