Merge branch 'master' into pehecke-migrate-orgservice

Author: phecke

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

@@ -79,7 +79,7 @@
       href: write-plug-in.md
     - name: Handle exceptions
       href: handle-exceptions.md
-    - name: Inpersonate a user
+    - name: Impersonate a user
       href: impersonate-a-user.md
     - name: Register a plug-in
       href: register-plug-in.md

powerapps-docs/developer/common-data-service/troubleshoot-plug-in.md

@@ -2,7 +2,7 @@
 title: "Troubleshoot plug-ins (Common Data Service for Apps) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Contains information on errors that can occur due to plug-ins and how to fix them." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 04/21/2019
+ms.date: 04/26/2019
 ms.reviewer: ""
 ms.service: "powerapps"
 ms.topic: "article"
@@ -25,7 +25,9 @@ Error Code: `-2147220911`<br />
 Error Message: `There is no active transaction. This error is usually caused by custom plug-ins that ignore errors from service calls and continue processing.`
 
 This can be a difficult error to address because the cause can be in someone else's code. To understand the message, you need to appreciate that any time an error related to a data operation occurs within a synchronous plug-in the transaction for the entire operation will be ended.
-[Scalable Customization Design in Common Data Service](scalable-customization-design/overview.md)
+
+More information: [Scalable Customization Design in Common Data Service](scalable-customization-design/overview.md)
+
 The most common cause is simply that a developer might believe they can attempt to perform an operation that *might* succeed so they wrap that operation in a try/catch block and attempt to swallow the error if it fails.
 
 While this may work for a client application, within the execution of a plug-in any data operation failure will result in rolling back the entire transaction. You can't swallow the error, so you must make sure to always return an <xref:Microsoft.Xrm.Sdk.InvalidPluginExecutionException>.
@@ -67,4 +69,4 @@ You can register the plug-in to run in the context of a user known to have the c
 
 <!-- But if you prefer that the logic in your plug-in adapt to the privileges that the calling user has, you really need to verify the user's privileges in your code.
 
-TODO: Add content that shows how to do this -->
+TODO: Add content that shows how to do this -->

powerapps-docs/developer/common-data-service/webapi/discover-url-organization-web-api.md

@@ -35,7 +35,7 @@ In addition to datacenter specific Discovery services, that are available on the
 > [!NOTE]
 > It is recommended that users switch from the legacy regional discovery service (`https://disco.crm.dynamics.com`) to global discovery service (`https://globaldisco.crm.dynamics.com`).
 > 
-> For Dynamics 365 US Government users, the global discovery service is available only for the **GCC** users and the URL is `https://globaldisco.crm9.dynamics.com`. More information: [Dynamics 365 Government URLs](https://docs.microsoft.com/dynamics365/customer-engagement/admin/government/microsoft-dynamics-365-government#dynamics-365-us-government-urls).
+> For Dynamics 365 US Government users, the global discovery service is available for the **GCC** and **GCC High** users, and the URL is different from the regular global discovery service URL. More information: [Dynamics 365 Government URLs](https://docs.microsoft.com/dynamics365/customer-engagement/admin/government/microsoft-dynamics-365-government#dynamics-365-us-government-urls).
 
 
 ## Information provided by the Discovery service 

powerapps-docs/developer/common-data-service/write-listener-application-azure-solution.md

@@ -22,8 +22,6 @@ search.app:
 
 # Write a listener application for a Azure solution
 
-<!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/write-listener-application-azure-solution -->
-
 This topic describes how to write an Azure solution  listener application that can read and process Dynamics 365 (online) Common Data Service messages that are posted to the Azure Service Bus. As a prerequisite, you should familiarize yourself with how to write a Azure Service Bus listener before trying to learn the specifics of a Dynamics 365 listener. For more information, see the [Azure Service Bus documentation](https://azure.microsoft.com/en-us/documentation/services/service-bus/).  
 
 <a name="bkmk_writequeued"></a>
@@ -42,7 +40,7 @@ A *topic* is similar to a queue but implements a publish/subscribe model. One or
 > [!IMPORTANT]
 >  To use these queue or topic contracts, you must write your listener applications using the [Azure SDK](http://azure.microsoft.com/downloads/archive-net-downloads/) version 1.7 or higher.  
   
-Use of queues and topics in your multi-system software design can result in the decoupling of systems. If the listener application ever becomes unavailable, the message delivery from Dynamics 365 will still succeed and the listener application can continue processing the queue message when it is back online. [!INCLUDEMore information [Queues, Topics, and Subscriptions](https://docs.microsoft.com/azure/service-bus-messaging/service-bus-queues-topics-subscriptions)  
+Use of queues and topics in your multi-system software design can result in the decoupling of systems. If the listener application ever becomes unavailable, the message delivery from Dynamics 365 will still succeed and the listener application can continue processing the queue message when it is back online. More information: [Queues, Topics, and Subscriptions](https://docs.microsoft.com/azure/service-bus-messaging/service-bus-queues-topics-subscriptions)  
 
 <a name="bkmk_writeoneway"></a>
 
@@ -143,4 +141,4 @@ else if (receivedMessage.ContentType = "application/xml")
  [Sample: Two-way Listener](org-service/samples/two-way-listener.md)   
  [Sample: REST Listener](org-service/samples/rest-listener.md)   
  [Send Dynamics 365 Data over the Azure Service Bus](work-data-azure-solution.md)   
- [Work with Dynamics 365 event data in your Azure Event Hub solution](work-event-data-azure-event-hub-solution.md)
+ [Work with Dynamics 365 event data in your Azure Event Hub solution](work-event-data-azure-event-hub-solution.md)

powerapps-docs/developer/component-framework/manifest-schema-reference/code.md

@@ -18,6 +18,8 @@ ms.assetid: 44d9fcfb-0cd8-48cc-aace-dd589099dd79
 
 # code element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [code-description](includes/code-description.md)]
 
 ## Attributes

powerapps-docs/developer/component-framework/manifest-schema-reference/control.md

@@ -17,6 +17,8 @@ ms.assetid: 4dacd337-c9df-458e-86f3-bfb3ab543ea7
 
 # control element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [control-description](includes/control-description.md)]
 
 ## Attributes

powerapps-docs/developer/component-framework/manifest-schema-reference/css.md

@@ -17,6 +17,8 @@ ms.assetid: b6119424-c0a4-4412-b25c-8239da6cbe36
 
 # css element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [css-description](includes/css-description.md)]
 
 ## Attributes

powerapps-docs/developer/component-framework/manifest-schema-reference/data-set.md

@@ -17,6 +17,8 @@ ms.assetid: 9ffe8930-b290-4252-98d4-a1195b00205f
 
 # data-set element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [data-set-description](includes/data-set-description.md)]
 
 ## Attributes

powerapps-docs/developer/component-framework/manifest-schema-reference/html.md

@@ -18,6 +18,8 @@ ms.assetid: dcb8e71d-9a2f-4789-9a84-34673ccfd5c1
 
 # html element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [html-description](includes/html-description.md)]
 
 ## Attributes

powerapps-docs/developer/component-framework/manifest-schema-reference/img.md

@@ -17,6 +17,8 @@ ms.assetid: 0e776647-a4a2-42c9-85e8-62718154052f
 
 # img element
 
+[!INCLUDE[cc-beta-prerelease-disclaimer](../../../includes/cc-beta-prerelease-disclaimer.md)]
+
 [!INCLUDE [img-description](includes/img-description.md)]
 
 ## Attributes