Merge pull request #306 from manasmams/master

PRMerger17 · web-flow · commit 3f11377a3f2e · 2018-04-05T12:45:11.000-07:00
Updating the licenses doc
diff --git a/powerapps-docs/administrator/environments-administration.md b/powerapps-docs/administrator/environments-administration.md
@@ -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. 
 
-### 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.
+### 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:
+
+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
diff --git a/powerapps-docs/administrator/environments-overview.md b/powerapps-docs/administrator/environments-overview.md
@@ -94,15 +94,14 @@ Your license determines whether you can create environments.
 
 | License | Environment creation is allowed |
 | --- | --- |
-| PowerApps P2 |√ |
-| PowerApps P2 Trial |√ |
+| PowerApps P2 |√ (Two Production and Two Trial environments)|
+| PowerApps P2 Trial |√ (Two Trial environments)|
 | PowerApps P1 |x |
 | PowerApps P1 Trial |x |
 | Dynamics 365 Plans |x |
 | Office 365 Plans |x |
 | Dynamics 365 Apps and Teams Plans |x |
 
-Each user can create up to two Trial environments. PowerApps P2 can also create up to two Production environments.
 
 ### Where can environments be created?
 You will be able to create new environments from [PowerApps.com][2] and from the [PowerApps admin center][1]. If you create an environment, you will automatically be added to the Environment Admin role for that environment. There is not be a limit on the number of environments that you can participate in as a member of the Environment Admin or Environment Maker role. For more information about environments, see [Administer environments in PowerApps](environments-administration.md). For instructions on how to create an environment, see [Create an environment](create-environment.md).
diff --git a/powerapps-docs/administrator/signup-for-powerapps-admin.md b/powerapps-docs/administrator/signup-for-powerapps-admin.md
@@ -4,7 +4,7 @@ description: Follow these steps in order to sign up for PowerApps as an administ
 services: 'powerapps'
 suite: powerapps
 documentationcenter: na
-author: jamesol-msft
+author: manasmams
 manager: anneta
 editor: ''
 tags: ''
@@ -15,13 +15,13 @@ ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: na
 ms.date: 03/21/2018
-ms.author: jamesol
+ms.author: manasma
 
 ---
 # Purchase PowerApps for your organization
 This article shows you how to purchase PowerApps for your organization as an administrator. You can purchase PowerApps through the PowerApps website directly, through the Office 365 admin center, or through your Microsoft representative or partner. This article will discuss the trial options available for PowerApps Plan 1 or Plan 2 and then explain how to purchase PowerApps Plan 1 or Plan 2 as an organization. For more information, see [PowerApps in your organization Q&A](signup-question-and-answer.md).
 
-> [!NOTE]
+> [!NOTE]
 >   To purchase PowerApps for an organization, you must already be an Office 365 Global or Billing Admin of a tenant, or you must create a tenant.
 
 ## Choosing the right plan
@@ -41,12 +41,12 @@ You can purchase PowerApps subscriptions for your organization from [powerapps.m
 ## Get PowerApps through Office 365
 You can purchase PowerApps subscriptions for your organization from the [Office 365 admin center][6] and then assign PowerApps licenses to your users. [Learn more][5].
 
-> [!NOTE]
+> [!NOTE]
 > PowerApps will be added to existing and new Office 365 subscriptions in November 2016.
 >
 > * If you sign in to PowerApps with an Office 365 subscription prior to this change going out, you will be prompted to sign up for a free PowerApps Plan 2 trial.
 > * Feel free to sign up for the trial if you want to try out PowerApps until the update is made to your Office 365 subscription.  
-> * However, please be aware that the trial license may include features of PowerApps that are not available to you through your Office 365 subscription when the trial expires after 90 days.  See [PowerApps pricing][2] to see what capabilities are included in your Office 365 subscription.
+> * However, please be aware that the trial license may include features of PowerApps that are not available to you through your Office 365 subscription when the trial expires after 30 days.  See [PowerApps pricing][2] to see what capabilities are included in your Office 365 subscription.
 
 
 ### Purchase a subscription trial
@@ -77,16 +77,16 @@ You can purchase PowerApps subscriptions for your organization from the [Office
 
 5. Enter the number of licenses you would like to add, and then select **Check out now** or **Add to cart**.
 
-   > [!NOTE]
-> You can add more later if needed.
-   >
+   > [!NOTE]
+   > You can add more licenses later if needed.
+
 
 6. Enter the needed information in the Checkout flow,
 
     Under **Billing -> Subscriptions**, you will see **Microsoft PowerApps Plan 1** or **Microsoft PowerApps Plan 2** listed. If you decide later that you want to add more licenses, go back to **Add subscriptions** and then select **Change license quantity**.
 
 ## Add-ons
-These are coming soon but are not supported yet.
+These are not supported yet.
 
 ## See also
 [PowerApps in your organization Q&A](signup-question-and-answer.md)  
diff --git a/powerapps-docs/administrator/signup-question-and-answer.md b/powerapps-docs/administrator/signup-question-and-answer.md
@@ -57,9 +57,9 @@ Finally, if your company wishes to restrict the use of organizational-only data
 
 ## Administration of PowerApps
 ### Why has the PowerApps icon appeared in the Office 365 app launcher?
-As announced in August, Microsoft PowerApps is now a fundamental part of the Office 365 suite. Three months after this announcement Microsoft PowerApps was enabled as a service as a part of existing Office 365 SKU's. As users everywhere in the world can now use Microsoft PowerApps, it has appeared in the app launcher for them. See [Licensing overview](pricing-billing-skus.md) to understand which Office 365 SKUs now include PowerApps.
+Microsoft PowerApps is a fundamental part of the Office 365 suite and is enabled as a service as a part of existing Office 365 SKU's. As users everywhere in the world can now use Microsoft PowerApps, it appeares in 'All apps' in the app launcher screen. See [Licensing overview](pricing-billing-skus.md) to understand which Office 365 SKUs now include PowerApps.
 
-See the following section if you'd like to remove the PowerApps tile from the app launcher by default.
+See the following section if you'd like to remove the PowerApps tile from 'All apps' by default.
 
 ### How do I remove PowerApps from existing users?
 If a user was assigned a PowerApps Plan 1 or PowerApps Plan 2 license then you can take the following steps to remove the PowerApps license for that user:
