Live publish

Author: buck1ey

.openpublishing.redirection.json

@@ -6424,6 +6424,16 @@
       "source_path": "powerapps-docs/developer/component-framework/reference/linking/removeLinkedEntity.md",
       "redirect_url": "/powerapps/developer/component-framework/reference/linking",
       "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/user/cs_email_template_builder.md",
+      "redirect_url": "/powerapps/user/customize-insert-email-template",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/user/cs-template-options.md",
+      "redirect_url": "/powerapps/user/email-template-create",
+      "redirect_document_id": "false"
     }
   ]
 }

powerapps-docs/maker/TOC.yml

@@ -117,14 +117,12 @@
         items:
         - name: Create email templates
           href: ../user/email-template-create.md
-        - name: Customize an email template using the template editor
-          href: ../user/cs-template-options.md
         - name: Insert an email template
           href: ../user/insert-email-template.md
         - name: Convert an email to a template
           href: ../user/email-template-convert.md
         - name: Create a signature for emails
-          href: ../user/email-signature.md  
+          href: ../user/email-signature.md
       - name: Configure the enhanced insert email template
         href: ../user/customize-insert-email-template.md
     - name: Work with grid and views
@@ -1575,8 +1573,6 @@
       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
-      href: ../user/cs_email_template_builder.md  
   - name: App performance insights
     items:
     - name: Performance insights overview

powerapps-docs/user/cs-template-options.md

@@ -46,4 +46,4 @@ To disable the enhanced email template selection window and display the default
 1. Select **Save** and **Publish All Customizations**.
 
 
-[!INCLUDE[footer-include](../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../includes/footer-banner.md)]

powerapps-docs/user/cs_email_template_builder.md

@@ -28,9 +28,6 @@ When you've composed an email that you'd like to reuse with other customers, you
    ![Convert an email to a template.](media\email-how-to-insert-an-email-template-1c.png "Convert an email to a template")
 
    To save an email you've composed and formatted an email message as a template, select the downward-facing caret (v) next to **Insert Template**, and then select **Convert to an email template** from the drop-down list.
-   
-> [!NOTE]
-> The email templates will open only in the default email template editor page, even if your admin has enabled the [enhanced email template editor option](cs_email_template_builder.md) in Power Apps.
 
 #### Convert an email to a template overview
 The following window will display with a list you can customize.

powerapps-docs/user/customize-insert-email-template.md

@@ -1,14 +1,17 @@
 ---
-title: How to create an email template in model-driven apps
-description: Learn how to create an email template in a model-driven app.
+title: "How to create an email template  in model-driven apps | MicrosoftDocs"
+description: Learn how to create an email template.
 author: mduelae
 manager: kvivek
 
 ms.component: pa-user
 ms.topic: conceptual
-ms.date: 04/25/2022
+ms.date: 6/30/2021
 ms.subservice: end-user
 ms.author: mkaur
+ms.custom: ""
+ms.reviewer: ""
+ms.assetid: 
 search.audienceType: 
   - enduser
 search.app: 
@@ -18,65 +21,64 @@ search.app:
 
 # Create email templates
 
-Email templates are a fast and easy way to send consistent, professional, preformatted email messages to your customers.
+Email templates are a fast and easy way to send repetitive and recurring email to multiple customers. They can help save you time and give you a way to create consistent, professional, preformatted email messages that you can use when communicating with your customers. You can view, create, and edit any email templates you've created.
 
