Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

[civicrm-core.git] / templates / CRM / Event / Form / ManageEvent / Registration.hlp

diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/templates/CRM/Event/Form/ManageEvent/Registration.hlp
index c652afad2c15b3d6a248ba116f4c4b445c161dcb..18a509600b867d9bb2833703bd744c529ed01414 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/Registration.hlp
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.hlp
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 3.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2010                                |
  +--------------------------------------------------------------------+
@@ -71,8 +71,14 @@
   {ts}Allow Shared Email{/ts}
 {/htxt}
 {htxt id="id-allow_same_email"}
-<p>{ts}Check this box to allow a user to register multiple participants using the same email address. If you want additional participants to be registered <strong>without requiring an email address to be entered for each person</strong> - check the "Register multiple participants" option, AND include a profile in this registration form which <strong>includes First Name and Last Name fields</strong>.{/ts}</p>
-<p>{ts}You will also need to update the default strict duplicate contact matching rule for Individuals to include First Name and Last Name fields (Contacts &raquo; Find and Merge Duplicate Contacts).{/ts}</p>
+<p>{ts}Check this box to allow a user to register multiple participants using the same email address. Alternatively, if you want additional participants to be registered <strong>without requiring an email address to be entered for each person</strong> - check the "Register multiple participants" option, AND include a profile in this registration form which <strong>includes First Name and Last Name fields</strong>.{/ts}</p>
+{/htxt}
+
+{htxt id="id-dedupe_rule_group_id-title"}
+  {ts}Duplicate Matching Rule{/ts}
+{/htxt}
+{htxt id="id-dedupe_rule_group_id"}
+<p>{ts}By default, your event will use the Unsupervised duplicate matching rule to match participants in anonymous registrations with existing individuals. You may select another rule to use for this event instead. Make sure that your included profile(s) contain the fields needed by your matching rule.{/ts}</p>
 {/htxt}
 
 {htxt id="id-requires_approval-title"}