Merge branch 'live' into pr-avoid-window-top

Author: Nkrb

powerapps-docs/chatbots.md

@@ -0,0 +1,25 @@
+---
+title: Create chatbots from Power Apps | Microsoft Docs
+description: Provides information about how you can use AI Builder in Power Apps.
+author: iaanw
+ms.service: powerapps
+ms.topic: conceptual
+ms.custom: 
+ms.date: 06/26/2020
+ms.author: iawilt
+ms.reviewer: mvakoc
+ms.custom: pva, power-apps
+---
+# Create chatbots from Power Apps
+
+Power Virtual Agents allows you to quickly create and maintain intelligent chatbots using a no-code interface. App makers can create and manage their chatbots directly from [Power Apps](https://make.powerapps.com). 
+
+![Chatbots from Power Apps](media/chatbots.png "Chatbots from Power Apps")
+
+You can create and manage your chatbots using the **Chatbots** option in the left navigation pane.
+
+- To create a chatbot, select **Chatbots**, then **Create**, and then select **New chatbot**. This will take you directly to the Power Virtual Agents portal where you can create your chatbot. For more information, see [Create a bot in Power Virtual Agents](https://docs.microsoft.com/power-virtual-agents/authoring-first-bot)
+
+- After you have chatbots in your environment, you'll be able to view them by selecting **Chatbots** and then **List**. You can navigate directly to the Power Virtual Agents portal to update your bot or view analytics.
+
+More information: [Power Virtual Agents docs](https://docs.microsoft.com/power-virtual-agents)

powerapps-docs/developer/common-data-service/best-practices/business-logic/optimize-assembly-development.md

@@ -4,8 +4,8 @@ description: "Consider merging separate plug-ins/custom workflow activities into
 services: ''
 suite: powerapps
 documentationcenter: na
-author: jowells
-manager: austinj
+author: JimDaly
+manager: sunilg
 editor: ''
 tags: ''
 ms.service: powerapps
@@ -14,7 +14,7 @@ ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: na
 ms.date: 1/15/2019
-ms.author: jowells
+ms.author: phecke
 search.audienceType: 
   - developer
 search.app: 
@@ -33,26 +33,30 @@ search.app:
 
 When developing custom assemblies, there are a couple of considerations to take in:
 
+1. Assemblies with a large number of custom workflow activities can take a long time to upload when being registered.
 1. Multiple different custom assemblies
     - Increased maintainability complexity
     - Potential increase plug-in execution length
+1. Sandbox assembly size constraint is 16 MB in Common Data Service.
 
-2. Sandbox assembly size constraint is 16 MB in Common Data Service.
 
 <a name='guidance'></a>
 
 ## Guidance
 
-> [!NOTE]
-> Further Guidance clarification is under development regarding specific details in optimizing assembly development, such as, how to merge separate plug-ins into a single custom assembly and suggestions to minimize the assembly size.
+### Limit the number of Custom Workflow Activities in a Single assembly
+
+When an assembly that contains custom workflow activities is uploaded during plug-in registration, additional checks are required for custom workflow activities.
+
+While an assembly with hundreds of ordinary plug-in types may be uploaded very quickly, an assembly with more than 100 custom workflow activities may take several minutes or even time out when being registered or updated. We recommend including no more than 50 custom workflow activities in a single assembly.
 
 ### Consolidate Plug-ins or Custom Workflow Activities into a Single Assembly
 
 Plug-ins and custom workflow activities developed for a Common Data Service solution should exist with others in a single Visual Studio project. Consider merging separate plug-ins/custom workflow activities into a single Visual Studio project/assembly unless the plug-ins fall into the following exceptions:
 
 1. A plug-in/custom workflow activity needs to be selectively deployed to one environment but not to others.
-
-2. The physical assembly size is near or greater than 16 MB for a Common Data Service instance.
+1. The physical assembly size is near or greater than 16 MB for a Common Data Service instance.
+1. There will be more than 50 custom workflow activities in the assembly, as mentioned in [Limit the number of Custom Workflow Activities in a Single assembly](#limit-the-number-of-custom-workflow-activities-in-a-single-assembly)
 
 
 ### Move Plug-ins/Custom Workflow Activities into Multiple Assemblies
@@ -63,7 +67,12 @@ Power Apps and Dynamics 365 (online) has an assembly size constraint of 16 MB wh
 
 ## Problematic patterns
 
+### Assemblies take a long time to upload when being registered
+
+When a custom workflow activity type plug-in is uploaded while being registered, each type requires additional validation checking. When an assembly contains more than a hundred custom workflow activity type plug-ins, it could require several minutes to complete the checks and is at risk of timing out.
+
 ### Multiple assemblies
+
 Having multiple assemblies has a couple of areas that can be impacted:
 
 1. Performance - each assembly has a lifecycle that is managed by Common Data Service.  This includes loading, caching, and unloading the assemblies.  Having more than one assembly causes more work to be done on the server, loading and caching an assembly, and could affect the overall plug-in/custom workflow activity execution length.

powerapps-docs/developer/common-data-service/best-practices/work-with-data/index.md

@@ -31,4 +31,4 @@ This list below contains all of the best practices and guidance around integrati
 |[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
 
 ### See Also
-[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />

powerapps-docs/developer/common-data-service/define-alternate-keys-entity.md

@@ -2,7 +2,7 @@
 title: "Work with alternate keys (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "The topic explains about how to create alternate keys for an entity. Alternate keys can be created programmatically or by using the customization tools" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 03/16/2020
+ms.date: 06/24/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -54,7 +54,7 @@ You should be aware of the following constraints when creating alternate keys:
 
 - **Unicode characters in key value**
 
-  If the data within a field that is used in an alternate key will contain one of the following characters `/`,`<`,`>`,`*`,`%`,`&`,`:`,`\\` then get or patch actions will not work.  If you only need uniqueness then this approach will work, but if you need to use these keys as part of data integration then it is best to create the key on fields that won't have data with those characters.
+  If the data within a field that is used in an alternate key will contain one of the following characters `/`,`<`,`>`,`*`,`%`,`&`,`:`,`\\` then update or upsert (PATCH) actions will not work.  If you only need uniqueness then this approach will work, but if you need to use these keys as part of data integration then it is best to create the key on fields that won't have data with those characters.
 
 <a name="BKMK_crud"></a>   
 

powerapps-docs/developer/common-data-service/upload-manage-document-templates.md

@@ -1,8 +1,8 @@
 ---
-title: "<Topic Title> (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "<Description>" # 115-145 characters including spaces. This abstract displays in the search result.
+title: "Upload and manage document templates (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "In Common Data Service, the *template* entities help you create consistent layout and content in email messages, articles, mail merge documents, and Microsoft Office documents (Excel and Word)."
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 06/19/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -33,4 +33,4 @@ These are the types of template entites:
 - [KbArticleTemplate](reference/entities/kbarticletemplate.md) 
 - [MailMergeTemplate](reference/entities/mailmergetemplate.md) 
 - [PersonalDocumentTemplate](reference/entities/personaldocumenttemplate.md) 
-- [Template](reference/entities/template.md) 
+- [Template](reference/entities/template.md) 

powerapps-docs/developer/common-data-service/virtual-entities/api-considerations-ve.md

@@ -1,15 +1,15 @@
 ---
 title: "API considerations of virtual entities (Common Data Service) | Microsoft Docs"
 description: "Describes API considerations of virtual entities"
-ms.date: 10/31/2018
+ms.date: 06/24/2020
 ms.service: powerapps
 ms.topic: "article"
 applies_to: 
   - "Dynamics 365 (online)"
 ms.assetid: d329dade-16c5-46e9-8dec-4b8efb996dea
-author: "mayadumesh" # GitHub ID
-ms.author: "jdaly"
-manager: "annbe"
+author: "Sunil-Garg" # GitHub ID
+ms.author: "pehecke"
+manager: "ryjones"
 search.audienceType: 
   - developer
 search.app: 

powerapps-docs/developer/common-data-service/virtual-entities/custom-ve-data-providers.md

@@ -1,15 +1,15 @@
 ---
 title: "Custom virtual entity data providers (Common Data Service) | Microsoft Docs"
 description: "Using the Common Data Service Data SDK, .NET Developers have the option of creating custom virtual entity data providers to help integrate external data source types that are not supported by an existing data provider."
-ms.date: 09/05/2019
+ms.date: 06/24/2020
 ms.service: powerapps
 ms.topic: "article"
 applies_to: 
   - "Dynamics 365 (online)"
 ms.assetid: d329dade-16c5-46e9-8dec-4b8efb996d22
-author: "mayadumesh" # GitHub ID
-ms.author: "jdaly"
-manager: "annbe"
+author: "Sunil-Garg" # GitHub ID
+ms.author: "pehecke"
+manager: "ryjones"
 search.audienceType: 
   - developer
 search.app: 

powerapps-docs/developer/common-data-service/virtual-entities/get-started-ve.md

@@ -1,15 +1,15 @@
 ---
 title: "Get started with virtual entities (Common Data Service) | Microsoft Docs"
 description: "Virtual entities enable the integration of data residing in external systems by seamlessly representing that data as entities in Common Data Service, without replication of data and often without custom coding."
-ms.date: 10/31/2018
+ms.date: 06/24/2020
 ms.service: powerapps
 ms.topic: "get-started-article"
 applies_to: 
   - "Dynamics 365 (online)"
 ms.assetid: 14c5fbbc-98db-4e49-b245-2c84c1cd11cd
-author: "mayadumesh" # GitHub ID
-ms.author: "jdaly"
-manager: "annbe"
+author: "Sunil-Garg" # GitHub ID
+ms.author: "pehecke"
+manager: "ryjones"
 search.audienceType: 
   - developer
 search.app: 

powerapps-docs/developer/common-data-service/virtual-entities/sample-generic-ve-plugin.md

@@ -2,7 +2,7 @@
 title: "Sample: Generic virtual entity data provider plug-in (Common Data Service) | Microsoft Docs"
 description: "Sample demonstrates how to implement a generic custom Dynamics 365 virtual entity plug-in."
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 06/24/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.suite: ""
@@ -11,9 +11,9 @@ ms.topic: "samples"
 applies_to: 
   - "Dynamics 365 (online)"
 ms.assetid: d329dade-16c5-46e9-8dec-4b8efb996d24
-author: "mayadumesh" # GitHub ID
-ms.author: "jdaly"
-manager: "annbe"
+author: "Sunil-Garg" # GitHub ID
+ms.author: "pehecke"
+manager: "ryjones"
 search.audienceType: 
   - developer
 search.app: