Resolve syncing conflicts from repo_sync_working_branch to main

power-platform/admin/TOC.yml

@@ -1079,13 +1079,16 @@
                   href: connect-yammer.md
         - name: Unified admin experience for finance and operations apps (preview)
           items:
-            - name: Overview
+            - name: Overview of unified admin experience for finance and operations apps
               href: unified-experience/finance-operations-apps-overview.md
-              displayName: Overview of unified admin experience for finance and operations apps
+            - name: Administration for partners and systems implementers
+              href: unified-experience/partners-systems-implementers.md
             - name: "Tutorial: Provision a new environment with an ERP-based template"
               href: unified-experience/tutorial-deploy-new-environment-with-erp-template.md
             - name: "Tutorial: Install the Finance and Operations Provisioning apps"
               href: unified-experience/tutorial-install-finance-operations-provisioning-app.md
+            - name: "Tutorial: Update the Finance and Operations Provisioning app"
+              href: unified-experience/tutorial-update-finance-operations-provisioning-app.md
             - name: "Tutorial: Copy a Lifecycle Services environment to a unified environment"
               href: unified-experience/tutorial-copy-lifecycle-services-environment-unified-environment.md
             - name: "Admin trials for finance and operations apps"

power-platform/admin/manage-teams.md

@@ -3,7 +3,7 @@ title: "Teams in Dataverse   | MicrosoftDocs"
 description: Understand the different types of teams and how to view and manage settings.
 ms.component: pa-admin
 ms.topic: conceptual
-ms.date: 05/23/2024
+ms.date: 06/06/2024
 author: paulliew
 ms.subservice: admin
 ms.author: paulliew
@@ -56,10 +56,9 @@ A list of all of the teams in the environment is displayed.
    - **Description:** Enter a description of the team.
    - **Business unit:** Select the business unit from the dropdown list.
    - **Administrator:** Search for users in the organization. Start entering characters.
-
-       > [!Note]
-       > The **Administrator** field is only for reference and it doesn't have any special processing. You can use this field to restrict who can add and remove team members by registering a [plug-in](/power-apps/developer/data-platform/plug-ins) on the [associate and disassociate](/power-apps/developer/data-platform/webapi/associate-disassociate-entities-using-web-api) APIs for the **teammembership_association** relationship. These actions can be enforced when the user is the administrator of the team. For more information, see the community [sample code](https://community.dynamics.com/crm/b/mylifemicrosoftdynamiccrm/posts/ms-dynamics-crm-associate-disassociate-message-plugin).
-
+   > [!NOTE]
+   > The **Administrator** field is only for reference and it doesn't have any special processing. You can use this field to restrict who can add and remove team members by registering a [plug-in](/power-apps/developer/data-platform/plug-ins) on the [AddMembersTeam](/power-apps/developer/data-platform/webapi/reference/addmembersteam) API for the **teammembership_association** relationship. These actions can be enforced when the user is the administrator of the team. For more information, see the community [sample code](https://community.dynamics.com/crm/b/mylifemicrosoftdynamiccrm/posts/ms-dynamics-crm-associate-disassociate-message-plugin).
+
    - **Team type:** Select the team type from the dropdown list.
 
      :::image type="content" source="media/dataverse-team-manage-new-team.png" alt-text="Screenshot of settings for a new Dataverse team.":::

power-platform/admin/unified-experience/admin-trials.md

@@ -1,26 +1,23 @@
 ---
-title: "Unified admin trials (preview)"
+title: "Unified admin trials"
 description: "Subscription-based trial environments for administrators of finance and operations apps."
 author: laneswenka
 ms.topic: conceptual
-ms.date: 09/13/2023
+ms.date: 06/06/2024
 ms.subservice: admin
 ms.author: laswenka
 ms.reviewer: sericks
----
 
-# Unified admin trials (preview)
+---
 
