Merge pull request #3072 from MicrosoftDocs/Nava_mref

Fixing format issues

Author: Nkrb

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

@@ -41,14 +41,14 @@ Model-driven apps and canvas apps (public preview)
 |[type](type.md)|[!INCLUDE [type-description](includes/type-description.md)]|1 or more|
 
 
-Type-group has a limited support for canvas apps in this experimental preview . The following issues occur when you try to import components:
+The `type-group` has a limited support for canvas apps in this experimental preview . The following issues occur when you try to import components into Common Data Service:
 
-1. If all types listed in the type group are of compatible javascript types, the developer attempt to choose the most generic option listed. The types that are considered compatible are :
-   - Strings: SingleLine.Text, Multiple, SingleLine.TextArea, SingleLine.Email, SingleLine.Phone, SingleLine.___URL, SingleLine.Ticker.
-   - Numbers: Decimal, Floating Point, Whole.None, Currency.
-   - Dates: DateAndTime.DateAndTime, DateAndTime.DateOnly.
+1. All the types listed in the in the type-group are of compatible in canvas apps. The types that are compatible are:
+   - **Strings**: SingleLine.Text, Multiple, SingleLine.TextArea, SingleLine.Email, SingleLine.Phone, SingleLine.___URL, SingleLine.Ticker.
+   - **Numbers**: Decimal, Floating Point, Whole.None, Currency.
+   - **Dates**: DateAndTime.DateAndTime, DateAndTime.DateOnly.
 
-2. If the types listed in the group are not considered compatible, then the parameter will be treated as the first type listed in the type-group.
+2. If the types listed in the `type-group` are mix of compatible and non compatible types, then the first compatible type listed in the `type-group` is considered.
 
 ### Example
 

powerapps-docs/developer/component-framework/overview.md

