Update Spec11 email template (#308)

* Changes to Spec11 notice email.

* Fix lines that were too long

core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy

@@ -37,17 +37,18 @@
   {/call}
 
   <p>Please work with the registrant to mitigate any security issues and have the
-    domains delisted.</p>
+    domains delisted. If you believe that any of the domains were reported in error, or are still
+    receiving reports for issues that have been remediated,
+    please <a href="https://safebrowsing.google.com/safebrowsing/report_error/?hl=en">submit a
+    request</a> to have the site reviewed.</p>
 
   {call .resourceList}
     {param resources: $resources /}
   {/call}
 
   <p>You will continue to receive a monthly summary of all domains managed by your registrar
-    that remain on our lists of potential security threats. You will additionally receive a daily
+    that remain on our lists of potential security threats. You will also receive a daily
-    notice when any new domains that are added to these lists. Once the registrant has resolved
+    notice when any new domains are added to these lists.</p>
-    the security issues and followed the steps to have his or her domain reviewed and delisted
-    it will automatically be removed from our monthly reporting.</p>
 
   <p>If you have any questions regarding this notice, please contact {$replyToEmail}.</p>
 {/template}
@@ -79,11 +80,14 @@
     {param resources: $resources /}
   {/call}
 
+   <p>If you believe that any of the domains were reported in error, or are still receiving
+   reports for issues that have been remediated,
+   please <a href="https://safebrowsing.google.com/safebrowsing/report_error/?hl=en">submit
+   a request</a> to have the site reviewed.</p>
+
   <p>You will continue to receive daily notices when new domains managed by your registrar
     are flagged for abuse, as well as a monthly summary of all of your domains under management
-    that remain flagged for abuse. Once the registrant has resolved the security issues and
+    that remain flagged for abuse.</p>
-    followed the steps to have his or her domain reviewed and delisted it will automatically
-    be removed from our reporting.</p>
 
   <p>If you would like to change the email to which these notices are sent please update your
     abuse contact using your registrar portal account.</p>

core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java

@@ -61,63 +61,40 @@ public class Spec11EmailUtilsTest {
 
   private static final ImmutableList<String> FAKE_RESOURCES = ImmutableList.of("foo");
   private static final String DAILY_EMAIL_FORMAT =
-      "Dear registrar partner,"
+      "Dear registrar partner,<p>Super Cool Registry conducts a daily analysis of all domains"
-          + ""
+          + " registered in its TLDs to identify potential security concerns. On 2018-07-15, the"
-          + "<p>Super Cool Registry conducts a daily analysis of all domains registered in its "
+          + " following domains that your registrar manages were flagged for potential security"
-          + "TLDs to identify potential security concerns. On 2018-07-15, the following domains "
+          + " concerns:</p><table><tr><th>Domain Name</th><th>Threat Type</th></tr>%s"
-          + "that your registrar manages were flagged for potential security concerns:</p>"
+          + "</table><p><b>Please communicate these findings to the registrant and work with the"
-          + ""
+          + " registrant to mitigate any security issues and have the domains delisted.</b></p>"
-          + "<table>"
-          + "<tr><th>Domain Name</th><th>Threat Type</th></tr>"
-          + "%s"
-          + "</table>"
-          + "<p><b>Please communicate these findings to the registrant and work with the "
-          + "registrant to mitigate any security issues and have the domains delisted.</b></p>"
-          + ""
           + "Some helpful resources for getting off a blocked list include:"
-          + "<ul><li>foo</li></ul><p>"
+          + "<ul><li>foo</li></ul><p>If you believe that any of the domains were reported in"
-          + ""
+          + " error, or are still receiving reports for issues that have been remediated, please"
-          + "You will continue to receive daily notices when new domains managed by your registrar "
+          + " <a href=\"https://safebrowsing.google.com/safebrowsing/report_error/?hl=en\">submit"
-          + "are flagged for abuse, as well as a monthly summary of all of your domains under "
+          + " a request</a> to have the site reviewed.</p><p>You will continue to receive daily"
-          + "management that remain flagged for abuse. Once the registrant has resolved the "
+          + " notices when new domains managed by your registrar are flagged for abuse, as well as"
-          + "security issues and followed the steps to have his or her domain reviewed and "
+          + " a monthly summary of all of your domains under management that remain flagged for"
-          + "delisted it will automatically be removed from our reporting.</p>"
+          + " abuse.</p><p>If you would like to change the email to which these notices are sent"
-          + ""
+          + " please update your abuse contact using your registrar portal account.</p><p>If you"
-          + "<p>If you would like to change the email to which these notices are sent please "
+          + " have any questions regarding this notice, please contact abuse@test.com.</p>";
-          + "update your abuse contact using your registrar portal account.</p>"
-          + ""
-          + "<p>If you have any questions regarding this notice, please contact "
-          + "abuse@test.com.</p>";
   private static final String MONTHLY_EMAIL_FORMAT =
-      "Dear registrar partner,"
+      "Dear registrar partner,<p>Super Cool Registry previously notified you when the following"
-          + ""
+          + " domains managed by your registrar were flagged for potential security"
-          + "<p>Super Cool Registry previously notified you when the following "
+          + " concerns.</p><p>The following domains that you manage continue to be flagged by our"
-          + "domains managed by your registrar were flagged for potential security concerns.</p>"
+          + " analysis for potential security concerns. This may be because the registrants have"
-          + "<p>The following domains that you manage continue to be flagged by our analysis "
+          + " not completed the requisite steps to mitigate the potential security abuse and/or"
-          + "for potential security concerns. This may be because the registrants have not "
+          + " have it reviewed and delisted.</p><table><tr><th>Domain Name</th><th>Threat"
-          + "completed the requisite steps to mitigate the potential security abuse and/or have "
+          + " Type</th></tr>%s</table><p>Please work with the registrant to mitigate any security"
-          + "it reviewed and delisted.</p>"
+          + " issues and have the domains delisted. If you believe that any of the domains were"
-          + ""
+          + " reported in error, or are still receiving reports for issues that have been"
-          + "<table>"
+          + " remediated, please <a"
-          + "<tr><th>Domain Name</th><th>Threat Type</th></tr>"
+          + " href=\"https://safebrowsing.google.com/safebrowsing/report_error/?hl=en\">submit a"
-          + "%s"
+          + " request</a> to have the site reviewed.</p>Some helpful resources for getting off a"
-          + "</table>"
+          + " blocked list include:<ul><li>foo</li></ul><p>You will continue to receive a monthly"
-          + ""
+          + " summary of all domains managed by your registrar that remain on our lists of"
-          + "<p>Please work with the registrant to mitigate any security issues "
+          + " potential security threats. You will also receive a daily notice when any new"
-          + "and have the domains delisted.</p>"
+          + " domains are added to these lists.</p><p>If you have any questions regarding this"
-          + ""
+          + " notice, please contact abuse@test.com.</p>";
-          + "Some helpful resources for getting off a blocked list include:"
-          + "<ul><li>foo</li></ul><p>"
-          + ""
-          + "You will continue to receive a monthly summary of all domains managed by your "
-          + "registrar that remain on our lists of potential security threats. You will "
-          + "additionally receive a daily notice when any new domains that are added to these "
-          + "lists. Once the registrant has resolved the security issues and followed the steps to "
-          + "have his or her domain reviewed and delisted it will automatically be removed from "
-          + "our monthly reporting.</p>"
-          + ""
-          + "<p>If you have any questions regarding this notice, please contact "
-          + "abuse@test.com.</p>";
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();