Merge branch 'master' into portals-1855241

Author: tapanm-MSFT

.openpublishing.publish.config.json

@@ -105,16 +105,19 @@
       "Publish",
       "PDF"
     ],
-   "alm-guide": [
+    "alm-guide": [
       "Publish",
       "PDF"
-    ] 
+    ]
   },
   "need_generate_pdf_url_template": true,
   "Targets": {
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
   },
-  "need_generate_intellisense": false
+  "need_generate_intellisense": false,
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
 }

.openpublishing.redirection.json

@@ -0,0 +1,24 @@
+---
+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
+---
+# 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)

app-selector2.png

@@ -27,6 +27,12 @@
       href: use-fetchxml-left-outer-join-query-records-not-in.md
     - name: Page large result sets with FetchXML
       href: org-service/page-large-result-sets-with-fetchxml.md
+    - name: Paging behaviors and ordering
+      href: org-service/paging-behaviors-and-ordering.md
+    - name: Use column comparison in queries
+      href: column-comparison.md
+    - name: FetchXML search item limit
+      href: quick-find-limit.md
   - name: "Use SQL to query data (Preview)"
     href: cds-sql-query.md
   - name: Saved Queries
@@ -302,37 +308,6 @@
     href: best-practices/work-with-metadata/index.md
 - name: Introduction to solutions
   href: introduction-solutions.md
-  items:
-  - name: Dependency tracking for solution components
-    href: dependency-tracking-solution-components.md
-  - name: Removing dependencies
-    href: removing-dependencies.md
-  - name: Maintain managed solutions
-    href: maintain-managed-solutions.md
-  - name: Organize your solutions
-    href: organize-solutions.md
-  - name: Organize your team to develop solutions
-    href: organize-team-develop-solutions.md
-  - name: Use managed properties
-    href: use-managed-properties.md
-  - name: Understand how managed solutions are merged
-    href: understand-managed-solutions-merged.md
-  - name: Create solutions that support multiple languages
-    href: create-solutions-support-multiple-languages.md
-  - name: How to manage solutions
-    items:
-    - name: Create, export, or import an unmanaged solution
-      href: create-export-import-unmanaged-solution.md
-    - name: Uninstall or delete a solution
-      href: uninstall-delete-solution.md
-    - name: Work with solutions
-      href: work-solutions.md
-    - name: Create, install, and update a managed solution
-      href: create-install-update-managed-solution.md
-    - name: Create patches to simplify solution updates
-      href: create-patches-simplify-solution-updates.md
-    - name: When to edit the customizations file
-      href: when-edit-customization-file.md
 - name: Publish and monitor your (ISV) app
   items:
   - name: Publish your app on AppSource

powerapps-docs/chatbots.md

@@ -1,6 +1,6 @@
 ---
 title: "Activity entities (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "In Dynamics 365 (online), activities are tasks that you or your teams perform when they contact customers, for example, sending letters or making telephone calls." # 115-145 characters including spaces. This abstract displays in the search result.
+description: "Activities are tasks that you or your teams perform when they contact customers, for example, sending letters or making telephone calls." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"

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

@@ -63,7 +63,7 @@ Service level agreements (SLAs) in Common Data Service help you define the level
 
 <a name="Limitations"></a>   
 
-## Limitations to applying SLAs in Dynamics 365 (online)  
+## Limitations to applying SLAs  
 
  In Common Data Service, the following limitations are applicable for SLAs per Common Data Service instance (organization):  
 

powerapps-docs/developer/common-data-service/activity-entities.md

@@ -1,7 +1,7 @@
 ---
 title: "Use OAuth with Common Data Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Learn how to authenticate using OAuth with Common Data Service" # 115-145 characters including spaces. This abstract displays in the search result.
-ms.custom: ""
+ms.custom: has-adal-ref
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"
 ms.service: powerapps

powerapps-docs/developer/common-data-service/apply-slas-entities.md

@@ -34,7 +34,7 @@ If you have users and offices around the world, it is important to properly repr
 |Member name and value|Description|  
 |---------------------------|-----------------|  
 |`UserLocal`|-   Stores the date and time value as UTC value in the system.<br />-   The retrieve operation returns the UTC value.<br />-   The update operation converts the UTC value to the current user’s time zone value, and then stores the updated value as is or as the equivalent UTC value depending on the kind ([DateTimeKind](https://msdn.microsoft.com/library/shx7s921.aspx)) of the value specified for update. If the specified value is of UTC kind, it’s stored as is. Otherwise, the UTC-equivalent value is stored.<br />-   Retrieving the formatted value converts from UTC to the user’s current time zone based on the time zone and locale setting of the user.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior is used for system attributes like `CreatedOn` and `ModifiedOn`, and cannot be changed. You should use this behavior for custom attributes where you want to store date and time values with the time zone information.|  
-|`DateOnly`|-   Stores the actual date value with the time value as 12:00 AM (00:00:00) in the system.<br />-   For the retrieve and update operations, no time zone conversion is performed, and the time value is always 12 AM (00:00:00).<br />-   Retrieving the formatted value displays the date value without any time zone conversion.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior should be used for custom attributes that store birthdays and anniversaries, where the time information is not required.|  
+|`DateOnly`|-   Stores the actual date value with no time value.<br />-   Retrieving the formatted value displays the date value.<br />-   For the Web API, the attribute is exposed as Date.<br />-   This behavior should be used for custom attributes that store birthdays and anniversaries, where the time information is not required.|  
 |`TimeZoneIndependent`|-   Stores the actual date and time values in the system regardless of the user time zone.<br />-   For the retrieve and update operations, no time zone conversion is performed, and actual date and time values are returned and updated respectively in the system regardless of the user time zone.<br />-   Retrieving the formatted value displays the date and time value (without any time zone conversion) based on the format as specified by the current user’s time zone and locale setting.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior should be used for attributes that store information such as check in and check out time for hotels.|  
 
  The following sample code demonstrates how to set a `UserLocal` behavior for a new date time attribute:  

powerapps-docs/developer/common-data-service/authenticate-oauth.md

@@ -31,7 +31,7 @@ search.app:
 
 ## Symptoms
 
-Due to their long-running nature, using <xref:Microsoft.Xrm.Sdk.Messages.ExecuteMultipleRequest> or <xref:Microsoft.Xrm.Sdk.Messages.ExecuteTransactionRequest> message request classes within the context of a plug-in or workflow activity expose sandbox-isolated plug-in types to the two-minute (12000ms) channel timeout exception and can degrade the user experience for synchronous registrations.
+Due to their long-running nature, using <xref:Microsoft.Xrm.Sdk.Messages.ExecuteMultipleRequest> or <xref:Microsoft.Xrm.Sdk.Messages.ExecuteTransactionRequest> message request classes within the context of a plug-in or workflow activity expose sandbox-isolated plug-in types to the two-minute (120000ms) channel timeout exception and can degrade the user experience for synchronous registrations.
 
 
 <a name='guidance'></a>