Merge pull request #302 from SKjerland/createDLP

[PowerApps] Added model-driven app topic to list of user topics in index.md; added content to DLP topics to help clear up customer confusion

Author: GitHubber17

powerapps-docs/administrator/admin-manage-apps.md

@@ -27,14 +27,14 @@ Admins can do the following from the PowerApps Admin center:
 * View the data sources used by an app
 
 ## Prerequisites
-* Either PowerApps Plan 2 or Flow Plan 2. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
+* Either a PowerApps Plan 2 or Microsoft Flow Plan 2 license. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
 * PowerApps Environment Admin, Office 365 Global Admin, or Azure Active Directory Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 ## Manage an app
 1. Sign in to the Admin center at [https://admin.powerapps.com]([https://admin.powerapps.com).
 2. In the navigation pane, click or tap **Environments**, and then click or tap the environment that contains the app that you want to manage.
 
-    If you don't see **Environments** in the navigation pane, that indicates you don't have a PowerApps Plan 2, Flow Plan 2, or PowerApps Plan 2 trial license.
+    If you don't see **Environments** in the navigation pane, that indicates you don't have a PowerApps Plan 2, Microsoft Flow Plan 2, or PowerApps Plan 2 trial license.
 
     ![File and Share](./media/admin-manage-apps/environment.png)
 3. On the **Resources** tab, click or tap **Apps**, and then click or tap the app that you want to manage.

powerapps-docs/administrator/admin-view-apps.md

@@ -25,7 +25,7 @@ In this quickstart, you'll learn how to download a list of apps created in a sin
 
 ## Prerequisites
  To follow this quickstart, the following items are required:
- * Either PowerApps Plan 2 or Flow Plan 2. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
+ * Either a PowerApps Plan 2 or Microsoft Flow Plan 2 license. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
  * PowerApps Environment Admin, Office 365 Global Admin, or Azure Active Directory Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 ## Sign in to the PowerApps Admin center

powerapps-docs/administrator/create-dlp-policy.md

@@ -14,19 +14,22 @@ ms.devlang: na
 ms.topic: quickstart
 ms.tgt_pltfrm: na
 ms.workload: na
-ms.date: 03/21/2018
+ms.date: 03/30/2018
 ms.author: sharik
 
 ---
 # Quickstart: Create a data loss prevention (DLP) policy
 To protect data in your organization, PowerApps lets you create and enforce policies that define which consumer connectors specific business data can be shared with. These policies that define how data can be shared are referred to as data loss prevention (DLP) policies. DLP policies ensure that data is managed in a uniform manner across your organization, and they prevent important business data from being accidentally published to connectors such as social media sites.
 
-In this quickstart, you'll learn how to create a DLP policy that prevents data that's stored in your Common Data Service and SharePoint databases from being published to Twitter.
+In this quickstart, you'll learn how to create a DLP policy for a single environment that prevents data that's stored in your Common Data Service and SharePoint databases from being published to Twitter.
 
 ## Prerequisites
-To follow this quickstart, the following items are required:
-* Either PowerApps Plan 2 or Flow Plan 2. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
-* PowerApps Environment Admin or Azure Active Directory Tenant Admin permissions, and permissions to at least one environment. For more information, see [Environments administration in PowerApps](environments-administration.md).
+To follow this quickstart, **one** of the following items is required:
+* Azure Active Directory Tenant Admin permissions
+* Office 365 Global Admin permissions
+* PowerApps Environment Admin permissions plus a PowerApps Plan 2, Microsoft Flow Plan 2, or a [PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=) license
+
+For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 ## Sign in to the PowerApps Admin center
 Sign in to the Admin center at [https://admin.powerapps.com]([https://admin.powerapps.com).
@@ -35,10 +38,18 @@ Sign in to the Admin center at [https://admin.powerapps.com]([https://admin.powe
 1. In the navigation pane, click or tap **Data policies**, and then click or tap **New policy**.
 
     ![](./media/create-dlp-policy/new-data-policy.png)
-2. For the data policy name, enter **Secure Data Access for Contoso**.
-3. On the **Environments** tab, select an environment from the drop-down list, and then click or tap **Continue**.
+2. The **Data Policy Name** field auto-populates with a name based on the time and date the policy is created. Replace this with **Secure Data Access for Contoso**.
+
+    ![](./media/create-dlp-policy/policy-name.png)
+3. The options on the **Environments** tab differ depending on whether you're an Environment admin or a Tenant admin. If you're an Environment admin, select an environment from the drop-down list, and then click or tap **Continue**.
 
     ![](./media/create-dlp-policy/select-environment.png)
+
+    If you're a Tenant admin, you can create DLP policies that apply to one or more environments, or to all environments within the tenant (including those created using a trial license). For this quickstart, click or tap **Apply to ONLY selected environments**, select an environment from the drop-down list, and then click or tap **Continue**.
+
+    ![](./media/create-dlp-policy/select-environment-tenant.png)
+
+    Note that environment DLP policies cannot override tenant-wide DLP policies.
 4. On the **Data groups** tab, under **Business data only**, click or tap **Add**.
 
     ![](./media/create-dlp-policy/data-groups.png)
@@ -47,6 +58,7 @@ Sign in to the Admin center at [https://admin.powerapps.com]([https://admin.powe
     ![](./media/create-dlp-policy/add-connectors.png)
 
     Connectors can reside in only one data group at a time and are added to the **No business data allowed** group by default. By moving Common Data Service and SharePoint to the **Business data only** group, you're preventing users from creating flows and apps that combine these two connectors with any of the connectors in the **No business data allowed** group.
+
 6. Click **Save policy**.
 
     ![](./media/create-dlp-policy/save-policy.png)
@@ -56,7 +68,7 @@ The Secure Data Access for Contoso policy is created and appears in the list of
 It's good practice for administrators to share a list of DLP policies with their organization so that users are aware of the policies prior to creating apps.
 
 ## Next steps
-In this quickstart, you learned how to create a DLP policy to prevent important business data from being accidentally published to connectors such as Twitter. To learn more about DLP policies, check out the article about how to manage them.
+In this quickstart, you learned how to create a DLP policy for a single environment to prevent important business data from being accidentally published to connectors such as Twitter. To learn more about DLP policies, check out the article about how to manage them.
 
 > [!div class="nextstepaction"]
 > [Manage data loss prevention (DLP) policies](prevent-data-loss.md)

powerapps-docs/administrator/create-environment.md

@@ -27,7 +27,7 @@ In this quickstart, you'll learn how to create an environment and a database for
 
 ## Prerequisites
  To follow this quickstart, the following items are required:
- * Either PowerApps Plan 2 or Flow Plan 2. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
+ * Either a PowerApps Plan 2 or Microsoft Flow Plan 2 license. Alternatively, you can sign up for a [free PowerApps Plan 2 trial](https://web.powerapps.com/signup?redirect=marketing&email=).
  * PowerApps Environment Admin, Office 365 Global Admin, or Azure Active Directory Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 ## Sign in to the PowerApps Admin center

powerapps-docs/administrator/environments-administration.md

@@ -44,10 +44,10 @@ To manage an environment in the PowerApps admin center, you must have one of the
 
 * The Global Administrator role of your Azure AD or Office 365 tenant.
 
-You also need either PowerApps Plan 2 or Flow Plan 2 to access the admin center. For more information, see the [PowerApps pricing page][3].
+You also need either a PowerApps Plan 2 or Microsoft Flow Plan 2 license to access the admin center. For more information, see the [PowerApps pricing page][3].
 
 > [!IMPORTANT]
-> Any changes that you make in PowerApps admin center affect the [Flow admin center][4] and vice versa.
+> Any changes that you make in PowerApps admin center affect the [Microsoft Flow admin center][4] and vice versa.
 
 ## Create an environment
 For instructions on how to create an environment, see [Quickstart: Create an environment](create-environment.md).
@@ -63,7 +63,7 @@ If you are a member of the Global Administrator role of your Azure AD or Office
 1. Open the [PowerApps admin center][1], find the environment to be renamed in the list, and click or tap it.
 
     ![](./media/environment-admin/environment-list-updated3.png)
- 
+
 2. Click or tap **Details**.
 
     ![](./media/environment-admin/environment-rename-details-2.png)

powerapps-docs/administrator/media/create-dlp-policy/policy-name.png

@@ -4,7 +4,7 @@ description: Walkthrough of how to manage data loss prevention policies for Powe
 services: 'powerapps'
 suite: powerapps
 documentationcenter: na
-author: SKjerland
+author: manasmams
 manager: kfile
 editor: ''
 tags: ''
@@ -15,13 +15,13 @@ ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: na
 ms.date: 03/21/2018
-ms.author: sharik
+ms.author: manasma
 
 ---
 # Manage data loss prevention (DLP) policies
 An organization's data is critical to its success. Its data needs to be readily available for decision-making, but it needs to be protected so that it isn't shared with audiences that shouldn't have access to it. To protect this data, PowerApps lets you create and enforce data loss prevention (DLP) policies that define which consumer connectors specific business data can be shared with. For example, an organization that uses PowerApps may not want its business data that's stored in SharePoint to be automatically published to its Twitter feed.
 
-To create, edit, or delete DLP policies, you must have either Environment Admin or Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
+To create, edit, or delete DLP policies, you must have either Environment Admin or Azure Active Directory Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 For instructions on how to create a DLP policy, see [Quickstart: Create a data loss prevention (DLP) policy](create-dlp-policy.md).
 
@@ -37,6 +37,11 @@ For instructions on how to create a DLP policy, see [Quickstart: Create a data l
     ![Sign in](./media/prevent-data-loss/3.png)
 2. Make your changes, and then click or tap **Save Policy**.
 
+    > [!NOTE]
+    > Environment DLP policies cannot override tenant-wide DLP policies.
+    >
+    >
+
     To review the changes, find the DLP policy in the list of data loss prevention policies and click or tap it to review its properties.
 
 ## Delete a DLP policy

powerapps-docs/administrator/media/create-dlp-policy/select-environment-tenant.png

@@ -32,10 +32,11 @@ This section provides information about how to find and run apps, and includes t
 
 * [Run an app in a web browser](run-app-browser.md)
 * [Run a canvas app on a mobile device](run-app-client.md)
+* [Run a model-driven app on a mobile device](run-app-client-model-driven.md)
 * [Add and run an app in Microsoft Teams](open-app-embedded-in-teams.md)
 * [Find and run an app in AppSource](app-source.md)
 
 ## Next steps
 * Ensure that you're using a [supported device platform and browser](../maker/canvas-apps/limits-and-config.md).
 * To run canvas apps, download and install PowerApps from the [App Store](https://itunes.apple.com/app/powerapps/id1047318566?mt=8) or [Google Play](https://play.google.com/store/apps/details?id=com.microsoft.msapps).
-* To run model-driven apps on a phone, download and install Dynamics 365 for phones from the [App Store](https://itunes.apple.com/app/dynamics-crm-for-phones/id1003997947?ls=1&mt=8) or [Google Play](https://play.google.com/store/apps/details?id=com.microsoft.crm.crmphone). To run model-driven apps on a tablet, download Dynamics 365 for tablets from the [App Store](https://itunes.apple.com/app/microsoft-dynamics-crm/id678800460?mt=8), [Google Play](https://play.google.com/store/apps/details?id=com.microsoft.crm.crmtablet), or [Windows Store](https://www.microsoft.com/store/p/microsoft-dynamics-365/9nblggh4rfqp). For more information, see [Quickstart: Run a model-driven app on a mobile device](run-app-client-model-driven.md).
+* To run model-driven apps on a phone, download and install Dynamics 365 for phones from the [App Store](https://itunes.apple.com/app/dynamics-crm-for-phones/id1003997947?ls=1&mt=8) or [Google Play](https://play.google.com/store/apps/details?id=com.microsoft.crm.crmphone). To run model-driven apps on a tablet, download Dynamics 365 for tablets from the [App Store](https://itunes.apple.com/app/microsoft-dynamics-crm/id678800460?mt=8), [Google Play](https://play.google.com/store/apps/details?id=com.microsoft.crm.crmtablet), or [Windows Store](https://www.microsoft.com/store/p/microsoft-dynamics-365/9nblggh4rfqp).