-[!INCLUDE [cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
+# Unified admin trials
 
 Administrators, partners, and ISVs historically have had to use cloud-hosted environments in Lifecycle Services to create demo or trial environments for finance and operations apps. This was to demonstrate the software capabilities and try out new features of the product on a low-cost basis.
 
 To improve this experience, Microsoft has made available free subscription-based trial environments for finance and operations apps, including Dynamics 365 Finance, Supply Chain Management, Project Operations, and Commerce apps.
 
 > [!IMPORTANT]
-> - This is a preview feature.
-> - Preview features aren't meant for production use and may have restricted functionality. These features are available before an official release so that customers can get early access and provide feedback.
-> - The trial environments don't support development with Visual Studio. For development, you'll need a developer-focused sandbox environment. More information: [Install and configure development tools](/power-platform/developer/unified-experience/finance-operations-install-config-tools).
+> The trial environments don't support development with Visual Studio. For development, you need a developer-focused sandbox environment. More information: [Install and configure development tools](/power-platform/developer/unified-experience/finance-operations-install-config-tools).
 
 ## Acquire a free subscription-based trial license
 

power-platform/admin/unified-experience/finance-operations-apps-overview.md

@@ -1,50 +1,46 @@
 ---
-title: "Unified admin experience for finance and operations apps (preview)"
+title: Overview of unified admin experience for finance and operations apps
 description: "Overview of unified admin experiences for finance and operations apps customers in the Power Platform admin center."
 author: laneswenka
 ms.topic: overview
-ms.date: 2/26/2024
+ms.date: 06/06/2024
 ms.subservice: admin
 ms.author: laswenka
 ms.reviewer: sericks
----
 
-# Unified admin experience for finance and operations apps (preview)
+---
 
-[!INCLUDE [cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
+# Overview of unified admin experience for finance and operations apps
 
 Users of finance and operations apps can now administer their environments, policies, licensing, and capacity in the [Power Platform admin center](https://admin.powerplatform.microsoft.com).
 
-As part of the unification of admin experiences of finance and operations apps within Power Platform, the environment for finance and operations apps is now an application within Power Platform. Therefore, multiple Dynamics 365 applications, such as Sales, Marketing, finance and operations, and apps, flows, and websites in Power Platform can be installed and hosted in the same Power Platform environment [with a Dataverse database](/power-platform/admin/create-environment#create-an-environment-with-a-database). This unification provides a consistent and single set of lifecycle operations that an admin can perform across all artifacts.
+As part of the unification of admin experiences of finance and operations apps within Power Platform, the environment for finance and operations apps is now an application within Power Platform. In this new experience, multiple Dynamics 365 applications, such as Sales, Marketing, finance and operations, as well as low-code apps, flows, and websites can be installed and hosted in the same Power Platform environment [with a Dataverse database](/power-platform/admin/create-environment#create-an-environment-with-a-database). This unification provides a consistent and single set of lifecycle operations that an admin can perform across all artifacts in a particular environment.
 
 :::image type="content" source="media/one-admin-journey.png" alt-text="Screenshot that shows the unified admin experience for finance and operations apps.":::
 
-> [!IMPORTANT]
->
-> - This is a preview feature.
-> - Preview features aren't meant for production use and may have restricted functionality. These features are available before an official release so that customers can get early access and provide feedback.
-
 This article gives an overview to finance and operations apps administrators who are new to the Power Platform admin center. Learn some key differences between your prior admin center called Lifecycle Services and the new experience. You can also browse more resources and articles that provide detailed information for common tasks.
 
-To learn more about the admin unification journey, watch this video on the Microsoft Dynamics 365 Community channel on YouTube: [Video: Unified admin experience for finance and operations apps](https://www.youtube.com/embed/VPQSmtgzfjM).
+To learn more about the admin unification journey, see the [Power Platform admin center integration with Lifecyle Servcies (LCS) TechTalk](https://www.youtube.com/watch?v=HmJIuHhx3Hg).
 
 ## How do finance and operations apps surface in the Power Platform admin center?
 
-There are no new environment types in the Power Platform admin center. We integrated the finance and operations apps into the Power Platform fabric.
+Finance and operations now has the same behavior as other Dynamics 365 apps have had within Power Platform admin center. The apps are available to licensed customers both during new environment creation, as well as installed in to an existing environment.  
 
-You can deploy the finance and operations apps within the Power Platform admin center in one of two ways.
+You can deploy the finance and operations apps within the Power Platform admin center in one of the following ways:
 
 ### Option A: Create a new environment through templates
 
-When you create a new environment in the Power Platform admin center, you can add a Dataverse database and enable Dynamics 365 apps. You see a list of environment app templates that becomes available under **Automatically deploy these apps**. This list is a group of applications preinstalled on a Dataverse database.  
+A template is simply a bundle of Microsoft published applications that are pre-installed on a Dataverse-based Power Platform environment. This is a means of increasing productivity as you can deploy an environment with a known configuration of apps quickly without having to install each one in the proper sequence manually. When using a template, you always get the very latest version of each of those applications available as of that moment.
+
+When creating a new environment in Power Platform admin center, you can add a Dataverse data store and choose to **Enable Dynamics 365 apps**. Then you see a list of environment templates that becomes available under **Automatically deploy these apps**.   
 
 :::image type="content" source="media/new-environment-template.png" alt-text="Environment templates":::
 
-This list is dynamic, so you only see references to **Finance**, **Supply Chain Management**, **Commerce**, **Project Operations**, and other finance and operations apps based on the license of the admin creating the environment. For step-by-step instructions, see [Tutorial: Provision a new environment with an ERP-based template](./tutorial-deploy-new-environment-with-ERP-template.md).
+This list is dynamic, so you only see references to **Finance**, **Supply Chain Management**, **Commerce**, **Project Operations**, and other finance and operations apps based on the licenses assigned to the admin creating the environment. For step-by-step instructions, see [Tutorial: Provision a new environment with an ERP-based template](./tutorial-deploy-new-environment-with-ERP-template.md).
 
 ### Option B: Install the provisioning app on an existing environment
 
-You can install finance and operations apps on an existing Power Platform environment with a Dataverse database. Select an environment, navigate to the **Resources** > **Dynamics 365 apps** page, and select the **Dynamics 365 Finance and Operations Provisioning App**.
+If you already have an environment that should function with finance and operations apps, you can simply install it instead of creating a separate environment that requires a complex integration. The environment you use must support Dynamics 365 apps. As part of the install process, you can pick any of the supported versions of the finance and operations apps, which is helpful if you want to get a version that is not the latest generally available version.
 
 :::image type="content" source="media/install-provisioning-app.png" alt-text="Install provisioning app":::
 
@@ -95,27 +91,22 @@ The following table is a reference for each operation type and explains any nuan
 
 These continually updated scenario tutorials give a walkthrough for administrators in new experiences.
 
-- [Tutorial: Provision a new environment with an ERP-based template (preview)](./tutorial-deploy-new-environment-with-ERP-template.md)
-- [Tutorial: Copy a Lifecycle Services environment to a unified environment (preview)](./tutorial-copy-lifecycle-services-environment-unified-environment.md)
-- [Unified admin trials (preview)](admin-trials.md)
+- [Tutorial: Provision a new environment with an ERP-based template](./tutorial-deploy-new-environment-with-ERP-template.md)
+- [Tutorial: Copy a Lifecycle Services environment to a unified environment](./tutorial-copy-lifecycle-services-environment-unified-environment.md)
+- [Unified admin trials](admin-trials.md)
 - [Manage storage and capacity](../finance-operations-storage-capacity.md)
 
-### Known limitations during preview
-
-As part of the preview, there are a few limitations soon to be removed, so check back often to determine their resolution.
+### Known limitations
 
-- The environment templates don't include Project Operations.
 - The environment name can't exceed 20 characters—a limitation on the finance and operations runtime.
 
-### Frequently asked questions for the public preview
-
-We continue to publish common questions and resolve open items before making the experience generally available (GA).
+### Frequently asked questions
 
 #### I don't know what licenses I have assigned
 
 You can view the licenses assigned to you at [My Account - Subscriptions](https://portal.office.com/account/?ref=MeControl#subscriptions).
 
-View the templates that allow you to deploy: [Tutorial: Provision a new environment with an ERP-based template (preview)](tutorial-deploy-new-environment-with-ERP-template.md#knowing-which-template-to-provision).
+View the templates that allow you to deploy: [Tutorial: Provision a new environment with an ERP-based template](tutorial-deploy-new-environment-with-ERP-template.md#knowing-which-template-to-provision).
 
 #### I don't have any available capacity
 
@@ -134,7 +125,7 @@ Direct SQL access isn't available at this time. However, we're working on a just
 
 ### Related articles
 
-- [Unified developer experience for finance and operations apps (preview)](../../developer/unified-experience/finance-operations-dev-overview.md)
+- [Unified developer experience for finance and operations apps](../../developer/unified-experience/finance-operations-dev-overview.md)
 - [Finance and operations apps documentation](/dynamics365/fin-ops-core/fin-ops/)  
 - [Create and manage environments in the Power Platform admin center](/power-platform/admin/create-environment)  
 - [Manage Dynamics 365 apps](/power-platform/admin/manage-apps)