From db04a3a87d4b5099bbaab34ad12dacfea3f5169c Mon Sep 17 00:00:00 2001
From: Tim Bishop <tim@bishnet.net>
Date: Fri, 9 Aug 2013 02:20:37 +0000
Subject: [PATCH] Update now RT has been deprecated.

---
 www/index.xhtml        | 24 ++++++++++++++++++++++++
 www/mailinglists.xhtml |  2 +-
 www/support.xhtml      | 11 ++++++-----
 www/who.xhtml          |  2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/www/index.xhtml b/www/index.xhtml
index 7badf4e..8646b97 100644
--- a/www/index.xhtml
+++ b/www/index.xhtml
@@ -32,6 +32,30 @@
           <h2>
             <a id="news">News</a>
           </h2>
+          <h3>
+            Friday 9 August 2013
+          </h3>
+          <h4>
+            Old ticket tracker removed
+          </h4>
+          <p>
+            Our old email based support system has now been
+            deprecated, along with the two email addresses that pointed
+            at it - bugs@ and support@. The main reason for this was
+            the sheer amount of spam we were getting, even with
+            anti-spam measures in place. But also because the amount
+            of issues logged outweighs the need to run our own system
+            at the moment.
+          </p>
+          <p>
+            If you have an issue to report, please see our
+            <a href="support.xhtml">bug reporting page</a> for more
+            information on the best way to do it. If you had an
+            outstanding issue in the old system we should have
+            contacted you by now, so if you haven't heard anything
+            from us assume it got lost and log a new issue as
+            described on the aforementioned page.
+          </p>
           <h3>
             Thursday 8 August 2013
           </h3>
diff --git a/www/mailinglists.xhtml b/www/mailinglists.xhtml
index b717cbd..bad56a8 100644
--- a/www/mailinglists.xhtml
+++ b/www/mailinglists.xhtml
@@ -38,7 +38,7 @@
             <b>State:</b> Open for subscription, but no posts should be
             sent here.<br />
             <b>Purpose:</b> Emails are sent to this list whenever a
-            commit happens to the i-scream Git or CVS repositories. If
+            commit happens to the i-scream Git repositories. If
             you want to be informed about commits as they happen, join
             this list.
           </p>
diff --git a/www/support.xhtml b/www/support.xhtml
index 3ac8e98..69c2ae2 100644
--- a/www/support.xhtml
+++ b/www/support.xhtml
@@ -28,12 +28,13 @@
             lists <a href="mailinglists.xhtml">here</a>.
           </p>
           <p>
-            If there issue needs to remain private, for example a
+            If the issue needs to remain private, for example a
             security issue, please contact Tim directly. His details
-            are on the <a href="who.xhtml">Who We Are</a> page. This
-            should only be used in exceptional circumstances - we
-            prefer all discussion to happen on public mailing lists or
-            bug trackers where possible.
+            are on the <a href="who.xhtml">Who We Are</a> page, and
+            you can use his PGP key to encrypt the message if
+            necessary. This should only be used in exceptional
+            circumstances - we prefer all discussion to happen on
+            public mailing lists or bug trackers where possible.
           </p>
         </div>
 <!--#include virtual="/footer.inc" -->
diff --git a/www/who.xhtml b/www/who.xhtml
index d71fbcc..7dfdbb4 100644
--- a/www/who.xhtml
+++ b/www/who.xhtml
@@ -31,7 +31,7 @@
             Current team
           </h2>
           <p>
-            <b>Tim Bishop</b> - tdb@i-scream.org
+            <b>Tim Bishop</b> - tdb@i-scream.org - PGP Key 0x6C226B37FDF38D55
           </p>
           <ul>
             <li>
-- 
2.44.0