Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-20200129

Author: memildin

articles/aks/control-kubeconfig-access.md

@@ -3,7 +3,7 @@ title: Limit access to kubeconfig in Azure Kubernetes Service (AKS)
 description: Learn how to control access to the Kubernetes configuration file (kubeconfig) for cluster administrators and cluster users
 services: container-service
 ms.topic: article
-ms.date: 01/28/2020
+ms.date: 05/06/2020
 
 ---
 
@@ -36,7 +36,7 @@ The two built-in roles are:
 
 These RBAC roles can be applied to an Azure Active Directory (AD) user or group.
 
-> ![NOTE]
+> [!NOTE]
 > On clusters that use Azure AD, users with the *clusterUser* role have an empty *kubeconfig* file that prompts a log in. Once logged in, users have access based on their Azure AD user or group settings. Users with the *clusterAdmin* role have admin access.
 >
 > Clusters that do not use Azure AD only use the *clusterAdmin* role.

articles/azure-functions/durable/quickstart-js-vscode.md

@@ -4,16 +4,14 @@ description: Create and publish an Azure Durable Function using Visual Studio Co
 author: anthonychu
 
 ms.topic: quickstart
-ms.date: 03/24/2020
+ms.date: 05/07/2020
 ms.reviewer: azfuncdf, antchu
 ---
 
 # Create your first durable function in JavaScript
 
 *Durable Functions* is an extension of [Azure Functions](../functions-overview.md) that lets you write stateful functions in a serverless environment. The extension manages state, checkpoints, and restarts for you.
 
-[!INCLUDE [v1-note](../../../includes/functions-durable-v1-tutorial-note.md)]
-
 In this article, you learn how to use the Visual Studio Code Azure Functions extension to locally create and test a "hello world" durable function.  This function will orchestrate and chain together calls to other functions. You then publish the function code to Azure.
 
 ![Running durable function in Azure](./media/quickstart-js-vscode/functions-vs-code-complete.png)
@@ -57,7 +55,7 @@ Visual Studio Code installs the Azure Functions Core Tools, if needed. It also c
 
 A package.json file is also created in the root folder.
 
-### Enable Azure Functions V2 compatibility mode
+### Enable compatibility mode
 
 Currently, JavaScript Durable Functions require Azure Functions V2 compatibility mode to be enabled.
 
@@ -200,7 +198,7 @@ After you've verified that the function runs correctly on your local computer, i
 
 [!INCLUDE [functions-publish-project-vscode](../../../includes/functions-publish-project-vscode.md)]
 
-### Enable Azure Functions V2 compatibility mode
+### Enable compatibility mode
 
 The same Azure Functions V2 compatibility that you enabled locally needs to be enabled in the app in Azure.
 

articles/azure-functions/functions-bindings-event-grid-trigger.md

@@ -567,4 +567,4 @@ The Event Grid trigger function executes and shows logs similar to the following
 
 ## Next steps
 
-* [Dispatch an Event Grid event](./functions-bindings-event-grid-trigger.md)
+* [Dispatch an Event Grid event](./functions-bindings-event-grid-output.md)

articles/security-center/TOC.yml

@@ -113,7 +113,7 @@
       href: custom-security-policies.md
     - name: Manage policies with the Azure Policy REST API
       href: configure-security-policy-azure-policy.md
-  - name: Add dynamic compliance packages
+  - name: Choose standards for your compliance dashboard
     href: update-regulatory-compliance-packages.md
   - name: Customize the information protection policy
     href: security-center-info-protection-policy.md

articles/security-center/media/update-regulatory-compliance-packages/regulatory-compliance-dashboard-with-asb-small.png

@@ -15,74 +15,75 @@ ms.date: 11/04/2019
 ms.author: memildin
 
 ---
