Merge pull request #299 from MicrosoftDocs/master

3/27 PM Publish

Author: v-alje

.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/breadcrumb/toc.yml

@@ -5,3 +5,7 @@
   - name: PowerApps
     tocHref: /powerapps/
     topicHref: /powerapps/
+    items:
+    - name: Guided Learning
+      tocHref: /powerapps/guided-learning/
+      topicHref: /powerapps/guided-learning/index

powerapps-docs/guided-learning/create-app-sharepoint.yml

@@ -5,15 +5,15 @@ metadata:
   description: Generate a three screen app from a SharePoint list, then explore and update the app.
   audience: Business User
   level: Beginner
-  nextTutorialHref: create-app-cds
-  nextTutorialTitle: Creating an app from the Common Data Service
+  nextTutorialHref: manage-apps
+  nextTutorialTitle: Manage apps
   displayType: one-column
-  author: mgblythe
-  manager: anneta
+  author: AFTOwen
+  manager: kfile
   ms.service: powerapps
   ms.topic: get-started-article
   ms.date: 10/27/2017
-  ms.author: mblythe
+  ms.author: anneta
 items:
 - durationInMinutes: 1
   content: |

powerapps-docs/guided-learning/get-started.yml

@@ -8,12 +8,12 @@ metadata:
   nextTutorialHref: create-app-sharepoint
   nextTutorialTitle: Creating an app from SharePoint
   displayType: one-column
-  author: mgblythe
-  manager: anneta
+  author: AFTOwen
+  manager: kfile
   ms.service: powerapps
   ms.topic: get-started-article
   ms.date: 10/27/2017
-  ms.author: mblythe
+  ms.author: anneta
 items:
 - durationInMinutes: 1
   content: |

powerapps-docs/guided-learning/manage-apps.yml

@@ -5,15 +5,13 @@ metadata:
   description: Share apps, control which version of an app is used and shared, and work with containers.
   audience: Business User
   level: Beginner
-  nextTutorialHref: manage-data
-  nextTutorialTitle: Managing data
   displayType: one-column
-  author: mgblythe
-  manager: anneta
+  author: AFTOwen
+  manager: kfile
   ms.service: powerapps
   ms.topic: get-started-article
   ms.date: 10/27/2017
-  ms.author: mblythe
+  ms.author: anneta
 items:
 - durationInMinutes: 1
   content: |

powerapps-docs/maker/TOC.yml

@@ -13,6 +13,10 @@
     items:
     - name: Open a sample app
       href: ./canvas-apps/open-and-run-a-sample-app.md
+    - name: Create an app from a template
+      href: ./canvas-apps/get-started-test-drive.md
+    - name: Create an app from within SharePoint
+      href: ./canvas-apps/generate-app-from-sharepoint-list-interface.md
     - name: Generate an app
       items:
       - name: From the Common Data Service for Apps
@@ -21,10 +25,6 @@
         href: ./canvas-apps/app-from-sharepoint.md
       - name: From Excel
         href: ./canvas-apps/get-started-create-from-data.md
-    - name: Customize a SharePoint list form
-      href: ./canvas-apps/customize-list-form.md
-    - name: Create an app from within SharePoint
-      href: ./canvas-apps/generate-app-from-sharepoint-list-interface.md
   - name: Tutorials
     items:
     - name: Customize a generated app
@@ -79,8 +79,8 @@
         href: ./canvas-apps/dev-appsource-test-drive.md
   - name: How-to guides
     items:
-    - name: Create an app from a template
-      href: ./canvas-apps/get-started-test-drive.md
+    - name: Customize a SharePoint list form
+      href: ./canvas-apps/customize-list-form.md
     - name: Build an Excel app from scratch
       href: ./canvas-apps/get-started-create-from-blank.md
     - name: Customize an app
@@ -145,6 +145,8 @@
         href: ./canvas-apps/gateway-management.md
       - name: Understand gateways
         href: ./canvas-apps/gateway-reference.md
+      - name: Troubleshoot Power Query
+        href: ./common-data-service/data-platform-cds-newentity-troubleshooting-mashup.md
     - name: Integrate with other technologies # already one TOC level too deep
       items:
       - name: SharePoint Online
@@ -174,14 +176,14 @@
   - name: Reference
     items:
     - name: Formula reference
-      href: ./canvas-apps/formula-reference.md # lives in root, move to formulas?
+      href: ./canvas-apps/formula-reference.md
     - name: Controls reference
-      href: ./canvas-apps/reference-properties.md # lives in root, move to controls?
+      href: ./canvas-apps/reference-properties.md
     - name: Connectors reference
-      href: ./canvas-apps/connections-list.md # lives in root, move to connectors? Is this OK as a reference topic (vs. in how-to section)
+      href: ./canvas-apps/connections-list.md
     - name: System requirements, limits, and configuration
       href: ./canvas-apps/limits-and-config.md
-  - name: Resources # currently all content from old Get Started, except for intro topic. We can relocate as appropriate
+  - name: Resources
     items:
     - name: Work with environments
       href: ./canvas-apps/working-with-environments.md
