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

Author: jimholtz

CODEOWNERS

@@ -1,4 +1,4 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-/powerapps-docs/                                    @jimholtz @matp @JimDaly @KumarVivek @AFTOwen
+/powerapps-docs/                                    @jimholtz @Mattp123 @JimDaly @KumarVivek @AFTOwen

powerapps-docs/administrator/environments-administration.md

@@ -6,7 +6,7 @@ manager: kvivek
 ms.service: powerapps
 ms.component: pa-admin
 ms.topic: conceptual
-ms.date: 07/30/2018
+ms.date: 08/15/2018
 ms.author: manasma
 ---
 
@@ -174,7 +174,7 @@ Each user can provision databases in two Trial environments and two Production e
 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
+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.
@@ -186,14 +186,8 @@ If you are getting any other error message or have more questions, please connec
 ### 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. 
-    
+**Default environment**: Creating a database is currently not supported in a default environment of the tenant. 
+  
 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]
 
@@ -220,4 +214,4 @@ Yes, the ability to view the apps and flows for an environment is available from
 [2]: https://web.powerapps.com
 [3]: https://powerapps.microsoft.com/pricing/
 [4]: https://admin.flow.microsoft.com
-[5]: https://go.microsoft.com/fwlink/p/?linkid=871628
+[5]: https://go.microsoft.com/fwlink/p/?linkid=871628

powerapps-docs/administrator/powerapps-powershell.md

@@ -126,8 +126,9 @@ To perform the administration operations in the admin cmdlets, you'll need the f
 | Version | Date | Updates |
 | --- | --- | --- |
 | 1.0 | 04/23/2018 | <ol> <li> Initial launch of the PowerApps cmdlets for app creators (preview) including management cmdlets for Environments, Apps, Flows, Flow approvals, Connections, and Custom Connectors </li> <li> Initial launch of the PowerApps cmdlets for administrators (preview) including administrative cmdlets for Environments, Apps, and Flows </li></ol>|
-| 2.0 | 05/24/2018 | <ol> <li> Minor bug fixes in both the cmdlets for app creators and administators </li> <li> Added the following new administrative cmdlets: <br> Get-AdminConnection <br> Remove-AdminConnection <br> Get-AdminConnectionRoleAssignment <br> Set-AdminConnectionRoleAssignment <br>Remove-AdminConnectionRoleAssignment <br>Get-AdminConnector  <br>Remove-AdminConnector <br>Set-AdminConnectorRoleAssignment  <br>Get-AdminConnectorRoleAssignment  <br>Remove-AdminConnectorRoleAssignment <br>Get-AdminPowerAppsUserDetails <br>Get-AdminFlowUserDetails <br>Remove-AdminFlowUserDetails <br>Get-AdminApiPolicy  <br>Add-AdminApiPolicy <br>Remove-AdminApiPolicy <br>Set-AdminApiPolicy <br>Add-ConnectorToBusinessDataGroup  <br>Remove-ConnectorFromBusinessDataGroup </li> </ol>
-| 3.0 | 07/30/2018 | <ol> <li> Added the ability to pass-in credentials to the Add-PowerAppsAccount (to enable recurring scripting) </li> <li>  Minor bug fixes in both the cmdlets for app creators and administators </li> <li> Added the "PowerApp" or "Flow" prefix to each cmdlet for app creators </li> <li>  Added the "AdminPowerApp" or "AdminFlow" prefix to each cmdlet for administrators </li> <li> Added the following new administrative cmdlets: <br> New-AdminPowerAppEnvironment <br> Set-AdminPowerAppEnvironmentDisplayName <br> New-AdminPowerAppCdsDatabase <br> Get-AdminPowerAppCdsDatabaseLanguages <br> Get-AdminPowerAppCdsDatabaseCurrencies <br> Get-AdminPowerAppEnvironmentLocations <br> Get-AdminPowerAppConnectionReferences <br> Set-AdminPowerAppAsFeatured <br> Clear-AdminPowerAppAsFeatured <br> Set-AdminPowerAppAsHero <br> Clear-AdminPowerAppAsHero <br> Set-AdminPowerAppApisToBypassConsent <br> Clear-AdminPowerAppApisToBypassConsent <br> Remove-AdminFlowApprovals </li></ol>
+| 2.0 | 05/24/2018 | <ol> <li> Minor bug fixes in both the cmdlets for app creators and administrators </li> <li> Added the following new administrative cmdlets: <br> Get-AdminConnection <br> Remove-AdminConnection <br> Get-AdminConnectionRoleAssignment <br> Set-AdminConnectionRoleAssignment <br>Remove-AdminConnectionRoleAssignment <br>Get-AdminConnector  <br>Remove-AdminConnector <br>Set-AdminConnectorRoleAssignment  <br>Get-AdminConnectorRoleAssignment  <br>Remove-AdminConnectorRoleAssignment <br>Get-AdminPowerAppsUserDetails <br>Get-AdminFlowUserDetails <br>Remove-AdminFlowUserDetails <br>Get-AdminApiPolicy  <br>Add-AdminApiPolicy <br>Remove-AdminApiPolicy <br>Set-AdminApiPolicy <br>Add-ConnectorToBusinessDataGroup  <br>Remove-ConnectorFromBusinessDataGroup </li> </ol>
+| 3.0 | 07/30/2018 | <ol> <li> Added the ability to pass-in credentials to the Add-PowerAppsAccount (to enable recurring scripting) </li> <li>  Minor bug fixes in both the cmdlets for app creators and administrators </li> <li> Added the "PowerApp" or "Flow" prefix to each cmdlet for app creators </li> <li>  Added the "AdminPowerApp" or "AdminFlow" prefix to each cmdlet for administrators </li> <li> Added the following new administrative cmdlets: <br> New-AdminPowerAppEnvironment <br> Set-AdminPowerAppEnvironmentDisplayName <br> New-AdminPowerAppCdsDatabase <br> Get-AdminPowerAppCdsDatabaseLanguages <br> Get-AdminPowerAppCdsDatabaseCurrencies <br> Get-AdminPowerAppEnvironmentLocations <br> Get-AdminPowerAppConnectionReferences <br> Set-AdminPowerAppAsFeatured <br> Clear-AdminPowerAppAsFeatured <br> Set-AdminPowerAppAsHero <br> Clear-AdminPowerAppAsHero <br> Set-AdminPowerAppApisToBypassConsent <br> Clear-AdminPowerAppApisToBypassConsent <br> Remove-AdminFlowApprovals </li></ol>
+| 4.0 | 08/15/2018 | Added an optional parameter to the New-AdminPowerAppCdsDatabase to make the function synchronous, by default (i.e. it will not return until the database is successfully provisioned)
 
 ## Questions?
 

