Merge branch 'master' into LanceDelano

tapanm-MSFT · tapanm-MSFT · commit 911df83c791d · 2020-10-01T16:28:35.000-07:00
diff --git a/powerapps-docs/developer/common-data-service/virtual-entities/sample-generic-ve-plugin.md b/powerapps-docs/developer/common-data-service/virtual-entities/sample-generic-ve-plugin.md
@@ -27,6 +27,9 @@ search.app:
 
 This sample shows a minimal implementation for a generic Common Data Service virtual entity data provider plug-in, **DropboxRetrieveMultiplePlugin**, for the [Dropbox](https://www.dropbox.com/) file-sharing service. It uses the "bare metal" approach, translating the <xref:Microsoft.Xrm.Sdk.Query.QueryExpression> through the creation of the custom visitor class, **DropBoxExpressionVisitor**. It returns a collection of the files that satisfy the search criteria as an <xref:Microsoft.Xrm.Sdk.EntityCollection>. 
 
+> [!NOTE]
+> This sample requires the use of ILMERGE to combine the plug-in and Dropbox assemblies prior to registering the assembly with Common Data Service. Use of ILMERGE is not officially supported. A future update to this sample will remove the need to use ILMERGE. 
+
 ## Getting started
 
 In order to build this sample, you must first install the [Dropbox.Api](https://www.nuget.org/packages/Dropbox.Api/) and [Microsoft.CrmSdk.Data](https://www.nuget.org/packages/Microsoft.CrmSdk.Data/) NuGet packages in your solution.  You'll also need a DropBox account and pass a real access token when creating an instance of the **DropboxClient**.
@@ -119,4 +122,4 @@ public class DropboxRetrieveMultiplePlugin : IPlugin
 
 [Get started with virtual entities](get-started-ve.md)<br />
 [API considerations of virtual entities](api-considerations-ve.md)<br />
-[Custom virtual entity data providers](custom-ve-data-providers.md)
+[Custom virtual entity data providers](custom-ve-data-providers.md)
diff --git a/powerapps-docs/developer/common-data-service/walkthrough-register-app-azure-active-directory.md b/powerapps-docs/developer/common-data-service/walkthrough-register-app-azure-active-directory.md
@@ -66,8 +66,10 @@ App registration can also be done by an application developer or individual user
 7. Search for and choose **Common Data Service** under the **APIs my organization uses** tab.
     
     ![Select API](media/app-registration-select-api-page.png "Select API")    
-
-8. Click on **Delegated permissions** and check the options and click on **Add permissions**. 
+    > [!TIP]
+    > If you are presented with more than one **Common Data Service** item in the search list, choose any one of them. In the next step the service name and URL will be shown. At that point you can go back to the API search and choose a different Common Data Service list item if needed.
+    
+8.  Click on **Delegated permissions** and check the options and click on **Add permissions**. 
     
     ![Delegate Permissions](media/app-registration-delegate-permissions-page.png "Delegate Permission")
     > [!NOTE]
diff --git a/powerapps-docs/maker/TOC.yml b/powerapps-docs/maker/TOC.yml
@@ -1938,7 +1938,7 @@
   - name: Get a session or app ID
     href: ./canvas-apps/get-sessionid.md
   - name: Troubleshoot startup issues for Power Apps
-    href: troubleshooting-startup-issues.md
+    href: ../troubleshooting-startup-issues.md
   - name: Troubleshoot issues for the Power Apps mobile app
     href: ../user/powerapps_mobile_troubleshoot.md
   - name: Troubleshoot Power Query
diff --git a/powerapps-docs/maker/canvas-apps/controls/control-attachments.md b/powerapps-docs/maker/canvas-apps/controls/control-attachments.md
@@ -23,7 +23,7 @@ The attachment control has these limitations:
 
 1. Upload and delete functionality work only inside a form. The Attachment control appears disabled when in Edit mode and not inside a form. To save file additions and deletions, the app user must save the form. Because of this limitation, the Attachment control isn't available from the **Insert** tab but appears in the form when the Attachment form field is enabled in a SharePoint or Common Data Service form.
 
-1. You can upload files only if they're 10 MB or smaller.  
+1. You can upload files only if they're 50 MB or smaller.  
 
 ## Description
 An **Attachments** control lets you open, add, and delete files from a SharePoint list or a Common Data Service entity.
@@ -33,7 +33,7 @@ An **Attachments** control lets you open, add, and delete files from a SharePoin
 
 **MaxAttachments** – The maximum number of files the control will accept.
 
-**MaxAttachmentSize** – The maximum allowed file size in MB of each new attachment.  Currently there is a limit of 10 MB.
+**MaxAttachmentSize** – The maximum allowed file size in MB of each new attachment.  Currently there is a limit of 50 MB.
 
 **OnAddFile** – How the app responds when the user adds a new file attachment.
 
diff --git a/powerapps-docs/maker/portals/create-portal.md b/powerapps-docs/maker/portals/create-portal.md
@@ -5,7 +5,7 @@ author: neerajnandwana-msft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 09/22/2020
+ms.date: 10/01/2020
 ms.author: nenandw
 ms.reviewer: tapanm
 ---
@@ -76,7 +76,6 @@ To edit the portal in Power Apps portals Studio, see [Edit a portal](manage-exis
 > - If you have provisioned a portal using the older portal add-on, you can still customize and manage it from [make.powerapps.com](https://make.powerapps.com).
 > - Provisioning portals from [make.powerapps.com](https://make.powerapps.com) does not consume the older portal add-ons. Also, these portals are not listed under the **Applications** tab on the **Dynamics 365 Administration Center** page.
 > - A Common Data Service starter portal cannot be created from the **Dynamics 365 Administration Center** page.
-> - Power Apps portals is not available in the France region.
 
 ### Create additional portals in an environment
 
diff --git a/powerapps-docs/maker/troubleshooting-startup-issues.md b/powerapps-docs/maker/troubleshooting-startup-issues.md
@@ -1,19 +1,19 @@
 ---
 title: Troubleshooting startup issues for Power Apps | Microsoft Docs
 description: This troubleshooting guide helps fix common configuration problems that prevent Power Apps from starting.
-author: matthewbolanos
-manager: kvivek
+author: navjotm
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: canvas
-ms.reviewer: 
-ms.date: 08/31/2020
-ms.author: mabolan
+ms.reviewer: tapanm
+ms.date: 10/01/2020
+ms.author: namarwah
 search.audienceType: 
   - maker
 search.app: 
   - PowerApps
 ---
+
 # Troubleshooting startup issues for Power Apps
 
 This troubleshooting article helps fix common configuration problems that prevent Power Apps from starting.
@@ -38,7 +38,7 @@ This troubleshooting article helps fix common configuration problems that preven
 
 - When you receive a “Hmmm … We couldn’t sign you in” error message and identifier that resembles the following image:
 
-    ![Hmmm … We couldn’t sign you in. The information below may be helpful](./media/troubleshooting-startup-issues/error.png "Hmmm … We couldn’t sign you in. The information below may be helpful")
+    ![Hmmm … We couldn’t sign you in. The information below may be helpful](media/troubleshooting-startup-issues/error.png "Hmmm … We couldn’t sign you in. The information below may be helpful")
 
     **Resolution**: Check [Resolutions for common errors](#resolutions-for-common-errors) for different error variations and resolutions.
     
@@ -136,6 +136,8 @@ Power Apps stores some data locally in your browser, including user identity and
         - `https://make.*.powerapps.com`  (the asterisk is part of the address, don't replace it)
         - `https://make.powerapps.com`
         - `https://login.microsoftonline.com`
+        - `https://apps.*.powerapps.com`
+        - `https://apps.powerapps.com`
     
 - **Option 2: Create exceptions to allow local data for Power Apps and associated services**
       
@@ -148,6 +150,8 @@ Power Apps stores some data locally in your browser, including user identity and
         - `https://make.*.powerapps.com`  (the asterisk is part of the address, don't replace it)
         - `https://make.powerapps.com`
         - `https://login.microsoftonline.com`
+        - `https://apps.*.powerapps.com`
+        - `https://apps.powerapps.com`
 
 ## Resolution 2: Configure Trust Zones for Internet Explorer and Microsoft Edge Legacy
 
@@ -166,6 +170,8 @@ Internet Explorer and Microsoft Edge Legacy use *Trust Zones*. Problems can occu
         - `https://make.powerapps.com`
         - `https://make.*.powerapps.com` (the asterisk is part of the address, don't replace it)
         - `https://*.powerapps.com` (the asterisk is part of the address, don't replace it)
+        - `https://apps.*.powerapps.com` (the asterisk is part of the address, don't replace it)
+        - `https://apps.powerapps.com`
     7. Select **Close**.
     8. Select **OK**.
     9. Close all Internet Explorer and Microsoft Edge Legacy windows.
@@ -183,6 +189,8 @@ Internet Explorer and Microsoft Edge Legacy use *Trust Zones*. Problems can occu
         - `https://make.powerapps.com`
         - `https://make.*.powerapps.com` (the asterisk is part of the address, don't replace it)
         - `https://*.powerapps.com` (the asterisk is part of the address, don't replace it)
+        - `https://apps.*.powerapps.com` (the asterisk is part of the address, don't replace it)
+        - `https://apps.powerapps.com`
         - Any other address that ends in **powerapps.com** or **create.powerapps.com**.
   7. Select **Close**.
 
diff --git a/powerapps-docs/teams/manage-your-apps.md b/powerapps-docs/teams/manage-your-apps.md
@@ -1,6 +1,6 @@
 ---
-title: Manage your apps | Microsoft Docs
-description: Learn how to manage your apps using Power Apps app from Teams.
+title: Manage your apps using Power Apps app in Teams | Microsoft Docs
+description: Learn how to manage your apps using Power Apps app in Teams.
 author: tapanm-msft
 ms.service: powerapps
 ms.topic: conceptual
@@ -10,7 +10,7 @@ ms.author: tapanm
 ms.reviewer: 
 ---
 
-# Manage your apps
+# Manage your apps in Teams
 
 [!INCLUDE [cc-beta-prerelease-disclaimer.md](../includes/cc-beta-prerelease-disclaimer.md)]
 
diff --git a/powerapps-docs/teams/publish-and-share-apps.md b/powerapps-docs/teams/publish-and-share-apps.md
@@ -1,6 +1,6 @@
 ---
-title: Publish and share your app | Microsoft Docs
-description: Learn how to publish and share your apps using Power Apps app from Teams.
+title: Publish and share your app using Power Apps app in Teams | Microsoft Docs
+description: Learn how to publish and share your apps using Power Apps app in Teams.
 author: tapanm-msft
 ms.service: powerapps
 ms.topic: conceptual
@@ -10,7 +10,7 @@ ms.author: tapanm
 ms.reviewer: 
 ---
 
-# Publish and share your app
+# Publish and share your app in Teams
 
 [!INCLUDE [cc-beta-prerelease-disclaimer.md](../includes/cc-beta-prerelease-disclaimer.md)]
 
diff --git a/powerapps-docs/troubleshooting-startup-issues.md b/powerapps-docs/troubleshooting-startup-issues.md
