Merge branch 'master' into Nava_gitissues

Author: Nkrb

.openpublishing.redirection.json

@@ -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

@@ -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

@@ -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

@@ -177,7 +177,7 @@ Some entities will have different sets of options.
 **Example**: `PhoneCall` entity `StateCode` and `StatusCode` options
 
 
-|`StateCode`|`StatusCode`|
+|StateCode|StatusCode|
 |---------|---------|
 |0 : Open|1: Open|
 |1 : Completed|2: Made <br />4: Received|