Merge branch 'master' into 2217721

Author: tapanm-MSFT

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

@@ -21,23 +21,21 @@ Power Apps component framework empowers professional developers and app makers t
 - Replace a column 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`.
 
-[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
-
 > [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE4slRe]
 
 
 > [!IMPORTANT]
 > - Power Apps 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 works only on Unified Interface and not on the legacy 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](/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). 
+Developers can bundle all the HTML, CSS, and TypeScript files into a single [solution](../../maker/data-platform/solutions-overview.md) 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 tables and forms. Use Power Apps component framework to create code components that can be used across the full breadth of Power Apps capabilities.
 
@@ -67,7 +65,8 @@ With the general availability of the framework, code component developers will b
 [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](/learn/paths/use-power-apps-component-framework)
+[Learn Power Apps component framework](/learn/paths/use-power-apps-component-framework)<br/>
+[Use code components in Power Apps portals](../../maker/portals/component-framework.md)
 
 
 

powerapps-docs/maker/data-platform/work-with-any-type-app.md

@@ -21,9 +21,7 @@ search.app:
 
 # Work with any type of app 
 
-[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
-
-Microsoft Dataverse provides multiple ways to integrate in any type of app&—mobile, web, desktop, device, system, or service. For cloud solutions, there are ways to integrate regardless of the model in which your solution is deployed—infrastructure as a service (IaaS), platform as a service (PaaS), or software as a service (SaaS). For IaaS-based solutions, the integration approach also
+Microsoft Dataverse provides multiple ways to integrate in any type of app (mobile, web, desktop), device, system, or service. For cloud solutions, there are ways to integrate regardless of the model in which your solution is deployed—infrastructure as a service (IaaS), platform as a service (PaaS), or software as a service (SaaS). For IaaS-based solutions, the integration approach also
 works well if solutions are running inside of containers.
 
 In some cases, integration with an app can be achieved by using business logic contained in Dataverse. In other cases, it will involve integration via events, the Dataverse OData API, or using plug-ins.
@@ -153,4 +151,4 @@ More information:
 [Use plug-ins to extend business processes](../../developer/data-platform/plug-ins.md)
 
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/teams/publish-and-share-apps.md

@@ -5,7 +5,7 @@ author: matthewbolanos
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 01/11/2021
+ms.date: 04/07/2021
 ms.author: mabolan
 ms.reviewer: tapanm
 ---
@@ -57,6 +57,9 @@ To share an app:
 1. Select a security group you would like to assign to the **Colleagues with
 access** role.
 
+    > [!IMPORTANT]
+    > The security group's membership type must be **Assigned**. More information: [Group membership types in Azure Active Directory](/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal#membership-types)
+
 1. Choose which apps the **Colleagues with access** role should have access to.
 
 Once you’re done sharing your apps, they’ll appear in the [Built for your
@@ -82,7 +85,7 @@ By default, the **Colleagues with access** role has no access to the data inside
 - **Private** ­– Allows end users to only view and edit their own data.
 
 > [!NOTE]
-> you can also use this experience to alter the default access rights for
+> You can also use this experience to alter the default access rights for
 members and guests within your team. By default, Team members are given **Full
 access** and guests are given **Private** access to new custom tables.