-# Update to dynamic compliance packages in your Regulatory Compliance dashboard
+# Customizing the set of standards in your regulatory compliance dashboard
 
 Azure Security Center continually compares the configuration of your resources with requirements in industry standards, regulations, and benchmarks. The **regulatory compliance dashboard** provides insights into your compliance posture based on how you're meeting specific compliance controls and requirements.
 
-With the **dynamic compliance packages** feature, Security Center *automatically improves its coverage of industry standards over time*. 
 
-One standard for which you can track your compliance posture is [Azure CIS 1.1.0](https://www.cisecurity.org/benchmark/azure/) (more formally, the "CIS Microsoft Azure Foundations Benchmark version 1.1.0"). The representation of Azure CIS that initially appears in your compliance dashboard relies on a static set of rules that is included with Security Center.
+## Overview of compliance packages
 
-Compliance packages are essentially initiatives defined in Azure Policy. They can be assigned to your selected scope (subscription, management group, and so on). To see compliance data mapped as assessments in your dashboard, add a compliance package to your management group or subscription from within the Security Policy. Adding a compliance package effectively assigns the regulatory compliance initiative to your selected scope. In this way, you can track newly published regulatory initiatives as compliance standards in your dashboard. When Microsoft releases new content for the initiative (new policies that map to more controls in the standard), the additional content appears automatically in your dashboard.
+Industry standards, regulatory standards, and benchmarks are represented in Security Center as *compliance packages*.  Each package is an initiative defined in Azure Policy. To see compliance data mapped as assessments in your dashboard, add a compliance package to your management group or subscription from within the **Security policy** page. (Learn more about Azure Policy and initiatives in [Working with security policies](tutorial-security-policy.md).)
 
-The dynamic compliance package for the Azure CIS benchmark, **Azure CIS 1.1.0 (new)**, improves on the original *static* version by:
+When you've onboarded a standard or benchmark to your selected scope, the standard appears in your regulatory compliance dashboard with all associated compliance data mapped as assessments. You can also download summary reports for any of the standards that have been onboarded.
 
-* Including more policies
-* Automatically updating with new coverage as it's added 
+Microsoft also tracks the regulatory standards themselves and automatically improves its coverage in some of the packages over time. When Microsoft releases new content for the initiative (new policies that map to more controls in the standard), the additional content appears automatically in your dashboard.
 
-Update to the new dynamic package as described below.
+> [!TIP]
+> One standard which improves over time as Microsoft releases new content is **Azure CIS 1.1.0 (new)** (more formally, the [CIS Microsoft Azure Foundations Benchmark version 1.1.0](https://www.cisecurity.org/benchmark/azure/)). You'll need to add this to your dashboard alongside "Azure CIS 1.1.0", the representation of Azure CIS that is configured by default in every Security Center environment. That package relies on a static set of rules. The newer package includes more policies and will automatically update over time. Update to the new dynamic package as described below.
 
-## Adding a dynamic compliance package
 
-The following steps explain how to add the dynamic package for monitoring your compliance with the Azure CIS benchmark v1.1.0.   
+## Available packages
 
-### Update to the Azure CIS 1.1.0 (new) dynamic compliance package 
+You can add standards such as NIST SP 800-53 R4, SWIFT CSP CSCF-v2020, UK Official and UK NHS, Canada Federal PBMM, and Azure CIS 1.1.0 (new) - a more complete representation of Azure CIS 1.1.0. 
+
+In addition, you can add **Azure Security Benchmark**, the Microsoft-authored, Azure-specific guidelines for security and compliance best practices based on common compliance frameworks. ([Learn more about Azure Security Benchmark](https://docs.microsoft.com/azure/security/benchmarks/introduction).)
+
+Additional standards will be supported in the dashboard as they become available. 
+
+
+## Adding a regulatory standard to your dashboard
+
+The following steps explain how to add a package to monitor your compliance with one of the supported regulatory standards.
+
+> [!NOTE]
+> Only users who are owner or policy contributor have the necessary permissions to add compliance standards. 
 
 1. From Security Center's sidebar, select **Regulatory compliance** to open the regulatory compliance dashboard. Here you can see the compliance standards currently assigned to the currently selected subscriptions.   
 
-1. From the top of the page, select **Manage compliance policies**. This opens the Policy Management page.
+1. From the top of the page, select **Manage compliance policies**. The Policy Management page appears.
 
 1. Select the subscription or management group for which you want to manage the regulatory compliance posture. 
 
     > [!TIP]
     > We recommend selecting the highest scope for which the standard is applicable so that compliance data is aggregated and tracked for all nested resources. 
 
-1. In the Industry & regulatory standards section, you'll see that Azure CIS 1.1.0 can be updated for new content. Click **Update now**. 
+1. To add the standards relevant to your organization, click **Add more standards**. 
 
-1. Optionally, click **Add more standards** to open the **Add regulatory compliance standards** page. There, you can search manually for **Azure CIS 1.1.0 (New)** and dynamic packages for other compliance standards such as:
+1. From the **Add regulatory compliance standards** page, you can search for packages for any of the available standards. Some of the standards available are:
 
-    - **Azure Security Benchmark** ([details here](https://docs.microsoft.com/azure/security/benchmarks/introduction))
+    - **Azure Security Benchmark**
     - **NIST SP 800-53 R4**
     - **SWIFT CSP CSCF-v2020**
     - **UKO and UK NHS**
     - **Canada PBMM**
 
-    > [!TIP]
-    > Only users who are owner or policy contributor have the necessary permissions to add compliance standards. 
-
     ![Adding regulatory packages to Azure Security Center's regulatory compliance dashboard](./media/update-regulatory-compliance-packages/dynamic-regulatory-compliance-additional-standards.png)
 
-
 1. From Security Center's sidebar, select **Regulatory compliance** again to go back to the regulatory compliance dashboard.
-    * **Azure CIS 1.1.0 (New)** now appears in your list of Industry & regulatory standards. 
-    * The original *static* view of your Azure CIS 1.1.0 compliance will also remain alongside it. It may be automatically removed in the future.
+    * Your new standard appears in your list of Industry & regulatory standards. 
+    * If you've added **Azure CIS 1.1.0 (New)**, the original *static* view of your Azure CIS 1.1.0 compliance will also remain alongside it. It may be automatically removed in the future.
 
     > [!NOTE]
     > It may take a few hours for a newly added standard to appear in the compliance dashboard.
 
-
-    [![Regulatory compliance dashboard showing old and new Azure CIS](media/update-regulatory-compliance-packages/security-center-dynamic-regulatory-compliance-cis-old-and-new.png)](media/update-regulatory-compliance-packages/security-center-dynamic-regulatory-compliance-cis-old-and-new.png#lightbox)
-
+    [![Regulatory compliance dashboard showing old and new Azure CIS](media/update-regulatory-compliance-packages/regulatory-compliance-dashboard-with-asb-small.png)](media/update-regulatory-compliance-packages/regulatory-compliance-dashboard-with-asb.png#lightbox)
 
 ## Next steps
 
-In this article, you learned:
-
-* How to **upgrade the standards** shown in your regulatory compliance dashboard to the new *dynamic* packages
-* How to **add compliance packages** to monitor your compliance with additional standards. 
+In this article, you learned how to **add compliance packages** to monitor your compliance with additional standards. 
 
 For other related material, see the following articles: 
 
+- [Azure Security Benchmark](https://docs.microsoft.com/azure/security/benchmarks/introduction)
 - [Security center regulatory compliance dashboard](security-center-compliance-dashboard.md)
-- [Working with security policies](tutorial-security-policy.md)
-- [Managing security recommendations in Azure Security Center](security-center-recommendations.md) - Learn how to use recommendations in Azure Security Center to help protect your Azure resources.
+- [Working with security policies](tutorial-security-policy.md)