Merge branch 'master' of https://github.com/MicrosoftDocs/powerapps-docs-pr into updateExcelTable

Author: yifwang

.openpublishing.redirection.json

@@ -108,7 +108,7 @@
         {
         "source_path": "powerapps-docs/trial-plan.md",
         "redirect_url": "/powerapps/maker/signup-for-powerapps",
-        "redirect_document_id": true
+        "redirect_document_id": false
         },
         {
         "source_path": "powerapps-docs/dev-isv-partner-intro.md",
@@ -257,7 +257,7 @@
         },
         {
         "source_path": "powerapps-docs/admin-view-apps.md",
-        "redirect_url": "/powerapps/maker/canvas-apps/admin-view-apps",
+        "redirect_url": "/powerapps/administrator/admin-view-apps",
         "redirect_document_id": true
         },
         {
@@ -1122,12 +1122,12 @@
         },
         {
         "source_path": "powerapps-docs/signup-for-powerapps.md",
-        "redirect_url": "/powerapps/maker/canvas-apps/signup-for-powerapps",
+        "redirect_url": "/powerapps/maker/signup-for-powerapps",
         "redirect_document_id": true
         },
         {
         "source_path": "powerapps-docs/signup-for-powerapps-admin.md",
-        "redirect_url": "/powerapps/maker/canvas-apps/signup-for-powerapps-admin",
+        "redirect_url": "/powerapps/administrator/signup-for-powerapps-admin",
         "redirect_document_id": true
         },
         {
@@ -1304,6 +1304,11 @@
 		"source_path": "powerapps-docs/guided-learning/create-app-cds.md",
 		"redirect_url": "/powerapps/guided-learning/get-started#step-1",
 		"redirect_document_id": true
-		}
+        },
+        {
+        "source_path": "powerapps-docs/maker/model-driven-apps/run-app-client-model-driven.md",
+        "redirect_url": "/powerapps-docs/user/run-app-client-model-driven",
+        "redirect_document_id": true
+        }
     ]
 }

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-database.md

@@ -20,7 +20,7 @@ ms.author: manasma
 # Create a Common Data Service database
 You can create a database and build apps by using Common Data Service as a data store. You can either create your own custom entities or use the predefined entities. To create a database, you first need to either create an environment, or be assigned to an existing environment as an **Environment Admin**. In addition, you must be assigned the appropriate license. For information on purchasing a plan for using the Common Data Service, see [Pricing info](pricing-billing-skus.md).
 
-There are three ways to create a database:
+There are various ways to create a database:
 
 * In the PowerApps admin center
 * In the **Entities** pane of powerapps.com

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/environments-overview.md

@@ -109,24 +109,6 @@ You will be able to create new environments from [PowerApps.com][2] and from the
 
 ![](./media/environments-overview/CreateEnvironmentDialog-New.png)
 
