From 135b09cab1aa7f53bd7604d965f3fa0e5c86227d Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Tue, 27 Jan 2015 12:13:09 +0000
Subject: add description of spam address list

Note this includes the wish-list "Mark as Spam button" text which
hasn't been implemented yet.
---
 docs/glossary.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'docs/glossary.md')

diff --git a/docs/glossary.md b/docs/glossary.md
index 441222d04..ce4986b2d 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -46,6 +46,7 @@ Definitions
   <li><a href="#response">response</a></li>
   <li><a href="#rails">Ruby&nbsp;on&nbsp;Rails</a></li>
   <li><a href="#sass">Sass</a></li>
+  <li><a href="#spam-address-list">spam address list</a></li>
   <li><a href="#staging">staging site</a></li>
   <li><a href="#state">state</a></li>
   <li><a href="#super">superuser</a></li>
@@ -866,6 +867,33 @@ Definitions
     </div>
   </dd>
 
+  <dt>
+    <a name="spam-address-list">spam address list</a>
+  </dt>
+  <dd>
+    Alaveteli maintains a <strong>spam address list</strong>. Any incoming message to an email
+    address on that list will be rejected and won't appear in the admin.
+    <p>
+      This is mainly for email addresses whose messages are ending up
+      in the <a href="#holding_pen" class="glossary__link">holding pen</a>, because
+      those are typically addresses that can be safely ignored as they do not
+      relate to an active <a href="#request" class="glossary__link">request</a>.
+    </p>
+    <div class="more-info">
+      <p>More information:</p>
+      <ul>
+        <li>
+          To add addresses to the spam address list , see
+          <a href="{{ site.baseurl }}docs/running/admin_manual/#rejecting-spam-that-arrives-in-the-holding-pen">Rejecting
+          spam that arrives in the holding pen</a>.
+        </li>
+        <li>
+          The spam address list is available on your site at <code>/admin/spam_addresses</code>.
+        </li>
+      </ul>
+    </div>
+  </dd>
+
   <dt>
     <a name="staging">staging server</a> (also: staging site)
   </dt>
-- 
cgit v1.2.3