@@ -1,76 +1,3 @@
-<<<<<<< HEAD
----
-title: "Power Apps component framework overview | Microsoft Docs"
-description: "Use the Power Apps component framework to create code components to provide enhanced experiences for people to view and work with data in forms, views, and dashboards."
-keywords: "Component Framework, code components, Power Apps controls"
-author: nkrb 
-manager: kvivek
-ms.date: 09/05/2019
-ms.service: "powerapps"
-ms.custom:
-  - "dyn365-a11y"
-  - "dyn365-developer"
-ms.topic: article
-ms.assetid: 7923e36d-3640-49f7-9f2f-c97358a632db
-ms.author: nabuthuk
----
-
-# Power Apps component framework overview
-
-Power Apps component framework empowers professional developers and app makers to create code components for model-driven and canvas apps (public preview) to provide enhanced user experience for the users to work with data on forms, views, and dashboards. For example:
-
-- Replace a field that displays a numeric text value with a `dial` or `slider` code component.
-- Transform a list into an entirely different visual experience bound to the data set like a `Calendar` or `Map`.
-
-
-> [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE4slRe]
-
-
-> [!IMPORTANT]
-> - PowerApps component framework is in public preview for canvas apps, and is generally available for model-driven apps. This implies that all the APIs that are supported for model-driven apps might not be supported on canvas apps yet.
-> - By default Power Apps component framework is enabled for model-driven apps. To enable this feature for canvas apps, see [Code components for canvas apps](component-framework-for-canvas-apps.md).
-> - [!INCLUDE[cc_preview_features_definition](../../includes/cc-preview-features-definition.md)]
-> - Power Apps component framework works only on Unified Interface and not on the web client. 
-> - Power Apps component framework doesn't work for on-premises instances. 
-
-## How is it different from web resources
-
-Unlike HTML web resources, code components are rendered as a part of the same context, load at the same time as any other components, providing a seamless experience for the users. 
-
-Developers can bundle all the HTML, CSS, and TypeScript files into a single [solution](https://docs.microsoft.com/dynamics365/customer-engagement/customize/solutions-overview) package file and move across environments and also shipped via [AppSource](https://appsource.microsoft.com/marketplace/apps?page=1&product=dynamics-365). 
-
-Code components can be reused many times across different entities and forms. Use Power Apps component framework to create code components that can be used across the full breadth of Power Apps capabilities.
-
-## Advantages 
-
-- Access to a rich set of framework APIs that expose capabilities like component lifecycle management, contextual data, and metadata. 
-- Seamless server access via Web API, utility and data formatting methods, device features like camera, ___location and microphone, along with easy-to-invoke UX elements like dialogs, lookups, and full-page rendering.  
-- Support for modern web practices.
-- Optimizes for performance.
-- Reusability
-- Bundle all files into a single solution file.
-
-## Licensing
-
-Power Apps component framework licensing requirements are inline with existing connectors and components and is based on the type of data and connections used in your app. More information: [Power Apps pricing](https://powerapps.microsoft.com/pricing/). To align with the licensing requirements, we will be classifying code components into two types:
-
-- Code components that connect to external services or data directly and not through connectors. When these components are used in an app, the app becomes premium, and end users are required to have **Power Apps** licenses.
-- Code components that don't connect to external services or data. When these components are used in an app that uses standard features, the app remains standard, and end users are required to be licensed at minimum for **Office 365**.
-
-> [!NOTE]
-> If you are currently using code components in model-driven apps connected to Common Data Service, end users will require **Power Apps** licenses.
-
-With the general availability of the framework, code component developers will be able to classify components as part of the component manifest to allow makers to see which components are premium.
-
-## Related topics
-
-[What are code components](custom-controls-overview.md)<br/>
-[Code components for canvas apps](component-framework-for-canvas-apps.md)<br/>
-[Create and build a code component](create-custom-controls-using-pcf.md)<br/>
-[Learn Power Apps component framework](https://docs.microsoft.com/learn/paths/use-power-apps-component-framework)<br/>
-[Power Apps for developers](https://docs.microsoft.com/powerapps/#pivot=home&panel=developer)
-
-=======
 ---
 title: "Power Apps component framework overview | Microsoft Docs"
 description: "Use the Power Apps component framework to create code components to provide enhanced experiences for people to view and work with data in forms, views, and dashboards."
@@ -142,4 +69,3 @@ With the general availability of the framework, code component developers will b
 [Learn Power Apps component framework](https://docs.microsoft.com/learn/paths/use-power-apps-component-framework)<br/>
 [Power Apps for developers](https://docs.microsoft.com/powerapps/#pivot=home&panel=developer)
 
->>>>>>> ae864535ae5aab1966c3c5bd8c4250316a788d91

powerapps-docs/developer/model-driven-apps/actions-dashboards.md

@@ -1,66 +1,3 @@
-<<<<<<< HEAD
----
-title: "Actions on dashboards (model-driven apps) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces"
-description: "Learn about performing actions such as create, retrieve, update, or delete, on organization-owned and user-owned dashboards." # 115-145 characters including spaces. This abstract displays in the search result."
-keywords: ""
-ms.date: 10/31/2018
-ms.service: powerapps
-ms.topic: article
-ms.assetid: 339eb79d-5dec-885b-496f-bfa26e9cae08
-author: Nkrb # GitHub ID
-ms.author: nabuthuk # MSFT alias of Microsoft employees only
-manager: shilpas # MSFT alias of manager or PM counterpart
-ms.reviewer: 
-search.audienceType: 
-  - developer
-search.app: 
-  - PowerApps
-  - D365CE
----
-
-# Actions on dashboards
-
-<!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/customize-dev/actions-dashboards -->
-
-You can perform actions such as create, retrieve, update, or delete, on organization-owned and user-owned dashboards.  
-  
-## Actions on an Organization-Owned Dashboard  
- To perform the following actions on an organization-owned dashboard (`SystemForm`), you must have the System Administrator or the System Customizer role assigned to your account in Common Data Service:  
-  
-- Create, retrieve, update, and delete. You can create or update an organization-owned dashboard by using the Common Data Service web services or by customizing the entity form. For detailed information about creating a dashboard, see [Create a Dashboard](create-dashboard.md).  
-  
-- Set an organization-owned dashboard as the default dashboard for an organization by setting the `SystemForm.IsDefault` attribute value to `true` while creating or updating the dashboard.  
-  
-  > [!IMPORTANT]
-  >  Using the methods available in the Common Data Service Web Services, it is possible to set two dashboards as the default. Make sure that no other dashboard is the default dashboard for the organization before updating this setting programmatically.  
-  
-  After you update an organization-owned dashboard, you must publish the metadata changes to make it visible across the organization. You can use the <xref:Microsoft.Crm.Sdk.Messages.PublishAllXmlRequest> message or <xref:Microsoft.Crm.Sdk.Messages.PublishXmlRequest> message to publish the changes made for an organization-owned dashboard. For a sample code that demonstrates this, see [Sample: Create, Retrieve, Update and Delete (CRUD) a Dashboard](/dynamics365/customer-engagement/developer/customize-dev/sample-create-retrieve-update-delete-dashboard)<!-- TODO Need to update the powerapps repo's topic link. As of now not found-->.  
-  
-  For a list of supported messages on the organization-owned dashboard entity, see [SystemForm Entity](../common-data-service/reference/entities/systemform.md).  
-  
-## Actions on a User-Owned Dashboard  
- You can perform the following actions on a user-owned dashboard (`UserForm`):  
-  
-- Create, retrieve, update, and delete. For detailed information about creating a user-owned dashboard, see [Create a Dashboard](create-dashboard.md).  
-  
-- Change the ownership of a user-owned dashboard by assigning it to another user or team using the <xref:Microsoft.Crm.Sdk.Messages.AssignRequest> message.  
-  
-- Retrieve the access that the specified security principal (user or team) has to a user-owned dashboard using the <xref:Microsoft.Crm.Sdk.Messages.RetrievePrincipalAccessRequest> message. You can also retrieve all the security principals (users or teams) that have access to a user-owned dashboard, along with their access rights to the user dashboard using the <xref:Microsoft.Crm.Sdk.Messages.RetrieveSharedPrincipalsAndAccessRequest> message.  
-  
-- Collaborate with other users and teams on specific areas by sharing a user-owned dashboard with them using the <xref:Microsoft.Crm.Sdk.Messages.GrantAccessRequest>, <xref:Microsoft.Crm.Sdk.Messages.ModifyAccessRequest>, and <xref:Microsoft.Crm.Sdk.Messages.RevokeAccessRequest> messages.  
-  
-  For a list of supported messages on the user-owned dashboard entity, see [UserForm Entity](../common-data-service/reference/entities/userform.md).  
-  
-### See also  
-
- [Dashboards for Microsoft Dynamics 365](analyze-data-with-dashboards.md)   
- [Using FormXML for Dashboards](understand-dashboards-dashboard-components-formxml.md)   
- [Create a Dashboard](create-dashboard.md)   
- [Sample Dashboards](sample-dashboards.md)   
- [Dashboard Entities](/dynamics365/customer-engagement/developer/customize-dev/dashboard-entities) <!-- TODO Need to update the powerapps repo's topic link. As of now not found-->  
- [Sample: Create, Retrieve, Update and Delete (CRUD) a Dashboard](/dynamics365/customer-engagement/developer/customize-dev/sample-create-retrieve-update-delete-dashboard) <!-- TODO Need to update the powerapps repo's topic link. As of now not found-->   
- [Sample: Assign a User-Owned Dashboard to Another User](/dynamics365/customer-engagement/developer/customize-dev/sample-assign-user-owned-dashboard-another-user) <!-- TODO Need to update the powerapps repo's topic link. As of now not found-->
-=======
 ---
 title: "Actions on dashboards (model-driven apps) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces"
 description: "Learn about performing actions such as create, retrieve, update, or delete, on organization-owned and user-owned dashboards." # 115-145 characters including spaces. This abstract displays in the search result."
@@ -123,4 +60,3 @@ You can perform actions such as create, retrieve, update, or delete, on organiza
  [Sample Dashboards](sample-dashboards.md)     
  [Sample: Create, Retrieve, Update and Delete (CRUD) a Dashboard](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/CRUDOperationsDashboard)  
  [Sample: Assign a User-Owned Dashboard to Another User](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/AssignUserOwnedDashboardToAnother)
->>>>>>> ae864535ae5aab1966c3c5bd8c4250316a788d91