-## What will change for PowerApps Preview users?
-Any user that has participated in the PowerApps preview will see some changes in their experience with the introduction of environments.  The following table lists what U.S. users and non-U.S. users can expect:
-
-| User | What happens |
-| --- | --- |
-| Preview user who created a Common Data Service database |You will see an environment called “{Your name}’s environment” that contains your preview Common Data Service database and any apps that you built against it.  You will be added to the Environment Maker role and Environment Admin role of this environment and as a Database owner of the database. When PowerApps enters general availability, we will upgrade the metadata of the Common Data Service. The impact of this change means that you will still be able to use the entities and apps that you have already built against your preview Common Data Service database; however, you won't be able to create fields or entities in that database. We will soon publish guidance on how you can create an environment with a database that contains the upgraded metadata and migrate your apps over to that environment. <br> If any of your apps that were built against your preview Common Data Service database also leverage a custom connector as a data source, they will be temporarily broken in this environment because all custom connectors will be migrated to the default environment. You'll need to re-create the custom connector in this environment to repair any affected apps. |
-| Preview user in the U.S. |The following resources that you created during the PowerApps preview period will be available in your tenant’s default environment:<br>- All apps you created (except any that connected to a preview Common Data Service database)<br>- All connections and custom connectors that you created<br>- All on-premises data gateways you installed |
-| Preview user not in U.S. |In addition to the default environment, you will also see an environment called “{Azure AD tenant} (from preview)” that contains the following resources you created during the PowerApps preview period:<br>- All apps you created (except any that connected to a preview Common Data Service database)<br>- All connections and custom connectors that you created<br>- All on-premises data gateways you installed.<br>You will be added to the Environment Maker role of this environment. |
-
-A *preview user* is someone who used Microsoft PowerApps before its release to General Availability (GA).
-
-Two weeks after PowerApps enters general availability (GA), environments that contain preview content will be marked as read-only (with the exception of the default environment); all existing apps and flows will continue to work in these environments, but you won't be able to create apps or flows. We highly recommend that users of these environments migrate their content to the default environment or another custom environment. Please refer to the following blog (which will be posted this week) for more information about the migration process: see the [Common Data Service features announcement blog][3].
-
-### Example environments for a preview user in U.S.
-![](./media/environments-overview/USuser1.png)
-
-### Example environments for a preview user not in U.S.
-![](./media/environments-overview/non-USuser1.png)
 
 ## Managing environments for your organization
 In PowerApps admin center,  you can manage all of the environments that you have created or to which you have been added to the Environment Admin role. From the Admin center, you can perform all administrative actions on an environment, including the following:

powerapps-docs/administrator/introduction-to-data-groups.md

@@ -24,8 +24,10 @@ Data groups are a simple way to categorize services within a [data loss preventi
 ## How data is shared between data groups
 Data cannot be shared among services located in different groups. For example, if you place SharePoint and Salesforce in the **Business data only** group and you place Facebook and Twitter in the **No business data allowed** group, you cannot create a PowerApp that moves data between SharePoint and Facebook. While data cannot be shared among services in different groups, you can share data among the services within a specific group. So, going back to the earlier example, since SharePoint and Salesforce were placed in the same data group, PowerApps that your end users create can share data between SharePoint and Salesforce. The key point is that services in a specific group can share data, while services in different groups cannot share data.
 
-Additionally, one data group must be designated as the *default* group. Initially, the **No business data allowed** group is the *default* group and all services are in the data group. An administrator can change the default data group to the **business data only** data group. > [!NOTE]
-> any new services that are added to PowerApps will be placed in the designated *default* group. For this reason, we recommend you keep the **No business data allowed** as the default group and manually add services into the **Business data only** group after your organization has evaluated the impact of allowing business data to be shared with the new service.
+Additionally, one data group must be designated as the *default* group. Initially, the **No business data allowed** group is the *default* group and all services are in the data group. An administrator can change the default data group to the **business data only** data group. 
+
+> [!NOTE]
+> Any new services that are added to PowerApps will be placed in the designated *default* group. For this reason, we recommend you keep the **No business data allowed** as the default group and manually add services into the **Business data only** group after your organization has evaluated the impact of allowing business data to be shared with the new service.
 
 ## Add services to a data group
 In this walk-through, we'll add SharePoint and Salesforce to the **business data only** data group of a data loss prevention (DLP) policy.
@@ -47,8 +49,8 @@ Since all services must be in one of the available data groups, to remove a serv
 ## Change the default data group
 In this walk-through, we will change the default data group from the **no business data allowed** data group to the **business data only** data group.  
 
-> [!IMPORTANT]
-> any new services that are added to PowerApps will be placed in the designated *default* group. For this reason, we recommend you keep the **No business data allowed** as the default group and manually add services into the **Business data only** group.
+> [!IMPORTANT]
+> Any new services that are added to PowerApps will be placed in the designated *default* group. For this reason, we recommend you keep the **No business data allowed** as the default group and manually add services into the **Business data only** group.
 
 1. Select the **...** located at the top right corner of the data group you wish to designate as the default data group:    
    ![change default group](./media/introduction-to-data-groups/default-data-group-0.png)