@@ -198,10 +200,8 @@
     href: ./model-driven-apps/overview-model-driven-samples.md
   - name: Share a model-driven app
     href: ./model-driven-apps/share-model-driven-app.md
-  - name: Run a model-driven app on a mobile device
-    href: ./model-driven-apps/run-app-client-model-driven.md
   - name: For Developers
-    href: ../developer/model-driven-apps/TOC.yml 
+    href: ../developer/model-driven-apps/TOC.yml
 - name: Common Data Service for Apps
   href: ./common-data-service/data-platform-intro.md
   items:

powerapps-docs/maker/canvas-apps/delegation-overview.md

@@ -14,7 +14,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: na
-ms.date: 08/15/2017
+ms.date: 03/27/2018
 ms.author: gregli
 
 ---
@@ -27,7 +27,7 @@ The key to building efficient apps is to minimize the amount of data that needs
 
 Where this becomes complicated, and the reason this article exists, is because not everything that can be expressed in a PowerApps formula can be delegated to every data source.  The PowerApps language mimics Excel's formula language, designed with complete and instant access to a full workbook in memory, with a wide variety of numerical and text manipulation functions.  As a result, the PowerApps language is far richer than most data sources can support, including powerful database engines such as SQL Server.
 
-**Working with large data sets requires using data sources and formulas that can be delegated.**  It is the only way to keep your app performing well and ensure users can access all the information they need. Take heed of [blue-dot suggestions](delegation-overview.md#blue-dot-suggestions) that flag places where delegation is not possible.  If you're working with small data sets (less than 500 records), you can use any data source and formula as processing can be done locally if the formula cannot be delegated.  
+**Working with large data sets requires using data sources and formulas that can be delegated.**  It is the only way to keep your app performing well and ensure users can access all the information they need. Take heed of [blue-dot suggestions](delegation-overview.md#blue-dot-suggestions) that flag places where delegation is not possible.  If you're working with small data sets (less than 500 records), you can use any data source and formula as processing can be done locally if the formula cannot be delegated. 
 
 ## Delegable data sources
 See the [delegation list](delegation-list.md) for the full list of which data sources support delegation and to what extent.
@@ -80,7 +80,7 @@ Counting functions such as **[CountRows](functions/function-table-counts.md)**,
 
 Other aggregate functions such as **[StdevP](functions/function-aggregates.md)** and **[VarP](functions/function-aggregates.md)** cannot be delegated.
 
-### Other functions
+## Non-delegable functions
 All other functions do not support delegation, including these notable functions:
 
 * Table shaping: **[AddColumns](functions/function-table-shaping.md)**, **[DropColumns](functions/function-table-shaping.md)**, **[ShowColumns](functions/function-table-shaping.md)**, ...
@@ -101,12 +101,20 @@ Since the **LookUp** and its data source are delegable, a match for **Suppliers*
 ## Non-delegable limits
 Formulas that cannot be delegated will be processed locally.  This allows for the full breadth of the PowerApps formula language to be used.  But at a price: all the data must be brought to the device first, which could involve retrieving a large amount of data over the network.  That can take time, giving the impression that your app is slow or possibly hung.
 
-To avoid this, PowerApps imposes a limit on the amount of data that can be processed locally: 500 records.  We chose this number so that you would still have complete access to small data sets and you would be able to refine your use of large data sets by seeing partial results.
+To avoid this, PowerApps imposes a limit on the amount of data that can be processed locally: 500 records by default.  We chose this number so that you would still have complete access to small data sets and you would be able to refine your use of large data sets by seeing partial results.
 
 Obviously care must be taken when using this facility as it can be confusing for users.  For example, consider a **Filter** function with a selection formula that cannot be delegated, over a million record data source.  Since the filtering will be done locally, only the first 500 records of the million records will be scanned.  If the desired record is record 501, or 500,001, it will not be considered or returned by **Filter**.
 
 Another place where this can be confusing is aggregate functions.  Take **Average** over a column of that same million record data source.  Since **Average** cannot yet be delegated, only the first 500 records will be averaged.  Care must be taken or a partial answer could be misconstrued as a complete answer by a user of your app.
 
+## Changing the limit
+
+500 is the default number of records.  This number can be changed by going to the File tab, selecting the App Settings in the left hand navigation pane, and looking under Experimental features.  Here you will find the "Data row limit for non-delegable queries" setting which you can change from 1 to 2000.  This setting is app wide.
+
+In some cases, you will know that 2000 (or 1000, or 1500) will satisfy the needs of your scenario.  With care, you can increase this number to fit your scenario.  Be aware that as you increase this number your app's performance may degrade, especially for wide tables with lots of columns.  The best answer is still to always delegate what you can.
+
+To ensure your app can scale to large data sets, reduce this setting down to 1.  Anything that cannot be delegated will now only return a single record, which should be easy to detect when testing your app.  This can help avoid surprises when trying to take a proof of concept app to production.
+
 ## Blue dot suggestions
 To make it easier to know what is and is not being delegated, the authoring experience provides blue dot suggestions when a formula contains something that cannot be delegated.
 

powerapps-docs/maker/common-data-service/data-platform-cds-newentity-pq.md

@@ -88,3 +88,4 @@ If you select **Load to existing entity**, you can specify an entity into which
 
 We're excited about this functionality and eager to hear your feedback. Please [send us your suggestions and feedback](https://powerusers.microsoft.com/t5/PowerApps-Community/ct-p/PowerApps1) about this feature!
 
+If an [error message about permissions](data-platform-cds-newentity-troubleshooting-mashup.md) appears, talk to your administrator.

powerapps-docs/maker/common-data-service/data-platform-cds-newentity-troubleshooting-mashup.md

@@ -1,11 +1,11 @@
 ---
-title: Troubleshooting - Unable to create or retrieve a mashup for this database | Microsoft Docs
-description: Resolve issues creating a Custom Entity using CDS and Power Query, by administrator changes to AAD restrictions.
+title: Troubleshooting Power Query | Microsoft Docs
+description: Resolve issues using Power Query to create a custom entity in the Common Data Service for Apps 
 services: ''
 suite: powerapps
 documentationcenter: na
 author: mllopis
-manager: kfend
+manager: kfile
 editor: ''
 tags: ''
 
@@ -18,39 +18,28 @@ ms.date: 08/18/2017
 ms.author: millopis
 
 ---
-# Troubleshooting - Unable to create or retrieve a mashup for this database
-When using the **New Entities from Data (Technical Preview)** feature, you might run into an error that looks like the following:
+# Troubleshooting Power Query
+When you use Power Query to create a custom entity that contains data from external sources, this error might appear:
 
-    *Unable to create or retrieve a mashup for the current database*
+`Your Azure Active Directory administrator has set a policy that prevents you from using this feature. Please contact your administrator, who can grant permissions for this feature on your behalf.`
 
-This can occur when you're using the feature to create *Custom Entities* in the **Common Data Service (CDS)** based on data from external data sources using **Power Query**. The error is triggered when **Power Query** cannot access the organization's data in **PowerApps or CDS**. There are two scenarios when this can happen:
+The error appears if Power Query can't access the organization's data in PowerApps or the Common Data Service. This situation arises under two sets of circumstances:
 
-* An **Azure Active Directory** (AAD) tenant administrator has disallowed users' ability to consent to apps accessing company data on their behalf.
-* Using an unmanaged Active Directory tenant. An unmanaged tenant is a directory without a global administrator that was created to complete a self-service signup offer. To fix this scenario, users must *first* convert to a managed tenant, then follow one of the two solutions to this issue, described in the following section.
+* An Azure Active Directory (AAD) tenant administrator has disallowed users' ability to consent to apps that access company data on their behalf.
+* Using an unmanaged Active Directory tenant. An unmanaged tenant is a directory without a global administrator that was created to complete a self-service signup offer. To fix this scenario, users must first convert to a managed tenant and then follow one of the two solutions to this issue, described in the following section.
 
-There are two ways to fix the issue described above:
+To resolve this issue, the AAD administrator must follow the steps in either of the procedures later in this topic.
 
-* Have the AAD administrator follow the steps necessary for users to consent to apps accessing company data
-* Have the AAD administrator allow **Power Query** to access data
+## Allow users to consent to apps that access company data
+This approach is perhaps easier than the next, but it allows for broader permissions.
 
-Each of the steps necessary for these solutions are described next.
+1. In [https://portal.azure.com](https://portal.azure.com), open the **Azure Active Directory** blade, and then select **User settings**.
+1. Select **Yes** next to **Users can consent to apps accessing company data on their behalf**, and then select **Save**.
 
-## Allowing users to give apps consent to access company data
+## Allow Power Query to access company data
+As an alternative, the tenant administrator can give consent to Power Query without modifying tenant-wide permissions.
 
-You can contact the AAD tenant administrator, and have him or her perform the following steps, which enables users to consent to any app accessing company data:
-
-1. Visit [https://portal.azure.com](https://portal.azure.com)
-2. Open the **Azure Active Directory** blade.
-3. Select **User settings**.
-4. Select **Yes** next to **Users can consent to apps accessing company data on their behalf**, and then select **Save**.
-5. Once that process is completed, the issue will be resolved.
-
-This is perhaps the easiest approach, but it allows for broader permissions than the next option.
-
-## Allowing Power Query to access company data
-Another solution is to have the tenant administrator give consent to **Power Query** without modifying tenant-wide permissions. Have the tenant administrator take the following steps achieve this:
-
-1. Install [Azure PowerShell](https://docs.microsoft.com/powershell/azure/install-azurerm-ps)
+1. Install [Azure PowerShell](https://docs.microsoft.com/powershell/azure/install-azurerm-ps).
 2. Run the following PowerShell commands:
    * Login-AzureRmAccount (and sign in as the tenant admin)
    * New-AzureRmADServicePrincipal -ApplicationId f3b07414-6bf4-46e6-b63f-56941f3f4128