Live publish

buck1ey · web-flow · commit 28bce0f824e1 · 2023-01-30T05:00:02.000-08:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -7240,16 +7240,6 @@
       "redirect_url": "powerapps-docs/maker/portals/admin/update-dynamics365-instance.md",
       "redirect_document_id": "false"
     },
-    {
-      "source_path": "powerapps-docs/user/cs-email-template-builder.md",
-      "redirect_url": "/dynamics365/customer-service/cs-email-template-builder",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "powerapps-docs/user/customize-insert-email-template.md",
-      "redirect_url": "/dynamics365/customer-service/customize-insert-email-template",
-      "redirect_document_id": "false"
-    },
     {
       "source_path": "powerapps-docs/teams/boards-architecture.md",
       "redirect_url": "https://github.com/microsoft/teams-powerapps-app-templates",
diff --git a/powerapps-docs/maker/TOC.yml b/powerapps-docs/maker/TOC.yml
@@ -125,7 +125,7 @@
           href: ../user/email-template-convert.md
         - name: Create a signature for emails
           href: ../user/email-signature.md 
-      - name: Enable the enhanced insert email template
+      - name: Configure the enhanced insert email template
         href: ../user/customize-insert-email-template.md
     - name: Work with grid and views
       items:
@@ -1651,7 +1651,7 @@
       href: ./model-driven-apps/distribute-model-driven-app.md
     - name: Enable customizable help
       href: ./model-driven-apps/use-customizable-help.md
-    - name: Enable the enhanced email template editor page
+    - name: Configure the enhanced email template editor page
       href: ../user/cs-email-template-builder.md
   - name: App performance insights
     items:
diff --git a/powerapps-docs/user/cs-email-template-builder.md b/powerapps-docs/user/cs-email-template-builder.md
@@ -0,0 +1,56 @@
+---
+title: How to enable the enhanced email template in Power Apps
+description: Turn on the enhanced email template option in Power Apps.
+author: gandhamm
+manager: shujoshi
+ms.topic: conceptual
+ms.date: 07/01/2022
+ms.author: mgandham
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Configure the enhanced email template editor page
+
+
+You can configure the enhanced email template editing experience for apps across your organization. If you need to, you can turn off the enhanced email template page for a specific app. And then, the users of the app see the default email template editor page.
+
+> [!NOTE]
+>  In Customer Service workspace and Customer Service Hub, the enhanced email template dialog is enabled by default as an early access feature. 
+
+### Enable the enhanced email template editor
+
+1. In [Power Apps](https://make.preview.powerapps.com/), select the environment the environment that contains your solution.
+2. Select **Solutions**, and then select the solution in which you want to turn on the enhanced template editing experience.
+   > [!NOTE]
+   > Don't select the default solution to configure the template.
+4. Select **Add Existing** > **More** > **Setting**.
+
+   > ![Add a setting to a solution](media/usr-soln-setting.png)
+1. On the **Add existing Setting Definition** pane, select the **Enable the New Email Template Editor** option and then select **Next**.
+1. Select **Add** on the **Selected Setting Definition** to add the **Enable the New Email Template Editor** option to your solution. 
+1.  Go to **Add Existing** > **App** > **Model-driven app**> **Add existing model-driven apps** pane.
+1. Select the **Enable the New Email Template Editor** option. The **Edit Enable the New Email Template Editor** pane appears.
+1. Set the **Setting environment value** option to **Yes** on the **Edit Enable the New Email Template Editor** pane.
+   > ![Set the variable to no](media/cs-tmp-editor.png)
+1. Select **Publish All Customizations**.
+
+## Disable the enhanced email template editor for an app
+
+For an app to display the default email template selection dialog, you must disable the enhanced email template selection option. To disable the option for a specific app, you must add the app to the Solution in which you've added the the email template selection option. Perform the following steps:
+
+1. Go to **Power Apps** instance.
+2. Select **Solutions**.
+1. On the **Solutions** page, select the Solution in which you've added the the email template selection option.
+1. Go to **Add Existing** > **App** > **Model-driven app**> **Add existing model-driven apps** pane. Select the app for which you want to disable the enhanced insert email template selection dialog. The app is added to the solution. 
+1. Select the **Enable the New Email Template Editor** option in the solution.
+1. On the **Edit Enable the New Email Template Editor**, in the **Setting app value** section, the selected app is displayed. 
+2. Select **New app value** for the app, and select **No** for the specified app. 
+4. Select **Save** and **Publish All Customizations**.
+### See also
+
+[How to create an email template  in model-driven apps](/power-apps/user/email-template-create)  
+[Customize an email template using the template editor](/power-apps/user/cs-template-options)
+
+[!INCLUDE[footer-include](../includes/footer-banner.md)]
diff --git a/powerapps-docs/user/cs-template-options.md b/powerapps-docs/user/cs-template-options.md
@@ -18,7 +18,8 @@ search.app:
 # Customize an email template using the template editor 
 
 > [!NOTE]
-> The enhanced email template editor is available only in Dynamics 365 Customer Service.
+> The enhanced email template editor is available out of the box as an early access feature only in the Customer Service workspace and Customer Service Hub apps.
+
 
 Use the **Editor** tab in the **Email Template** form to create customized email templates. The **Editor** tab has three sections:
 
@@ -73,8 +74,7 @@ Use the **General Styles** tab to change the layout's width, font, font size, ba
 
 ### See also
 
-[Personalize content with Insert dynamic text](email-dynamic-text.md)
-
+[Personalize content with Insert dynamic text](email-dynamic-text.md)<br>
 [How to create an email template  in model-driven apps](email-template-create.md)  
 [Enable the enhanced email template editor page](cs-email-template-builder.md)
 
diff --git a/powerapps-docs/user/customize-insert-email-template.md b/powerapps-docs/user/customize-insert-email-template.md
@@ -0,0 +1,53 @@
+---
+title: How to enable the enhanced insert email template selection dialog in Power Apps
+description: Turn on the enhanced insert email template selection dialo template option in Power Apps.
+author: gandhamm
+manager: shujoshi
+ms.topic: conceptual
+ms.date: 07/01/2022
+ms.author: mgandham
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Configure the enhanced insert email template selection dialog
+
+
+Turn on the enhanced email template selection experience for apps across your organization. If you need to, you can turn off the enhanced email template selection dialog for a specific app. And then, the users of the app see the default email template editor page.
+
+
+### Enable the enhanced email template editor
+
+1. In [Power Apps](https://make.preview.powerapps.com/), select the environment the environment that contains your solution.
+2. Select **Solutions**, and then select the solution in which you want to turn on the enhanced template editing experience.
+   > [!NOTE]
+   > Don't select the default solution to configure the template.
+4. Select **Add Existing** > **More** > **Setting**.
+
+   > ![Add a setting to a solution](media/usr-soln-setting.png)
+1. On the **Add existing Setting Definition** pane, select the **Enable the New Insert Template Dialog** option and then select **Next**.
+1. Select **Add** on the **Selected Setting Definition**. The **Enable the New Insert Template Dialog** option is added to your solution. Select **Edit**.
+1. Set the **Setting environment value** option to **Yes** on the **Edit Enable the New Insert Template Dialog** pane.
+   > ![Set the variable to no](media/new_email_template_envvar.png)
+1. Select **Publish All Customizations**.
+
+## Disable the enhanced email template editor for an app
+
+For an app to display the default email template selection dialog, you must disable the enhanced email template selection option. To disable the option for a specific app, you must add the app to the Solution in which you've added the the email template selection option. Perform the following steps:
+
+1. Go to **Power Apps** instance.
+2. Select **Solutions**.
+1. On the **Solutions** page, select the Solution in which you've added the the email template selection option.
+1. Go to **Add Existing** > **App** > **Model-driven app**> **Add existing model-driven apps** pane. Select the app for which you want to disable the enhanced insert email template selection dialog. The app is added to the solution. 
+1. Select the **Enable the New Insert Template Dialog** option in the solution.
+1. On the **Edit Enable the New Insert Template Dialog**, in the **Setting app value** section, the selected app is displayed. 
+2. Select **New app value** for the app, and select **No** for the specified app. 
+4. Select **Save** and **Publish All Customizations**.
+
+### See also
+
+[How to create an email template  in model-driven apps](/power-apps/user/email-template-create)  
+[Customize an email template using the template editor](/power-apps/user/cs-template-options)
+
+[!INCLUDE[footer-include](../includes/footer-banner.md)]
diff --git a/powerapps-docs/user/email-template-create.md b/powerapps-docs/user/email-template-create.md
@@ -24,7 +24,7 @@ search.app:
 Email templates are a fast and easy way to send consistent, professional, preformatted email messages to your customers. To create email templates, the legacy email template editor is available by default. However, the enhanced email template editor is displayed as a choice if it is enabled by your administrator.
 
 > [!NOTE]
-> The enhanced email template editor is available only in Dynamics 365 Customer Service.
+> The enhanced email template editor option is enabled out of the box as an early access feature in  Dynamics 365 Customer Service. 
 
 You can create email templates by using one of the following options:  
 - **Start with a blank template**: Create a template from scratch. The editor that's displayed depends on wether the enhanced email template editor option is enabled.
@@ -52,7 +52,7 @@ When you start with a blank template, nothing is provided for you. You must add
 The editor page you see depends on whether your administrator has turned on the enhanced email template editor option:
 
 - If yes, you'll use the enhanced email template editor page.
-- If not, you'll use the default email template editor page. 
+- If not, you'll use the email template editor page. 
 
 ## Start with existing templates
 
@@ -70,7 +70,7 @@ Start with an existing template to create an email template faster and with less
 
 When you create a template from an existing template, irrespective of the enhanced email template editor option setting, the app displays the newly-created email template in one of the the following template editors:
   - Enhanced email template: If the selected email template was created with the enhanced email template.
-  - Default email template: If the selected template was created with the default email template.
+  - Email template: If the selected template was created with the legacy email template.
 
 > [!Important]
 > If you create templates in the enhanced editing environment, don't edit them in the legacy web client. You'll lose any inline images and strip out some of the advanced formatting and functionality.
@@ -86,23 +86,21 @@ When you create a template from an existing template, irrespective of the enhanc
 
 ## Email template editor
 
-You can use either the enhanced email template editor or the default email template editor to create email templates.
+You can use either the enhanced email template editor or the legacy email template editor to create email templates.
 
 ### Enhanced email template editor
-> [!NOTE]
-> An administrator can enable the enhanced email template editor feature. More information: [Enhanced email template editor option](cs-email-template-builder.md) 
-
-The enhanced email template editor is displayed the enhanced email template editor option is enabled. 
+ 
+The enhanced email template editor is displayed if the enhanced email template editor option is enabled. However, for Customer Service workspace and Customer Service Hub apps, the enhanced email template editor is displayed by default as an early access feature. More information: [Enhanced email template editor option](cs-email-template-builder.md) 
 
 :::image type="content" source="media/email-template-enh.png" alt-text="Screenshot of the enhanced email template editor with a blank template open for editing.":::
 
 - **Editor** tab: Use this tab to design and customize your email template. See: [Design and customize the email template](cs-template-options.md).
 - **Template** tab: Specify or change the template details and the email subject.
 - **Attachments** tab: Add attachments to your template if needed.
 
-### Default email template editor
+### Email template editor
 
-The default email template editor is displayed the enhanced email template editor option is disabled. 
+The email template editor is displayed if the enhanced email template editor option is disabled. 
 
 :::image type="content" source="media/email-new-customer-template-1c.png" alt-text="Screenshot of the default email template editor with a blank template open for editing.":::
 
@@ -112,6 +110,6 @@ The default email template editor is displayed the enhanced email template edito
 
 ### See also
 
-[Personalize content with Insert dynamic text](email-dynamic-text.md)
+[Personalize content with Insert dynamic text](email-dynamic-text.md)<br>
 [Set up enhanced email](/power-platform/admin/system-settings-dialog-box-email-tab)<br>
 [Understand the email experience](view-create-email.md)   
diff --git a/powerapps-docs/user/insert-email-template.md b/powerapps-docs/user/insert-email-template.md
@@ -46,9 +46,6 @@ After you select **Insert Template**, a window appears displaying a list of exis
 
 ### Enhanced email template selection dialog
 
-> [!Note] 
-> The enhanced email template editor is available only in environments with the Dynamics 365 Customer Service package installed.
-
 The application displays the enhanced email template selection window only if your admin has configured the [enhanced insert template dialog](customize-insert-email-template.md) option. You can perform the following actions in the enhanced email template selection window:
 
  -  Switch among list, tile, and grid views.
diff --git a/powerapps-docs/user/media/cs-tmp-editor.png b/powerapps-docs/user/media/cs-tmp-editor.png
