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

Author: normesta

.openpublishing.redirection.json

@@ -355,7 +355,7 @@
       "redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
       "redirect_document_id": true
     },
-    
+
     {
       "source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
       "redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -50683,6 +50683,16 @@
       "source_path": "articles/chef/index.yml",
       "redirect_url": "/azure/developer/chef/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/database-security-overview.md",
+      "redirect_url": "/azure/sql-database/sql-database-security-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/fundamentals/database-best-practices.md",
+      "redirect_url": "/azure/sql-database/sql-database-security-best-practice",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory/develop/quickstart-v2-netcore-daemon.md

@@ -193,7 +193,6 @@ app = ConfidentialClientApplicationBuilder.Create(config.ClientId)
                                           .WithClientSecret(config.ClientSecret)
                                           .WithAuthority(new Uri(config.Authority))
                                           .Build();
-);
 ```
 
 > | Where: ||

articles/active-directory/reports-monitoring/concept-provisioning-logs.md

@@ -86,23 +86,31 @@ Select an item in the list view to get more detailed information.
 
 ## Filter provisioning activities
 
-To narrow down the reported data to a level that works for you, you can filter the provisioning data using the following default fields. Note that the values in the filters are dynamically populated based on your tenant. If, for example, you don't have any create events in your tenant, there won't be a filter option for create.
+You can filter your provisioning data. Some filter values are dynamically populated based on your tenant. If, for example, you don't have any create events in your tenant, there won't be a filter option for create.
+In the default view, you can select the following filters:
 
 - Identity
-- Action
-- Source system
-- Target system
-- Status
 - Date
+- Status
+- Action
 
 
-![Filter](./media/concept-provisioning-logs/filter.png "Filter")
+![Filter](./media/concept-provisioning-logs/default-filter.png "Filter")
 
 The **Identity** filter enables you to specify the name or the identity that you care about. This identity could be a user, group, role, or other object. You can search by the name or ID of the object. The ID varies by scenario. For example, when provisioning an object from Azure AD to SalesForce, the Source ID is the object ID of the user in Azure AD while the TargetID is the ID of the user in Salesforce. When provisioning from Workday to Active Directory, the Source ID is the Workday worker employee ID. Note that the Name of the user may not always be present in the Identity column. There will always be one ID. 
 
-The **Source System** filter enables you to specify where the identity is getting provisioned from. For example, when provisioning an object from Azure AD to ServiceNow, the Source system is Azure AD. 
 
-The **Target System** filter enables you to specify where the identity is getting provisioned to. For example, when provisioning an object from Azure AD to ServiceNow, the Target System is ServiceNow. 
+The **Date** filter enables to you to define a timeframe for the returned data.  
+Possible values are:
+
+- 1 month
+- 7 days
+- 30 days
+- 24 hours
+- Custom time interval
+
+When you select a custom time frame, you can configure a start date and an end date.
+
 
 The **Status** filter enables you to select:
 
@@ -111,6 +119,8 @@ The **Status** filter enables you to select:
 - Failure
 - Skipped
 
+
+
 The **Action** filter enables you to filter the:
 
 - Create 
@@ -119,19 +129,18 @@ The **Action** filter enables you to filter the:
 - Disable
 - Other
 
-The **Date** filter enables to you to define a timeframe for the returned data.  
-Possible values are:
+In addition, to the filters of the default view, you can also set the following filters:
 
-- 1 month
-- 7 days
-- 30 days
-- 24 hours
-- Custom time interval
+- Job ID
+- Cycle ID
+- Change ID
+- Source ID
+- Target ID
+- Application
 
-When you select a custom time frame, you can configure a start date and an end date.
 
+![Pick a field](./media/concept-provisioning-logs/add-filter.png "Pick a field")
 
-In addition to the default fields, when selected, you can also include the following fields in your filter:
 
 - **Job ID** - A unique Job ID is associated with each application that you have enabled provisioning for.   
 
@@ -140,8 +149,13 @@ In addition to the default fields, when selected, you can also include the follo
 - **Change ID** - Unique identifier for the provisioning event. You can share this ID to support to look up the provisioning event.   
 
 
+- **Source System** - Enables you to specify where the identity is getting provisioned from. For example, when provisioning an object from Azure AD to ServiceNow, the Source system is Azure AD. 
+
+- **Target System** - Enables you to specify where the identity is getting provisioned to. For example, when provisioning an object from Azure AD to ServiceNow, the Target System is ServiceNow. 
+
+- **Application** - Enables you to show only records of applications with a display name that contains a specific string.
 
-  
+ 
 
 ## Provisioning details 
 

articles/active-directory/reports-monitoring/media/concept-provisioning-logs/add-filter.png

@@ -93,12 +93,12 @@ The above command creates a three node AKS cluster, but the user, who created th
 Once you've created a group and added yourself (and others) as a member, you can update the cluster with the Azure AD group using the following command
 
 ```azurecli-interactive
