commit baaf9c81487646a3dc7f4aee7679ea7af0165ba7
Author: Karsten Loesing <[email protected]>
Date: Sun Mar 19 16:37:46 2017 +0100
Change CollecTor links to the new page.
---
website/src/main/resources/web/WEB-INF/development.jsp | 2 +-
website/src/main/resources/web/WEB-INF/metrics-lib.jsp | 6 +++---
website/src/main/resources/web/WEB-INF/stats.jsp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/website/src/main/resources/web/WEB-INF/development.jsp
b/website/src/main/resources/web/WEB-INF/development.jsp
index 2627530..9b35364 100644
--- a/website/src/main/resources/web/WEB-INF/development.jsp
+++ b/website/src/main/resources/web/WEB-INF/development.jsp
@@ -19,7 +19,7 @@
<div class="container">
<h2>Parsing libraries <a href="#libraries" name="libraries"
class="anchor">#</a></h2>
- <p>The following libraries help you with parsing Tor network data from
the <a href="https://collector.torproject.org/"; target="_blank">CollecTor</a>
service.</p>
+ <p>The following libraries help you with parsing Tor network data from
the <a href="collector.html">CollecTor</a> service.</p>
<ul>
<li><a href="metrics-lib.html">Tor Metrics Library</a> is a Java
library to fetch and parse Tor descriptors.</li>
<li><a href="https://stem.torproject.org/"; target="_blank">Stem</a> is
a Python library that parses Tor descriptors.</li>
diff --git a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp
b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp
index 44b2a79..4188a42 100644
--- a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp
+++ b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp
@@ -18,7 +18,7 @@
<div class="jumbotron">
<div class="text-center">
<h2>Tor Metrics Library</h2>
-<p>Tor Metrics Library is a Java API that facilitates processing Tor network
data from the <a href="https://collector.torproject.org/";>CollecTor</a> service
for statistical analysis and for building services and applications.</p>
+<p>Tor Metrics Library is a Java API that facilitates processing Tor network
data from the <a href="collector.html">CollecTor</a> service for statistical
analysis and for building services and applications.</p>
<a class="btn btn-primary btn-lg" style="margin: 10px"
href="https://dist.torproject.org/metrics-lib/?C=M;O=D";><i class="fa
fa-chevron-right" aria-hidden="true"></i> Download Release</a>
<a class="btn btn-primary btn-lg" style="margin: 10px"
href="https://gitweb.torproject.org/metrics-lib.git/plain/CHANGELOG.md";><i
class="fa fa-chevron-right" aria-hidden="true"></i> View Change Log</a>
<a class="btn btn-primary btn-lg" style="margin: 10px" href="metrics-lib/"><i
class="fa fa-chevron-right" aria-hidden="true"></i> Browse JavaDocs</a>
@@ -36,13 +36,13 @@
<h1>metrics-lib</h1>
-<p>Welcome to metrics-lib, a Java API that facilitates processing Tor network
data from the <a href="https://collector.torproject.org/";>CollecTor</a> service
for statistical analysis and for building services and applications.</p>
+<p>Welcome to metrics-lib, a Java API that facilitates processing Tor network
data from the <a href="collector.html">CollecTor</a> service for statistical
analysis and for building services and applications.</p>
<p>In the tutorials below we're explaining the basic steps to get you started
with metrics-lib.</p>
<h2 id="prerequisites">Prerequisites and preparation <a href="#prerequisites"
class="anchor">#</a></h2>
-<p>The following tutorials are written with an audience in mind that knows
Java and to a lesser extent how Tor works. We explain all data used in the
tutorials. More and most up-to-date information about descriptors can be found
in the <a
href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt";>Tor
directory protocol specification</a> and on the <a
href="https://collector.torproject.org/";>CollecTor website</a>.</p>
+<p>The following tutorials are written with an audience in mind that knows
Java and to a lesser extent how Tor works. We explain all data used in the
tutorials. More and most up-to-date information about descriptors can be found
in the <a
href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt";>Tor
directory protocol specification</a> and on the <a
href="collector.html">CollecTor page</a>.</p>
<p>All tutorials require you to <a
href="https://dist.torproject.org/descriptor/?C=M;O=D";>download</a> the latest
release of metrics-lib, follow the instructions to <a
href="https://gitweb.torproject.org/metrics-lib.git/tree/README.md";>verify</a>
its signature, extract the tarball locally, and copy the <code>lib/</code> and
the <code>generated/</code> directories to your working directory for the
tutorials.</p>
diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp
b/website/src/main/resources/web/WEB-INF/stats.jsp
index 2d5a69d..fd3fd6d 100644
--- a/website/src/main/resources/web/WEB-INF/stats.jsp
+++ b/website/src/main/resources/web/WEB-INF/stats.jsp
@@ -320,7 +320,7 @@ tool, which periodically fetches static files over Tor and
records several
timestamps in the process. The data file contains daily medians and quartiles
as well as total numbers of requests, timeouts, and failures. Raw Torperf
measurement data are available on the <a
-href="https://collector.torproject.org/#torperf";>CollecTor</a> website.</p>
+href="collector.html#torperf">CollecTor</a> website.</p>
<p><b>Download as <a href="stats/torperf.csv">CSV file</a>.</b></p>
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
