[tor-commits] [metrics-web/master] Add more links to CollecTor.

[karsten at torproject.org]

commit 2f870ba35b0353e46d25f5b2289445466e2e88eb
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Jun 5 13:07:42 2014 +0200

    Add more links to CollecTor.
---
 website/web/WEB-INF/formats.jsp |    6 ++++++
 website/web/WEB-INF/tools.jsp   |    6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/website/web/WEB-INF/formats.jsp b/website/web/WEB-INF/formats.jsp
index 4d297b2..ea0c3a2 100644
--- a/website/web/WEB-INF/formats.jsp
+++ b/website/web/WEB-INF/formats.jsp
@@ -13,6 +13,12 @@
 <h2>Tor Metrics Portal: Data Formats</h2>
 <br>
 
+<p><font color="red"><b>Notice:</b> The file formats explained on this
+site are now available on:
+<a href="https://collector.torproject.org/formats.html">https://collector.torproject.org/formats.html</a>.
+This page will be automatically redirected there after August 3,
+2014.</font>
+</p>
 <p>
 Statistical analysis in the Tor network can be performed using various
 kinds of data.
diff --git a/website/web/WEB-INF/tools.jsp b/website/web/WEB-INF/tools.jsp
index 8929d74..b6754d5 100644
--- a/website/web/WEB-INF/tools.jsp
+++ b/website/web/WEB-INF/tools.jsp
@@ -12,6 +12,12 @@
     <div class="main-column">
         <h2>Tor Metrics Portal: Tools</h2>
         <br>
+        <p><font color="red"><b>Notice:</b> The tools listed on this site
+        are now available on:
+        <a href="https://collector.torproject.org/#references">https://collector.torproject.org/#references</a>.
+        This page will be automatically redirected there after August 3,
+        2014.</font>
+        </p>
         <p>The metrics website and related websites depend on a collection
         of services that measure, archive, process, and finally present Tor
         network data.