Merge remote-tracking branch 'upstream/master' into origin/norway3origin/norway3norway3

1 files changed, 17 insertions, 5 deletions

diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb
index 5a0418f..f6be968 100644
--- a/lib/views/help/officers.html.erb
+++ b/lib/views/help/officers.html.erb
@@ -170,10 +170,13 @@
         responses to requests.  Please <a href="<%= help_contact_path %>">contact us</a> if we've
         missed one.
         For technical reasons we don't always remove them from attachments, such as certain PDFs.</p>
-      <p>If you need to know what an address was that we've removed, please <a
-        href="<%= help_contact_path %>">get in touch with us</a>. Occasionally, an email address
-        forms an important part of a response and we will post it up in an obscured
-        form in an annotation.
+    <p>If you need to know what an address was that we've removed, please <a
+      href="<%= help_contact_path %>">get in touch with us</a>.
+      <% if AlaveteliConfiguration::enable_annotations %>
+        Occasionally, an email address forms an important part of a response
+        and we will post it up in an obscured form in an annotation.
+      <% end %>
+    </p>
     </dd>
 
     <dt id="copyright"><a id="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
@@ -187,10 +190,19 @@
       requests, and for good public relations, we'd advise you not to do that.
     </dd>
 
+    <dt id="allowed_responses">My response to an old request on <%= site_name %> has been bounced!<a href="#allowed_responses">#</a> </dt>
+      <dd>After six months of inactivity, <%= site_name %> limits who can respond to a request to stop
+      spammers targeting old requests. At that point, the request can only be responded to by someone who's
+      from the authority. After twelve months, the request is closed to responses from anyone. If you need an
+      old request to be re-opened so that you can respond to it, please <a href="<%= help_contact_path %>">
+      contact us</a>.
+      </dd>
+
+
   </dl>
 
   <p><strong>If you haven't already</strong>, read <a href="<%= help_about_path %>">the introduction</a> --&gt;
     <br><strong>Otherwise</strong>, the <a href="<%= help_credits_path %>">credits</a> or the <a href="<%= help_api_path %>">programmers API</a> --&gt;
 
     <div id="hash_link_padding"></div>
-</div>
\ No newline at end of file
+</div>