powerapps-docs/developer/common-data-service/TOC.yml

@@ -2,6 +2,8 @@
   href: overview.md
 - name: Introduction to solutions
   href: introduction-solutions.md
+- name: Supported app building practices
+  href: customization-support.md
 - name: Common Data Service for Apps data entities
   href: entities.md
   items: 

powerapps-docs/maker/common-data-service/overview.md renamed to powerapps-docs/developer/common-data-service/customization-support.md

@@ -89,4 +89,5 @@ If you’re applying these changes to a production system, we recommend that you
 
 
 ## Next Steps  
-[Overview of building a model-driven app](../model-driven-apps/model-driven-app-overview.md)
+[What are model-driven apps in PowerApps?](../../maker/model-driven-apps/model-driven-app-overview.md)
+

powerapps-docs/maker/TOC.yml

@@ -37,6 +37,8 @@
       href: ./canvas-apps/expense-report-install.md
     - name: Help Desk app
       href: ./canvas-apps/help-desk-install.md
+    - name: Meeting Capture app
+      href: ./canvas-apps/sample-meeting-capture.md
   - name: Create your first app
     items:
     - name: 1 - Generate an app from data
@@ -663,6 +665,8 @@
           href: ./model-driven-apps/main-form-presentations.md
         - name: Control access to forms
           href: ./model-driven-apps/control-access-forms.md
+        - name: Add a field to a form
+          href: ./model-driven-apps/add-field-form.md 
         - name: Show or hide form elements
           href: ./model-driven-apps/visibility-options-legacy.md
         - name: Change navigation within a form
@@ -718,7 +722,7 @@
     - name: Apply business logic in an app
       href: ./model-driven-apps/guide-staff-through-common-tasks-processes.md
       items:
-      - name: Create business rules and recommendations
+      - name: Create a business rule  for a form
         href: ./model-driven-apps/create-business-rules-recommendations-apply-logic-form.md
     - name: Apply data visualizations in an app
       items:
@@ -795,6 +799,8 @@
       href: ./common-data-service/create-edit-virtual-entities.md
     - name: Virtual entity OData v4 data provider
       href: ./common-data-service/virtual-entity-odata-provider-requirements.md