-az aks update -g MyResourceGroup -n MyManagedCluster [--aad-admin-group-object-ids <id1,id2>] [--aad-tenant-id <id>]
+az aks update -g MyResourceGroup -n MyManagedCluster [--aad-admin-group-object-ids <id>] [--aad-tenant-id <id>]
 ```
 Alternatively, if you first create a group and add members, you can enable the Azure AD group at create time using the following command,
 
 ```azurecli-interactive
-az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad [--aad-admin-group-object-ids <id1,id2>] [--aad-tenant-id <id>]
+az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad [--aad-admin-group-object-ids <id>] [--aad-tenant-id <id>]
 ```
 
 A successful creation of an Azure AD v2 cluster has the following section in the response body

articles/active-directory/reports-monitoring/media/concept-provisioning-logs/default-filter.png

@@ -56,6 +56,9 @@ To create an ILB ASE:
 
     ![ASE creation](media/creating_and_using_an_internal_load_balancer_with_app_service_environment/createilbase.png)
 
+> [!NOTE]
+> The App Service Environment name must be no more than 37 characters.
+
 6. Select Networking
 
 7. Select or create a Virtual Network. If you create a new VNet here, it will be defined with an address range of 192.168.250.0/23. To create a VNet with a different address range or in a different resource group than the ASE, use the Azure Virtual Network creation portal. 
@@ -66,6 +69,7 @@ To create an ILB ASE:
 
 7. Select **Review and Create** then select **Create**.
 
+
 ## Create an app in an ILB ASE ##
 
 You create an app in an ILB ASE in the same way that you create an app in an ASE normally.

articles/active-directory/reports-monitoring/media/concept-provisioning-logs/steps.png

@@ -1006,7 +1006,41 @@
     items:
     - name: Security overview
       href: /azure/databricks/security/index
-      maintainContext: true 
+      maintainContext: true
+    - name: Access control
+      items:
+      - name: Access control overview
+        href: /azure/databricks/security/access-control/index
+        maintainContext: true
+      - name: Workspace access control
+        href: /azure/databricks/security/access-control/workspace-acl
+        maintainContext: true
+      - name: Cluster access control
+        href: /azure/databricks/security/access-control/cluster-acl
+        maintainContext: true
+      - name: Pool access control
+        href: /azure/databricks/security/access-control/pool-acl
+        maintainContext: true  
+      - name: Jobs access control
+        href: /azure/databricks/security/access-control/job-acl
+        maintainContext: true
+      - name: Table access control
+        items:
+        - name: Table access control overview
+          href: /azure/databricks/security/access-control/table-acls/index
+          maintainContext: true
+        - name: Enable table access control for a cluster
+          href: /azure/databricks/security/access-control/table-acls/table-acl
+          maintainContext: true
+        - name: Data object privileges
+          href: /azure/databricks/security/access-control/table-acls/object-privileges
+          maintainContext: true
+      - name: Secret access control
+        href: /azure/databricks/security/access-control/secret-acl
+        maintainContext: true
+    - name: Authenticate to Azure Data Lake Storage using Azure Active Directory credentials
+      href: /azure/databricks/security/credential-passthrough/adls-passthrough
+      maintainContext: true
     - name: Secrets
       items:
       - name: Keep data secure with secrets
@@ -1018,21 +1052,18 @@
       - name: Secrets
         href: /azure/databricks/security/secrets/secrets
         maintainContext: true
-      - name: Secret access control
-        href: /azure/databricks/security/secrets/secret-acl
-        maintainContext: true  
       - name: Secret redaction
         href: /azure/databricks/security/secrets/redaction
         maintainContext: true
       - name: Secret workflow example
         href: /azure/databricks/security/secrets/example-secret-workflow
         maintainContext: true
     - name: Encrypt traffic between cluster worker nodes
-      href: /azure/databricks/security/encrypt-otw
+      href: /azure/databricks/security/encryption/encrypt-otw
     - name: Enable customer-managed keys for notebooks
-      href: /azure/databricks/security/customer-managed-key-notebook
+      href: /azure/databricks/security/keys/customer-managed-key-notebook
     - name: Enable customer-managed keys for DBFS
-      href: /azure/databricks/security/customer-managed-keys-dbfs
+      href: /azure/databricks/security/keys/customer-managed-keys-dbfs
   - name: Administration
     items:
     - name: Administration overview
@@ -1054,7 +1085,7 @@
         maintainContext: true
       - name: Monitor usage using tags
         href: /azure/databricks/administration-guide/account-settings/usage-detail-tags-azure
-        maintainContext: true        
+        maintainContext: true
     - name: Manage users and groups
       items:
       - name: Users and groups overview
@@ -1080,30 +1111,22 @@
       - name: Access control overview
         href: /azure/databricks/administration-guide/access-control/index
         maintainContext: true
-      - name: Cluster access control
+      - name: Enable workspace access control
+        href: /azure/databricks/administration-guide/access-control/workspace-acl
+        maintainContext: true
+      - name: Enable cluster access control
         href: /azure/databricks/administration-guide/access-control/cluster-acl
         maintainContext: true
-      - name: Pool access control
+      - name: Enable pool access control
         href: /azure/databricks/administration-guide/access-control/pool-acl
         maintainContext: true
-      - name: Jobs access control
+      - name: Enable jobs access control
         href: /azure/databricks/administration-guide/access-control/jobs-acl
         maintainContext: true
-      - name: Table access control
-        items:
-        - name: Table access control overview
-          href: /azure/databricks/administration-guide/access-control/table-acls/index
-          maintainContext: true
-        - name: Enable Table access control
-          href: /azure/databricks/administration-guide/access-control/table-acls/table-acl
-          maintainContext: true
-        - name: Set Privileges  on a Data Object
-          href: /azure/databricks/administration-guide/access-control/table-acls/object-privileges 
-          maintainContext: true
-      - name: Workspace access control
-        href: /azure/databricks/administration-guide/access-control/workspace-acl
+      - name: Enable table access control
+        href: /azure/databricks/administration-guide/access-control/table-acl
         maintainContext: true
-      - name: Enable Token-based authentication
+      - name: Enable token-based authentication
         href: /azure/databricks/administration-guide/access-control/tokens
         maintainContext: true
       - name: Conditional access
@@ -1689,6 +1712,9 @@
       - name: Platform release notes 
         href: /azure/databricks/release-notes/product/index
         maintainContext: true
+      - name: April 2020
+        href: /azure/databricks/release-notes/product/2020/april
+        maintainContext: true
       - name: March 2020
         href: /azure/databricks/release-notes/product/2020/march
         maintainContext: true

articles/aks/azure-ad-v2.md

@@ -1,5 +1,5 @@
 ---
-title: Autoscale Azure resources based on performance data or a schedule
+title: Autoscale Azure resources based on data or schedule
 description: Create an autoscale setting for an app service plan using metric data and a schedule
 author: anirudhcavale
 services: azure-monitor