From 4df5878ba5929e0979ee9096186ddee1b4552730 Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@jmaconsulting.biz>
Date: Wed, 26 Apr 2017 19:44:33 +0530
Subject: [PATCH] CRM-20308: Document the new behaivour under help icon

---
 templates/CRM/Activity/Form/Activity.hlp | 9 +++++++++
 templates/CRM/Activity/Form/Activity.tpl | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/CRM/Activity/Form/Activity.hlp b/templates/CRM/Activity/Form/Activity.hlp
index f56c175b86..e0d5567235 100644
--- a/templates/CRM/Activity/Form/Activity.hlp
+++ b/templates/CRM/Activity/Form/Activity.hlp
@@ -35,3 +35,12 @@
     {ts}You can optionally assign this activity to someone. Assigned activities will appear in their Activities listing at CiviCRM Home.{/ts}
   </p>
 {/htxt}
+
+{htxt id="sent_copy_email"}
+  <p>
+    {ts}When CiviCRM emails a copy of this activity to each assignees, that email will come from the contact listed under "Added By".{/ts}
+  </p>
+  <p>
+    {ts}If (in rare cases) that contact has no email address, then CiviCRM will send the email from the default "from" email address configured for this domain. And finally, if that email address has not been configured, then CiviCRM will send the email from the email address associated with the currently logged in user who creates this activity.{/ts}
+  </p>
+{/htxt}
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 3ab51454b0..937ef5fc5f 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -101,7 +101,7 @@
           {/if}
           {if $activityAssigneeNotification}
             <br />
-            <span class="description"><i class="crm-i fa-paper-plane"></i> {ts}A copy of this activity will be emailed to each Assignee.{/ts}</span>
+            <span class="description"><i class="crm-i fa-paper-plane"></i> {ts}A copy of this activity will be emailed to each Assignee.{/ts} {help id="sent_copy_email"}</span>
           {/if}
         {/if}
       </td>
-- 
2.25.1