Merge pull request MicrosoftDocs#1708 from MicrosoftDocs/repo_sync_working_branch

KumarVivek · web-flow · commit 18ae21c820b3 · 2019-06-21T11:21:39.000-07:00
Resolve syncing conflicts from repo_sync_working_branch to master
diff --git a/powerapps-docs/developer/common-data-service/developer-tools.md b/powerapps-docs/developer/common-data-service/developer-tools.md
@@ -26,7 +26,7 @@ The following tools are distributed in NuGet packages. The [Developer Guide: Dow
 
 |Tool  |Description  |
 |---------|---------|
-|Code generation tool `CrmSvcUtil.exe`|A command-line code generation tool that generates early-bound .NET Framework classes that represent the entity data model used by the organization service. <br />More information: <br />[Organization Service](work-with-data-cds.md#organization-service)<br />[Create early bound entity classes with the code generation tool ](/dynamics365/customer-engagement/developer/org-service/create-early-bound-entity-classes-code-generation-tool)|
+|Code generation tool `CrmSvcUtil.exe`|A command-line code generation tool that generates early-bound .NET Framework classes that represent the entity data model used by the organization service. <br />More information: <br />[Organization Service](work-with-data-cds.md#organization-service)<br />[Create early bound entity classes with the code generation tool](/dynamics365/customer-engagement/developer/org-service/create-early-bound-entity-classes-code-generation-tool)|
 |Configuration Migration tool `DataMigrationUtility.exe`|Used to move configuration data across environments. Configuration data is used to define custom functionality  and is typically stored in custom entities. This tool is not designed to move business data. <br /> More information: [Common Data Service Administrator Guide: Move configuration data across instances and organizations with the Configuration Migration tool](/dynamics365/customer-engagement/admin/manage-configuration-data)|
 |Package Deployer `PackageDeployer.exe`|Used to deploy packages on Common Data Service instances. A package is an installable unit that includes solutions. <br /> More information: <br />[Deploy Solution Packages](introduction-solutions.md#deploy-solution-packages)<br />[Create packages for the Common Data Service Package Deployer](/dynamics365/customer-engagement/developer/create-packages-package-deployer)|
 |Plug-in Registration Tool `PluginRegistration.exe`|A tool used to subscribe .NET assembly plug-in classes to server events. <br />More information: <br />[Create a plug-in](apply-business-logic-with-code.md#create-a-plug-in)<br />[Register a plug-in](register-plug-in.md)|
diff --git a/powerapps-docs/developer/common-data-service/entity-attribute-metadata.md b/powerapps-docs/developer/common-data-service/entity-attribute-metadata.md
@@ -82,8 +82,8 @@ In the following table:
 |Collection|`CalendarRulesType`|No|Contains a collection of `CalendarRules` entity records.<br />There are no attributes that use this type. When generating a proxy, the code generation tool will create two simulated attributes that are not present in the metadata. These attributes represent a view of the calendar rules records associated in a one-to-many relationship to the entity record.|
 |Collection|`PartyListType`|No|Contains a collection of `ActivityParty` entity records.<br />More information: [ActivityParty entity](reference/entities/activityparty.md)|
 |Date and Time|`DateTimeType`<br />[DateTimeAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.datetimeattributemetadata)|Yes<br />**Date and Time**|Contains a date and time value.<br />All date and time attributes support values as early as 1/1/1753 12:00 AM.|
-|Image|`ImageType`<br />[ImageAttributeMetadata]()|Yes<br />**Image**|Contains data to support retrieving image data for an entity record.<br />More information: [Entity Images](entity-metadata.md#entity-images)|
-|Managed Property|`ManagedPropertyType`<br />[ManagedPropertyAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.imageattributemetadata)|No|Contains data that describe whether the solution component stored in the entity record can be customized when included in a managed solution.<br />More information: [Managed Properties](introduction-solutions.md#managed-properties)|
+|Image|`ImageType`<br />[ImageAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.imageattributemetadata)|Yes<br />**Image**|Contains data to support retrieving image data for an entity record.<br />More information: [Entity Images](entity-metadata.md#entity-images)|
+|Managed Property|`ManagedPropertyType`<br />[ManagedPropertyAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.managedpropertyattributemetadata)|No|Contains data that describe whether the solution component stored in the entity record can be customized when included in a managed solution.<br />More information: [Managed Properties](introduction-solutions.md#managed-properties)|
 |Quantity|`BigIntType`<br />[BigIntAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.bigintattributemetadata)|No|Contains a `BigInt` value. For internal use only.|
 |Quantity|`DecimalType`<br />[DecimalAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.decimalattributemetadata)|Yes<br />**Decimal Number**|Contains a `Decimal` value. The `Precision` property sets the level of precision.|
 |Quantity|`DoubleType`<br />[DoubleAttributeMetadata](/dotnet/api/microsoft.xrm.sdk.metadata.doubleattributemetadata)|Yes<br />**Floating Point Number**|Contains a `Double` value. The `Precision` property sets the level of precision.|
diff --git a/powerapps-docs/developer/common-data-service/org-service/generate-early-bound-classes.md b/powerapps-docs/developer/common-data-service/org-service/generate-early-bound-classes.md
@@ -37,7 +37,7 @@ The classes created by the code generation tool are designed to be built into a
 The following lists assemblies that must be referenced in your project when you use the generated code file.  
 
 - `Microsoft.Crm.Sdk.Proxy.dll`  
-- `Microsoft.Xrm.Sdk.dll ` 
+- `Microsoft.Xrm.Sdk.dll` 
 
 These assemblies are part of the [Microsoft.CrmSdk.CoreAssemblies](https://www.nuget.org/packages/Microsoft.CrmSdk.CoreAssemblies/) NuGet package. Use this Nuget packages to add these assemblies to your Visual Studio project.
 
diff --git a/powerapps-docs/developer/common-data-service/tutorial-write-plug-in.md b/powerapps-docs/developer/common-data-service/tutorial-write-plug-in.md
@@ -209,7 +209,7 @@ In Visual Studio, press **F6** to build the assembly. Verify that it compiles wi
 1. Click **OK** to close the **Create Strong Name Key** dialog.
 1. In the project properties **Build** tab, verify that the **Configuration** is set to **Debug**.
 1. Press **F6** to build the plug-in again.
-1. Using windows explorer, find the built plug-in at:` \bin\Debug\BasicPlugin.dll`.
+1. Using windows explorer, find the built plug-in at: `\bin\Debug\BasicPlugin.dll`.
 
 > [!NOTE]
 > Build the assembly using **Debug** configuration because you will use the Plug-in profiler to debug it in a later tutorial.   Before you include a plug-in with your solution, you should build it using the release configuration.
diff --git a/powerapps-docs/developer/common-data-service/use-change-tracking-synchronize-data-external-systems.md b/powerapps-docs/developer/common-data-service/use-change-tracking-synchronize-data-external-systems.md
@@ -22,7 +22,7 @@ The change tracking feature in Common Data Service provides a way to keep the da
 <a name="BKMK_enable"></a>   
 ## Enable change tracking for an entity  
 
- Before retrieving the changes for an entity, make sure that the change tracking feature is enabled for that entity. This feature can be enabled by using the customization user interface (UI) or programmatically by setting the <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.ChangeTrackingEnabled> property to `True`. Annotation `Org.OData.Capabilities.V1.ChangeTracking ` gets added to entity sets that have change tracking enabled. To see annotations in entity metadata, do 
+ Before retrieving the changes for an entity, make sure that the change tracking feature is enabled for that entity. This feature can be enabled by using the customization user interface (UI) or programmatically by setting the <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.ChangeTrackingEnabled> property to `True`. Annotation `Org.OData.Capabilities.V1.ChangeTracking` gets added to entity sets that have change tracking enabled. To see annotations in entity metadata, do 
 
  ```http 
  GET [Organization URI]/api/data/v9.0/$metadata?annotations=true
diff --git a/powerapps-docs/developer/common-data-service/walkthrough-configure-azure-sas-integration.md b/powerapps-docs/developer/common-data-service/walkthrough-configure-azure-sas-integration.md
@@ -48,7 +48,7 @@ This walkthrough guides you through configuring the Azure Service Bus issuer, sc
   
 ## Create a service endpoint
 
-A [ServiceEndpoint Entity ](reference/entities/serviceendpoint.md) contains configuration data that is required for external messaging with a Azure Service Bus solution endpoint. By using the Plug-in Registration Tool, you can easily create a service endpoint entity in a Common Data Service organization and configure  the service bus endpoint issuer, scope, and rules. D:\GitHub\power-apps\powerapps-docs-pr\powerapps-docs\developer\common-data-service\reference\entities\serviceendpoint.md
+A [ServiceEndpoint Entity](reference/entities/serviceendpoint.md) contains configuration data that is required for external messaging with a Azure Service Bus solution endpoint. By using the Plug-in Registration Tool, you can easily create a service endpoint entity in a Common Data Service organization and configure  the service bus endpoint issuer, scope, and rules.
   
 ### Register a Service Endpoint  
   
diff --git a/powerapps-docs/developer/common-data-service/workflow/workflow-extensions.md b/powerapps-docs/developer/common-data-service/workflow/workflow-extensions.md
@@ -103,7 +103,7 @@ More information: [Install Visual Studio 2017](/visualstudio/install/install-vis
 
 ## Create a custom workflow activity assembly
 
-These are general steps used to create a custom workflow activity using Visual Studio. For a complete step-by-step example see [Tutorial: Create workflow extension ](tutorial-create-workflow-extension.md).
+These are general steps used to create a custom workflow activity using Visual Studio. For a complete step-by-step example see [Tutorial: Create workflow extension](tutorial-create-workflow-extension.md).
 
 1. Create a Workflow Activity Library project using .NET Framework 4.6.2 as the target framework
 1. Delete the Activity1.xaml file generated with the project
diff --git a/powerapps-docs/developer/model-driven-apps/create-manage-model-driven-apps-using-code.md b/powerapps-docs/developer/model-driven-apps/create-manage-model-driven-apps-using-code.md
@@ -225,8 +225,9 @@ Accept: application/json
 
 To disassociate a security role from a Model-driven app, you use the DELETE request with the same navigation property. For example:
 
-`DELETE	[Organization URI]/api/data/v9.0/appmodules(dd621d4a-d898-e711-80e7-00155db763be)/appmoduleroles_association/$ref?$id=[Organization URI]/api/data/v9.0/roles(<roleId)
-`
+```
+DELETE	[Organization URI]/api/data/v9.0/appmodules(dd621d4a-d898-e711-80e7-00155db763be)/appmoduleroles_association/$ref?$id=[Organization URI]/api/data/v9.0/roles(<roleId)
+```
 
 ## Manage your model-driven apps and its components
 
diff --git a/powerapps-docs/maker/canvas-apps/controls/control-power-bi-tile.md b/powerapps-docs/maker/canvas-apps/controls/control-power-bi-tile.md
@@ -38,11 +38,15 @@ By passing a single parameter from the app, you can filter the results that appe
 
 To pass a single filter value, modify the value of the **TileURL** property, which follows this syntax:
 
-```"https://app.powerbi.com/embed?dashboardId=<DashboardID>&tileId=<TileID>&config=<SomeHash>" ```
+```
+"https://app.powerbi.com/embed?dashboardId=<DashboardID>&tileId=<TileID>&config=<SomeHash>"
+```
 
 To that value, append this syntax:
 
-```&$filter=<TableName>/<ColumnName> eq '<Value>' ```
+```
+&$filter=<TableName>/<ColumnName> eq '<Value>'
+```
 
 The parameter will filter a value in the dataset of the report where the tile originates.
 
diff --git a/powerapps-docs/maker/common-data-service/types-of-entities.md b/powerapps-docs/maker/common-data-service/types-of-entities.md
@@ -56,10 +56,10 @@ The following table lists activity entities that are available in a default Comm
 |Name|Description|Display in activity menus|Reference|
 |----------|-----------------|----------------|---------------|  
 |**Appointment**|Commitment representing a time interval with start/end times and duration.|Yes|[Appointment](/powerapps/developer/common-data-service/reference/entities/appointment)|
-|**Email**|Activity that is delivered using email protocols.|Yes|[Email ](/powerapps/developer/common-data-service/reference/entities/email)|
+|**Email**|Activity that is delivered using email protocols.|Yes|[Email](/powerapps/developer/common-data-service/reference/entities/email)|
 |**Fax**|Activity that tracks call outcome and number of pages for a fax and optionally stores an electronic copy of the document.|Yes|[Fax](/powerapps/developer/common-data-service/reference/entities/fax)|
 |**Letter**|Activity that tracks the delivery of a letter. The activity can contain the electronic copy of the letter.|Yes|[Letter](/powerapps/developer/common-data-service/reference/entities/letter)|
-|**Phone Call**|Activity to track a telephone call.|Yes|[PhoneCall ](/powerapps/developer/common-data-service/reference/entities/phonecall)|
+|**Phone Call**|Activity to track a telephone call.|Yes|[PhoneCall](/powerapps/developer/common-data-service/reference/entities/phonecall)|
 |**Recurring Appointment**|The master appointment of a recurring appointment series.|Yes|[RecurringAppointmentMaster](/powerapps/developer/common-data-service/reference/entities/recurringappointmentmaster)|
 |**Task**|Generic activity representing work needed to be done.|Yes|[Task](/powerapps/developer/common-data-service/reference/entities/task)|
   
diff --git a/powerapps-docs/maker/common-data-service/use-powerapps-checker.md b/powerapps-docs/maker/common-data-service/use-powerapps-checker.md
@@ -171,7 +171,9 @@ Here's a summary of each column in the report.
 | Web Resources  | [web-avoid-eval](http://go.microsoft.com/fwlink/?LinkID=398563&error=web-avoid-eval&client=PAChecker)  | Don't use the 'eval' function or its functional equivalents.  | 
 
 ## Limitations
-Solution checker can't be automated at this time. You must run it from PowerApps. More information: [Run solution checker](#run-the-solution-checker)
+
+Solution checker can't be automated at this time. You must run it from https://web.powerapps.com. More information: [Run solution checker](#run-the-solution-checker)
+
 
 ### See also
 [Best practices and guidance for the Common Data Service](../../developer/common-data-service/best-practices/index.md)<br />
diff --git a/powerapps-docs/maker/common-data-service/virtual-entity-odata-provider-requirements.md b/powerapps-docs/maker/common-data-service/virtual-entity-odata-provider-requirements.md
@@ -52,9 +52,9 @@ The following table lists the OData Entity Data Model (EDM) data type mappings w
 
 ### OData EDM data types that are not supported for mapping with virtual entities 
 
-- `Edm.Binary `
+- `Edm.Binary`
 - `Edm.Time` 
-- `Edm.Float `
+- `Edm.Float`
 - `Edm.Single` 
 - `Edm.Int16` 
 - `Edm.Byte` 
diff --git a/powerapps-docs/maker/model-driven-apps/accessing-view-definitions.md b/powerapps-docs/maker/model-driven-apps/accessing-view-definitions.md
@@ -93,6 +93,6 @@ On any list view for an entity in a legacy web app, on the command bar you will
  If the entity that the view is associated with is part of an unmanaged solution, you can still create or edit views for that entity in the default solution. System views are associated with an entity and are not available as separate solution components. Unlike fields, views do not use a customization prefix in a unique name that should be consistent in a solution, so you do not need to create views in the context of a solution. 
  
 ## Next steps
-[Understand views ](create-edit-views.md)
+[Understand views](create-edit-views.md)
 
 
diff --git a/powerapps-docs/maker/model-driven-apps/create-edit-web-resources.md b/powerapps-docs/maker/model-driven-apps/create-edit-web-resources.md
@@ -39,7 +39,7 @@ Web resources are virtual files stored in the system. Each web resource has a un
   
 For example, if you create an HTML page as a web resource named “new_myWebResource.htm”, you could open that page in a browser using a URL like this:  
  
-`<base URL>/WebResources/new_myWebResource.htm   `
+`<base URL>/WebResources/new_myWebResource.htm`
   
 where *\<base URL>* is the part of the URL you use to view apps that ends in `dynamics.com`. Because the web resource is data in the system, only licensed users for your organization can access them this way. Normally, web resources are included in forms rather than referenced directly. The most common usage is to provide JavaScript libraries for form scripts.  
     
diff --git a/powerapps-docs/maker/model-driven-apps/embed-canvas-app-in-form.md b/powerapps-docs/maker/model-driven-apps/embed-canvas-app-in-form.md
@@ -28,10 +28,6 @@ search.app:
 
 Canvas apps enable makers to easily design and create custom layouts using the low-code, WYSIWYG canvas app designer. Canvas apps also enable makers to connect and display data from over 200 data sources on their forms.
 
-> [!NOTE]
-> This feature is currently in preview. <br />
-> [!INCLUDE [cc-preview-features-definition](../../includes/cc-preview-features-definition.md)] <br /><br />
-
 With embedded canvas apps, makers can bring the power of canvas apps to their model-driven forms. Using embedded canvas apps, you can easily create rich visual areas on a form and display data from a variety of sources right next to data from the Common Data Service.
 
    > [!div class="mx-imgBorder"] 
diff --git a/powerapps-docs/maker/model-driven-apps/embedded-canvas-app-actions.md b/powerapps-docs/maker/model-driven-apps/embedded-canvas-app-actions.md
@@ -26,10 +26,6 @@ search.app:
 # Perform predefined actions on the host form from within an embedded canvas app
 Embedded canvas apps provide the ability to perform predefined actions on the host form. These actions enable makers to navigate, refresh and save the host form. Using these actions, an embedded canvas app can act as a more integral part of the form and the model-driven app.  
 
-> [!NOTE]
-> This feature is currently in preview. <br />
-> [!INCLUDE [cc-preview-features-definition](../../includes/cc-preview-features-definition.md)] 
-
 The **ModelDrivenFormIntegration** object now includes the following new methods to enable makers to perform actions on the host form.  
   
 ### NavigateToMainForm(entityName, mainFormName, recordId)
diff --git a/powerapps-docs/maker/model-driven-apps/embedded-canvas-app-guidelines.md b/powerapps-docs/maker/model-driven-apps/embedded-canvas-app-guidelines.md
@@ -24,7 +24,6 @@ search.app:
 ---
 
 # Guidelines on working with embedded canvas apps
-[!INCLUDE [cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
 
 This topic provides guidelines on working with embedded canvas apps as well as helpful tips to troubleshoot any issues you might encounter.
 
diff --git a/powerapps-docs/maker/model-driven-apps/pass-current-embedded-canvas-app.md b/powerapps-docs/maker/model-driven-apps/pass-current-embedded-canvas-app.md
@@ -26,10 +26,6 @@ search.app:
 # Pass the current record as data context to an embedded canvas app
 This topic explains how to add an embedded canvas app and pass the current (main form) record as a data context to the embedded canvas app.
 
-> [!NOTE]
-> This feature is currently in preview. <br />
-> [!INCLUDE [cc-preview-features-definition](../../includes/cc-preview-features-definition.md)] 
-
 Imagine that you want to add an embedded canvas app on an account main form and pass the current account record to the embedded canvas app. To do this, follow these steps: 
 
 1.	Sign in to [PowerApps](https://web.powerapps.com/?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) and open the form editor for a main form of an entity, such as the account entity. 
diff --git a/powerapps-docs/maker/model-driven-apps/pass-related-embedded-canvas-app.md b/powerapps-docs/maker/model-driven-apps/pass-related-embedded-canvas-app.md
@@ -27,10 +27,6 @@ search.app:
 
 This topic explains how to add an embedded canvas app and pass a list of records related to the current (main form) record as a data context to the embedded canvas app.
 
-> [!NOTE]
-> This feature is currently in preview. <br />
-> [!INCLUDE [cc-preview-features-definition](../../includes/cc-preview-features-definition.md)]
-
 Let's say you want to add an embedded canvas app on an account main form and pass a list of contacts related to the current account record to the embedded canvas app. To do this, follow these steps:
 
 1.	Sign in to [PowerApps](https://web.powerapps.com/?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) and open the form editor for a main form of an entity, such as the account entity.
diff --git a/powerapps-docs/maker/model-driven-apps/share-embedded-canvas-app.md b/powerapps-docs/maker/model-driven-apps/share-embedded-canvas-app.md
@@ -24,7 +24,6 @@ search.app:
 ---
 
 # Share an embedded canvas app
-[!INCLUDE [cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
 
 This topic explains how to share an embedded canvas app that you have already created.
 
diff --git a/powerapps-docs/maker/model-driven-apps/use-main-form-and-components.md b/powerapps-docs/maker/model-driven-apps/use-main-form-and-components.md
@@ -146,7 +146,7 @@ You can add or edit web resources on a form to make it more appealing or useful
 You can add iFrames to a form to integrate content from another website within a form. To know more about the IFRAME properties, see [IFRAME properties](iframe-properties-legacy.md). 
   
 ## Edit navigation  
- Navigation within the form allows people to view lists of related records. Each entity relationship has properties to control whether it should be shown. More information: [Navigation Pane Item for Primary Entity ](../common-data-service/create-edit-1n-relationships-solution-explorer.md#navigation-pane-item-for-primary-entity)
+ Navigation within the form allows people to view lists of related records. Each entity relationship has properties to control whether it should be shown. More information: [Navigation Pane Item for Primary Entity](../common-data-service/create-edit-1n-relationships-solution-explorer.md#navigation-pane-item-for-primary-entity)
   
  Any entity relationships that are configured to be displayed can be overridden within the form editor.  
   
diff --git a/powerapps-docs/user/export-data-excel.md b/powerapps-docs/user/export-data-excel.md
