Merge branch 'live' into patch-1

Author: v-shils

powerapps-docs/administrator/TOC.yml

@@ -38,3 +38,20 @@
     href: admin-manage-apps.md
   - name: Move an app between tenants or environments
     href: environment-and-tenant-migration.md
+  - name: Responding to DSR requests
+    items:
+    - name: System-generated logs
+      href: powerapps-gdpr-dsr-guide-systemlogs.md
+    - name: PowerApps customer data
+      href: powerapps-gdpr-dsr-guide.md
+      items:
+      - name: Export data
+        href: powerapps-gdpr-export-dsr.md
+      - name: Delete data
+        href: powerapps-gdpr-delete-dsr.md
+    - name: CDS for Apps customer data
+      href: common-data-service-gdpr-dsr-guide.md
+- name: Reference
+  items:
+  - name: PowerShell support for PowerApps (preview)
+    href: powerapps-powershell.md

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).
+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/common-data-service-gdpr-dsr-guide.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
@@ -57,7 +57,7 @@ When a database is created, the users who have environment roles assigned to the
     Users with **Environment Admin** role are now assigned to **System Administrator** role. 
     Users with **Environment Maker** continue to possess the same role.
 
-You can assign additional users to pre-defined roles or even create [custom roles][1]. See [Database Security](create-database.md) for more details.
+You can assign additional users to pre-defined roles or even create [custom roles][1]. See [Database Security](database-security.md) for more details.
 
 > [!NOTE]
 > On creating the database, any security group assigned to Environment Admin or Environment Maker role will not be honored any more. Currently, assigning permissions in database, do not support AAD security group.

powerapps-docs/administrator/create-database.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-dlp-policy.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/create-environment.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)
@@ -172,26 +172,58 @@ An organization's data must be protected so that it isn't shared with audiences
 ![](./media/environment-admin/data-policies.png)
 
 ## Frequently asked questions
-### How many environments can I create?
-Each user can create up to two Trial environments and two Production environments, depending on their license.
+### How many environments and databases can I create?
+You can create up to two Trial environments and two Production environments, depending on their license. [Read here](environments-overview.md#creating-an-environment) for more details. 
+Each user can provision databases in two Trial environments and two Production environments, depending on their license. 
+
+### Which license includes Common Data Service?
+PowerApps Plan 2.  See [PowerApps pricing page][3] for details on all the plans that include this license.
+
+### While trying to create a new environment, I am getting an error. How should I resolve it?
+If you are getting the following error message: "Either your plan doesn’t support the environment type selected or you’ve reached the limit for that type of environment." , it can mean one of the two things
+
+1. You have already utilized your quota to create a specific type of environments. Say you were creating  a Trial environment and you get this error message. That means, that you have already provisioned two Trial environments. You can view all the environments in [PowerApps admin center][1].
+If you want, you can delete an existing environment of that specific type and create a new one. But, please make sure that you don't lose your data, apps, flows and other resources which you want to retain.
+
+2. You do not have a quota to create that specific type of the environment. Check what type of environment you can create [here](environments-overview.md#creating-an-environment).
+
+If you are getting any other error message or have more questions, please connect with us [here][5].
+
+### While trying to create a database in an environment, I am getting an error. How should I resolve it?
+In following scenarios, you can get an error while trying to create a database:
 
-### How many databases can I provision?
-Each user can provision databases in two Trial environments and two Production environments, depending on their license. The user needs to an **Environment Admin** in the environment.
+1. **Default environment**: Creating a database is currently not supported in a default environment of the tenant. 
+
+2. **Environment for an individual use**: You get an environment for your individual use, by signing-up from the PowerApps Community Plan. If you have not created the database yet, then currently you can't provision a database in the environment for individual use. 
+
+3. **Environment in a different region, than your AAD tenant's home region**: Currently, you can only provision a database in the environments created in your Azure Active Directory Tenant home region. Ability to provision a database in the other regions, will be coming soon. So, make sure to keep the region same as tenant's default ___location, if you want to create a database in it.
+
+4. **Creating databases not supported in certain regions**: There are certain regions, where creating databases is still not available. e.g. countries in South America. So, if your tenant's home ___location is South America, you currently can't provision a database in any environment. 
+    
+We are working on enabling all of the above scenarios.
+If you are getting any other error message or have more questions, please connect with us [here][5]
+
+### When will my Trial environment expire?   
+Trial environment expires after 30 days of its creation. If you don't want your environment to expire, there will be ways to convert it into a Production environment. This functionality, will be coming soon and we will not expire Trial environments till then.
+
+### Does my current database (created with previous version of the Common Data Service) also gets counted in the quota?
+If you had a database (created with previous version of the Common Data Service), they will also get counted with your Production environment quota. If you now create a database in an environment (created prior to March 15, 2018) then it will also get counted as Production environment.
 
 ### Can I rename an environment?
 Yes, this functionality is available from the PowerApps admin center. See [Environments Administration](environments-administration.md#rename-your-environment) for more details.
 
 ### Can I delete an environment?
 Yes, this functionality is available from the PowerApps admin center. See [Environments Administration](environments-administration.md#delete-your-environment) for more details.
+Please note that you currently can't delete a Production environment with a database (with latest version of the Common Data Service). This will be coming soon!
 
 ### As an Environment Admin, can I view and manage all resources (apps, flows, APIs, etc.) for an environment?
 Yes, the ability to view the apps and flows for an environment is available from the PowerApps admin center. See [View Apps](admin-view-apps.md) for more details.
 
-### Which license includes Common Data Service?
-PowerApps Plan 2.  See [PowerApps pricing page][3] for details on all the plans that include this license.
+
 
 <!--Reference links in article-->
 [1]: https://admin.powerapps.com
 [2]: https://web.powerapps.com
 [3]: https://powerapps.microsoft.com/pricing/
 [4]: https://admin.flow.microsoft.com
+[5]: https://go.microsoft.com/fwlink/?linkid=871628