Merge pull request #114651 from j-martens/release-build-aml

Dirty PR requested by Alma: Pulled master in release-build-aml

Author: ktoliver

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/bastion/media/bastion-nsg/nsg-architecture.png

@@ -166,15 +166,15 @@
         - name: OFFSET LIMIT
           displayName: offset limit
           href: sql-query-offset-limit.md
+      - name: Working with JSON
+        displayName: alias, JSON, projection
+        href: sql-query-working-with-json.md
       - name: Subquery
         displayName: subquery, exists
         href: sql-query-subquery.md
       - name: Joins
         displayName: join
         href: sql-query-join.md
-      - name: Aliasing
-        displayName: alias, aliasing
-        href: sql-query-aliasing.md
       - name: Arrays and objects
         displayName: object and array creation, object and array
         href: sql-query-object-array.md

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

@@ -4,17 +4,17 @@ description: Learn about the SQL syntax, and example for FROM clause for Azure C
 author: timsander1
 ms.service: cosmos-db
 ms.topic: conceptual
-ms.date: 12/02/2019
+ms.date: 05/08/2020
 ms.author: tisande
 
 ---
 # FROM clause in Azure Cosmos DB
 
 The FROM (`FROM <from_specification>`) clause is optional, unless the source is filtered or projected later in the query. A query like `SELECT * FROM Families` enumerates over the entire `Families` container. You can also use the special identifier ROOT for the container instead of using the container name.
 
-The FROM clause enforces the following rules per query:
+The `FROM` clause enforces the following rules per query:
 
-* The container can be aliased, such as `SELECT f.id FROM Families AS f` or simply `SELECT f.id FROM Families f`. Here `f` is the alias for `Families`. AS is an optional keyword to [alias](sql-query-aliasing.md) the identifier.  
+* The container can be aliased, such as `SELECT f.id FROM Families AS f` or simply `SELECT f.id FROM Families f`. Here `f` is the alias for `Families`. AS is an optional keyword to [alias](sql-query-working-with-json.md#aliasing) the identifier.  
 
 * Once aliased, the original source name cannot be bound. For example, `SELECT Families.id FROM Families f` is syntactically invalid because the identifier `Families` has been aliased and can't be resolved anymore.  
 
@@ -25,15 +25,15 @@ The FROM clause enforces the following rules per query:
 ```sql  
 FROM <from_specification>  
 
-<from_specification> ::=   
+<from_specification> ::=
         <from_source> {[ JOIN <from_source>][,...n]}  
 
-<from_source> ::=   
+<from_source> ::=
           <container_expression> [[AS] input_alias]  
         | input_alias IN <container_expression>  
 
-<container_expression> ::=   
-        ROOT   
+<container_expression> ::=
+        ROOT
      | container_name  
      | input_alias  
      | <container_expression> '.' property_name  
@@ -46,9 +46,9 @@ FROM <from_specification>
 
   Specifies a data source, with or without an alias. If alias is not specified, it will be inferred from the `<container_expression>` using following rules:  
 
-  -  If the expression is a container_name, then container_name will be used as an alias.  
+-  If the expression is a container_name, then container_name will be used as an alias.  
 
-  -  If the expression is `<container_expression>`, then property_name, then property_name will be used as an alias. If the expression is a container_name, then container_name will be used as an alias.  
+-  If the expression is `<container_expression>`, then property_name, then property_name will be used as an alias. If the expression is a container_name, then container_name will be used as an alias.  
 
 - AS `input_alias`  
 
@@ -94,9 +94,9 @@ If a container expression accesses properties or array elements and that value d
 
 A container expression may be container-scoped or document-scoped:  
 
--   An expression is container-scoped, if the underlying source of the container expression is either ROOT or `container_name`. Such an expression represents a set of documents retrieved from the container directly, and is not dependent on the processing of other container expressions.  
+- An expression is container-scoped, if the underlying source of the container expression is either ROOT or `container_name`. Such an expression represents a set of documents retrieved from the container directly, and is not dependent on the processing of other container expressions.  
 
--   An expression is document-scoped, if the underlying source of the container expression is `input_alias` introduced earlier in the query. Such an expression represents a set of documents obtained by evaluating the container expression in the scope of each document belonging to the set associated with the aliased container.  The resulting set will be a union of sets obtained by evaluating the container expression for each of the documents in the underlying set. 
+- An expression is document-scoped, if the underlying source of the container expression is `input_alias` introduced earlier in the query. Such an expression represents a set of documents obtained by evaluating the container expression in the scope of each document belonging to the set associated with the aliased container. The resulting set will be a union of sets obtained by evaluating the container expression for each of the documents in the underlying set.
 
 ## Examples
 
@@ -142,7 +142,7 @@ The results are:
     ]
 ```
 
-The preceding query used an array as the source, but you can also use an object as the source. The query considers any valid, defined JSON value in the source for inclusion in the result. The following example would exclude `Families` that don’t have an `address.state` value.
+The preceding query used an array as the source, but you can also use an object as the source. The query considers any valid, defined JSON value in the source for inclusion in the result. The following example would exclude `Families` that don't have an `address.state` value.
 
 ```sql
     SELECT *