+    - name: Define alternate keys using PowerApps portal
+      href: ./common-data-service/define-alternate-keys-portal.md   
     - name: Define alternate keys using solution explorer
       href: ./common-data-service/define-alternate-keys-solution-explorer.md
     - name: "How to guides: Entity"
@@ -826,12 +832,20 @@
   - name: Work with entity relationships
     href: ./common-data-service/relationships-overview.md
     items: 
-    - name: "Create an entity relationship"
+    - name: Entity relationships overview
+      href: ./common-data-service/create-edit-entity-relationships.md  
+    - name: Create one-to-many entity relationships overview
+      href: ./common-data-service/create-edit-1n-relationships.md
+    - name: Create many-to-many entity relationships overview
+      href: ./common-data-service/create-edit-nn-relationships.md
+    - name: Create an entity relationship
       href: ./common-data-service/data-platform-entity-lookup.md
+    - name: Create one-to-many entity relationships 
+      href: ./common-data-service/create-edit-1n-relationships-portal.md
+    - name: Create one-to-many entity relationships using solution explorer
+      href: ./common-data-service/create-edit-1n-relationships-solution-explorer.md 
     - name: Create many-to-many entity relationships using PowerApps portal
       href: ./common-data-service/create-edit-nn-relationships-portal.md
-    - name: Create many-to-many entity relationships using PowerApps solution explorer
-      href: ./common-data-service/create-edit-nn-relationships-solution-explorer.md  
     - name: Set managed properties for entity relationships
       href: ./common-data-service/set-managed-properties-relationships.md
     - name: Visualize hierarchical data
@@ -862,32 +876,49 @@
     href: ./common-data-service/fields-overview.md
     items: 
     - name: Types of fields
-      href: ./common-data-service/types-of-fields.md       
+      href: ./common-data-service/types-of-fields.md
+    - name: Global option sets overview
+      href: ./common-data-service/create-edit-global-option-sets.md
     - name: Set managed properties for fields
       href: ./common-data-service/set-managed-properties-for-field.md 
     - name: Behavior and format of the Date and Time field
       href: ./common-data-service/behavior-format-date-time-field.md     
     - name: "How-to guides: Fields"
       items: 
+      - name: How to create fields 
+        href: ./common-data-service/create-edit-fields.md 
       - name: How to manage fields
         href: ./common-data-service/data-platform-manage-fields.md
       - name: How to create fields using PowerApps portal
         href: ./common-data-service/create-edit-field-portal.md 
       - name: How to create fields using PowerApps solution explorer
         href: ./common-data-service/create-edit-field-solution-explorer.md
-      - name: How to create global option sets using PowerApps portal
-        href: ./common-data-service/create-edit-global-option-sets-portal.md
+      - name: How to create an option set using PowerApps portal
+        href: ./common-data-service/custom-picklists.md
       - name: How to create global option sets using solution explorer  
         href: ./common-data-service/create-edit-global-option-sets-solution-explorer.md
+      - name: How to define calculated fields
+        href: ./common-data-service/define-calculated-fields.md
+      - name: How to define rollup fields
+        href: ./common-data-service/define-rollup-fields.md
       - name: How to map entity fields
         href: ./common-data-service/map-entity-fields.md
       - name: How to delete fields
         href: ./common-data-service/delete-fields.md
   - name: Apply business logic
     href: ./common-data-service/cds-processes.md
+    items: 
+      - name: Create a business rule for an entity 
+        href: ./common-data-service/data-platform-create-business-rule.md
   - name: Work with solutions
     href: ./common-data-service/solutions-overview.md
-    items:  
+    items:   
+    - name: Solutions overview
+      href: ./common-data-service/solutions-overview.md
+    - name: Use solution explorer 
+      href: ./common-data-service/use-solution-explorer.md
+    - name: Use the Common Data Services default solution
+      href: ./common-data-service/use-solutions-for-your-customizations.md   
     - name: Import, update, and export solutions
       href: ./common-data-service/import-update-export-solutions.md 
     - name: Navigate to a specific solution
@@ -941,4 +972,4 @@
   - name: Troubleshoot Power Query
     href: ./common-data-service/data-platform-cds-newentity-troubleshooting-mashup.md
   - name: Support
-    href: https://powerapps.microsoft.com/support/
+    href: https://powerapps.microsoft.com/support/