-To create a template, select **New** on the **Email Templates** command bar. You can [start with a blank template](#start-with-a-blank-template) or [customize an existing template](#start-with-existing-templates).
+When creating a template, you have the option to work with a blank or existing template.
 
-:::image type="content" source="media/email-how-to-create-an-email-template-1a.png" alt-text="Screenshot that shows options to create a template from blank or from an existing template.":::
+   ![Create an email template.](media\email-how-to-create-an-email-template-1a.png "Create an email template")
 
-## Start with a blank template
-
-When you start with a blank template, nothing is provided for you. You must add everything you want customers to see.
+When you select **New** from the **Email Templates** command bar, a drop-down list appears with options to either **Start with a blank template** or **Start with existing templates**.
 
-First, you'll need to provide information about the template itself.
-
-:::image type="content" source="media/email-create-an-email-template-1a.png" alt-text="Screenshot of template information to provide.":::
+## Start with a blank template
 
-   1. **Template name**: Give your email template a detailed name to help you identify it later.
-   2. **Permission level**: Select **Organization** to share your template with others or **Individual** for personal use.
-   3. **Category**: The default value is **User**. Categories determine which dynamic text fields are available for use in your template.
-   4. **Language**: Display installed language packs. **Language** also helps to categorize your templates.
-   5. **Create**: Opens one of two editors where you can build your template.
+Starting with a blank template means that you build and add all the data to the template.
 
-When you select **Create**, the editor page you see depends on whether your administrator has turned on the [enhanced email template editor option](cs_email_template_builder.md):
+If you select **Create an email template**, the following is displayed:
 
-- If yes, you'll use the enhanced email template editor page in Power Apps.
-- If not, you'll use the default email template editor page.
+   ![Start with a blank template option.](media\email-create-an-email-template-1a.png "Start  with a blank template option")
 
-### Enhanced email template editor overview
+Legend 
+   1. **Template name**. Assign your email template a detailed name you want to save for future use.
+   2. **Permission level**. You can share the template you create with your **Organization** or as  **Individual** for personal use.
+   3. **Category**. The default for this field is set to **User**. Categories determine which dynamic text fields are available for use in your template.
+   4. **Language**. You can display your installed language packs in this field. **Language** also helps to categorize your templates. 
+   5. **Create**. Once an email is formatted, you can create it into a template.
+   
+### New Customer Template overview
 
-:::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.":::
+If you select **New Customer Template**, the following example page displays, where you can make edits. 
 
-- **Editor** tab: [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.
+   ![New Customer Template.](media\email-new-customer-template-1c.png "New Customer Template")
 
-### Default email template editor overview
+Legend 
+   1. **New Attachments**. Allows you to include attachments to your template. 
+   2. **Subject**. Allows you to change the subject line.
+   3. **Insert dynamic text**. Allows you to use dynamic text in both the Subject line and body of the email.
 
-:::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.":::
+## Start with existing templates
 
-   1. **Insert dynamic text**: Use dynamic text in the subject and body of the email.
-   2. **Subject**: Enter or change the email subject.
-   3. **New Attachment**: Add one or more attachments to your template, if needed.
+Starting with an existing template means the template is automatically pre-populated with the pre-established data that you can customize. 
 
-## Start with existing templates
+#### Create a new email template overview
 
-Start with an existing template to create an email template faster and with less effort. The template is pre-populated with data. All you need to do is customize it for your needs.
+The following **Create a new email template** screen appears, which allows you to customize your template
 
-:::image type="content" source="media/email-start-with-existing-templates-1a.png" alt-text="Screenshot that shows existing email templates to start from.":::
+  ![Start with existing templates.](media\email-start-with-existing-templates-1a.png "Start with existing templates")
 
-   1. **Search**: Search for the name of a template to start from. Search doesn't support regular expressions.
-   2. **Browse** out-of-the-box templates, global and entity-specific, listed in alphabetical order. Global templates are shown as the type User. If you've created custom email templates, they're also listed.
-   3. **Details**. Preview the templates so that you can pick the one that best meets your needs. You can modify it as needed later.
-   4. **Select**: Insert the selected template content into your email.
+   Legend
+   1. **Search**. Allows you to search for templates. Search does not support regular expressions and it works on the template name only.
+   2. **Browse**. Allows you to browse through out-of-the-box email templates. A list of available out-of-the-box email templates (global and entity specific) will display in alphabetical order. Global templates are shown as the type User. If you've created a custom email template, it will also be displayed here. 
+   3. **Details**. Allows you to preview the email template.  When you select an email template, you can preview the content so you can pick the template that best meets your needs. After inserting an email template, you can modify the template content as needed.
+   3. **Select**. Allows you to insert the template content into your email.
 
-> [!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.
+      > [!Important] 
+      > When you begin working in the new environment, do not edit your templates in the old legacy web client; otherwise you will lose your inline images and strip out some of the advanced formatting and functionality.
 
 ### Work with existing templates
 
-:::image type="content" source="media/email-template-copy-1a.png" alt-text="Screenshot of the email template editor with an existing template open for editing.":::
+When you select an existing template, the following display appears:
+
+   ![Creating email template copies.](media\email-template-copy-1a.png "Creating email template copies")
 
-- **Template** tab: Specify or change the template details and the email subject. The name includes **– Copy** at the end to identify this template is a copy of another one.
-- **Template editor** section: [Design and customize the email template](cs-template-options.md).
-- Select **New Attachment** to add attachments to your template if needed.
+   - **Name**. The new template you created from the existing template will display **– Copy** at the end of the template name to identify it is a copy of an existing template.
+   - **Template Editor**. All of the data is carried over from the existing template which can be edited and modified.