Merge branch 'rtw-post-ga' of https://github.com/MicrosoftDocs/powerapps-docs-pr into rtw-post-ga

Author: v-jogha

.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

@@ -8,7 +8,6 @@ ms.custom:
 ms.date: 06/26/2020
 ms.author: iawilt
 ms.reviewer: mvakoc
-ms.custom: pva, power-apps
 ---
 # Create chatbots from Power Apps
 

powerapps-docs/chatbots.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>

powerapps-docs/developer/common-data-service/best-practices/business-logic/avoid-batch-requests-plugin.md

@@ -32,7 +32,7 @@ S2S authentication means you don’t need to use a paid Power Apps user license
 |   Scenario    |   Description  |
 |---------------|---------------|
 | Multi-Tenant  | This is the most common scenario and the one which is used for apps distributed using Microsoft AppSource.<br /><br /> Each Common Data Service tenant is associated with an Azure AD tenant. Your web application or service is registered with your Azure AD tenant.<br /><br /> In this scenario any Common Data Service tenant can potentially use your multi-tenant application after they grant consent for the application to access data in their tenant.                                                           |
-| Single-Tenant | This scenario typically applies to Common Data Service environments that want to develop apps for their own tenant and don’t intend to distribute them to other [Common Data Service environments.<br /><br /> An enterprise can create a web application or service to connect to all the Common Data Service environments for their tenant.<br /><br /> In this scenario, your web application or service will only be able to connect to Common Data Service environments using the same Azure AD tenant. |
+| Single-Tenant | This scenario typically applies to Common Data Service environments that want to develop apps for their own tenant and don’t intend to distribute them to other Common Data Service environments.<br /><br /> An enterprise can create a web application or service to connect to all the Common Data Service environments for their tenant.<br /><br /> In this scenario, your web application or service will only be able to connect to Common Data Service environments using the same Azure AD tenant. |
 
  Both scenarios have common elements but there are some differences. Since multi-tenant is the most common scenario, the [Use Multi-Tenant Server-to-server authentication](use-multi-tenant-server-server-authentication.md) content describes how you can use S2S in this scenario and include notes where the options for single-tenant configuration is different. 
 

powerapps-docs/developer/common-data-service/build-web-applications-server-server-s2s-authentication.md

@@ -39,7 +39,7 @@ There are three levels where auditing can be configured: organization, entity, a
 
  The following table lists the non-customizable entities that cannot be audited. This table was obtained by testing for a `CanModifyAuditSettings` attribute value of `false` on each entity’s metadata.  
 
-||  
+|Non-customizable entities|  
 |-|  
 |ActivityPointer|  
 |Annotation|  

powerapps-docs/developer/common-data-service/configure-entities-attributes-auditing.md

@@ -70,6 +70,10 @@ The `CascadeConfiguration` (<xref:Microsoft.Xrm.Sdk.Metadata.CascadeConfiguratio
 > deactivated when the reassignment occurs. The new owner of the record will need to reactivate the workflow or business rule 
 > if they want to continue using it.
 
+
+> [!NOTE]
+> When performing a merge between two custom entities, DateTime values will not merge. The DateTime of the target record will remain unchanged.
+
 <a name="BKMK_ReparentAction"></a>   
 ### About the reparent action  
  The reparent action is very similar to the share action except that it deals with the inherited read access rights instead of explicit read access rights. The reparent action is when you change the value of the referencing attribute in a parental relationship. When a reparent action occurs, the desired scope of the inherited read access rights for related entities might change. The cascade actions related to the reparent action refer to changes to read access rights for the entity record and any entity records related to it.  

powerapps-docs/developer/common-data-service/configure-entity-relationship-cascading-behavior.md

@@ -44,7 +44,7 @@ A package lets you bundle and deploy multiple files related to your app at once.
 
     ```xml
     <?xml version="1.0" encoding="utf-8"?>
-    <Types xmlns="https://schemas.openxmlformats.org/package/2006/content-types">
+    <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
       <Default Extension="xml" ContentType="application/octet-stream" />
       <Default Extension="xaml" ContentType="application/octet-stream" />
       <Default Extension="dll" ContentType="application/octet-stream" />

powerapps-docs/developer/common-data-service/create-package-app-appsource.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: 06/24/2020
+ms.date: 08/01/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -23,7 +23,7 @@ All Common Data Service records have unique identifiers defined as GUIDs. These
 
 ## Create alternate keys  
 
-You can create alternate keys programmatically or by using the customizations tools. For more information about using the customization tools, see [Define alternate keys to reference CRM records](https://technet.microsoft.com/library/29e53691-0b18-4fde-a1d0-7490aa227898.aspx).  
+You can create alternate keys programmatically or by using the customizations tools. For more information about using the customization tools, see [Define alternate keys using Power Apps portal](../../maker/common-data-service/define-alternate-keys-portal.md).
 
 To define alternate keys programmatically, you first have to create an object of type <xref:Microsoft.Xrm.Sdk.Metadata.EntityKeyMetadata> (or use <xref href="Microsoft.Dynamics.CRM.EntityKeyMetadata?text=EntityKeyMetadata EntityType" /> if working with Web API). This class contains the key attributes. Once the key attributes are set, you can use `CreateEntityKey` to create the keys for an entity. This message takes the entity name and `EntityKeyMetadata` values as input to create the key.  
 
@@ -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 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.
+  If the data within a field that is used in an alternate key will contain one of the following characters `/`,`<`,`>`,`*`,`%`,`&`,`:`,`\\`,`?` then retrieve (`GET`), 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/define-alternate-keys-entity.md

@@ -124,11 +124,11 @@ This property can have the following values set:
 |Name|Value|UI Label|Description|
 |--|--|--|--|
 |`None`|0|**Optional**|No requirements are specified.|
-|`SystemRequired`|1|**System Required**|The attribute is required to have a value.|
-|`ApplicationRequired`|2|**Business Required**|The attribute is required by the business to have a value.|
+|`SystemRequired`|1|**System Required**|The data service requires the attribute to have a value.|
+|`ApplicationRequired`|2|**Business Required**|The application requires the attribute to have a value.|
 |`Recommended`|3|**Business Recommended**|It is recommended that the attribute has a value.|
 
-Common Data Service only enforces the `SystemRequired` option for attributes created by the system. Custom attributes cannot be set to use the `SystemRequired` option. 
+Common Data Service only enforces the `SystemRequired` option for attributes created by the system. Custom attributes cannot be set to use the `SystemRequired` option. The data service does not return an error when an attribute with `ApplicationRequired` applied does not have a value.
 
 Model-driven apps will enforce the `ApplicationRequired` option and use a different presentation for the `Recommended` option. Creators of custom clients may use this information to require similar validation or presentation options.