commit 245bc7da3d0cb4b53f10d9fcf8589d54bd4348c0 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Thu Jun 26 14:28:16 2014 +0200 Rename Tor Metrics Portal to just Tor Metrics. --- website/web/WEB-INF/bubbles.jsp | 2 +- website/web/WEB-INF/data.jsp | 4 ++-- website/web/WEB-INF/dir.jsp | 4 ++-- website/web/WEB-INF/error.jsp | 4 ++-- website/web/WEB-INF/formats.jsp | 4 ++-- website/web/WEB-INF/graphs.jsp | 4 ++-- website/web/WEB-INF/index.jsp | 8 ++++---- website/web/WEB-INF/network.jsp | 4 ++-- website/web/WEB-INF/papers.jsp | 4 ++-- website/web/WEB-INF/performance.jsp | 4 ++-- website/web/WEB-INF/relay-search.jsp | 4 ++-- website/web/WEB-INF/research.jsp | 4 ++-- website/web/WEB-INF/stats.jsp | 6 +++--- website/web/WEB-INF/status.jsp | 4 ++-- website/web/WEB-INF/tools.jsp | 4 ++-- website/web/WEB-INF/users.jsp | 4 ++-- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp index 59b3025..5e65d16 100644 --- a/website/web/WEB-INF/bubbles.jsp +++ b/website/web/WEB-INF/bubbles.jsp @@ -2,7 +2,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Network bubble graphs</title> + <title>Tor Metrics: Network bubble graphs</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> diff --git a/website/web/WEB-INF/data.jsp b/website/web/WEB-INF/data.jsp index 0981201..1828c03 100644 --- a/website/web/WEB-INF/data.jsp +++ b/website/web/WEB-INF/data.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Data</title> + <title>Tor Metrics: Data</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Data</h2> + <h2>Tor Metrics: Data</h2> <br> <p><font color="red"><b>Notice:</b> The files linked on this site are now available on: diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp index 1ac1819..ac4aca3 100644 --- a/website/web/WEB-INF/dir.jsp +++ b/website/web/WEB-INF/dir.jsp @@ -2,7 +2,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Index of ${directory}</title> + <title>Tor Metrics: Index of ${directory}</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -11,7 +11,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Index of ${directory}</h2> + <h2>Tor Metrics: Index of ${directory}</h2> <br> <c:forEach var="file" items="${files}" > <a href="${directory}/${file}${extension}">${file}${extension}</a><br> diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp index 80ef077..79ac86e 100644 --- a/website/web/WEB-INF/error.jsp +++ b/website/web/WEB-INF/error.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Error</title> + <title>Tor Metrics: Error</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -12,7 +12,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Error</h2> +<h2>Tor Metrics: Error</h2> <br> <p> Oops! Something went wrong here! We encountered a diff --git a/website/web/WEB-INF/formats.jsp b/website/web/WEB-INF/formats.jsp index ea0c3a2..92fd699 100644 --- a/website/web/WEB-INF/formats.jsp +++ b/website/web/WEB-INF/formats.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Data Formats</title> + <title>Tor Metrics: Data Formats</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Data Formats</h2> +<h2>Tor Metrics: Data Formats</h2> <br> <p><font color="red"><b>Notice:</b> The file formats explained on this diff --git a/website/web/WEB-INF/graphs.jsp b/website/web/WEB-INF/graphs.jsp index 58c122c..084d085 100644 --- a/website/web/WEB-INF/graphs.jsp +++ b/website/web/WEB-INF/graphs.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Graphs</title> + <title>Tor Metrics: Graphs</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Graphs</h2> + <h2>Tor Metrics: Graphs</h2> <br> <p>The graphs on this page visualize a small portion of the data gathered in the Tor Metrics Project. The following graphs are diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index 9accc2b..a563cf5 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal</title> + <title>Tor Metrics</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,11 +10,11 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal</h2> + <h2>Tor Metrics</h2> <br> - <p>The Tor Metrics Portal aggregates all kinds of interesting + <p>Tor Metrics aggregates all kinds of interesting data about the Tor network and visualizes them in graphs and - reports. This portal also provides easy access to the underlying + reports. This also provides easy access to the underlying data and documentation for performing own analyses based on these data. Find out more here:</p> <ul> diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp index 66b878f..c291bb3 100644 --- a/website/web/WEB-INF/network.jsp +++ b/website/web/WEB-INF/network.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Network</title> + <title>Tor Metrics: Network</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Network</h2> +<h2>Tor Metrics: Network</h2> <br> <a name="networksize"></a> <h3><a href="#networksize" class="anchor">Relays and bridges in the diff --git a/website/web/WEB-INF/papers.jsp b/website/web/WEB-INF/papers.jsp index 1a48491..a9a8d04 100644 --- a/website/web/WEB-INF/papers.jsp +++ b/website/web/WEB-INF/papers.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Papers</title> + <title>Tor Metrics: Papers</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Papers</h2> + <h2>Tor Metrics: Papers</h2> <br> <p>The <a href="#papers">papers</a>, <a href="#techreports">technical reports</a>, and diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp index e220b59..4a87a55 100644 --- a/website/web/WEB-INF/performance.jsp +++ b/website/web/WEB-INF/performance.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Performance</title> + <title>Tor Metrics: Performance</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -12,7 +12,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Performance</h2> +<h2>Tor Metrics: Performance</h2> <br> <a name="torperf"></a> <h3><a href="#torperf" class="anchor">Time to download files over diff --git a/website/web/WEB-INF/relay-search.jsp b/website/web/WEB-INF/relay-search.jsp index 90b7512..7f15a3c 100644 --- a/website/web/WEB-INF/relay-search.jsp +++ b/website/web/WEB-INF/relay-search.jsp @@ -3,7 +3,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Relay Search</title> + <title>Tor Metrics: Relay Search</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -12,7 +12,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Relay Search</h2> + <h2>Tor Metrics: Relay Search</h2> <p><font color="red">Sorry, this service has been shut down on June 10, 2014. Possible alternatives are <a href="https://atlas.torproject.org">Atlas</a> and diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index b0a7277..c203619 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Research</title> + <title>Tor Metrics: Research</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Research</h2> + <h2>Tor Metrics: Research</h2> <br> <p>The Tor Metrics Project aims at supporting privacy enhancing technologies research by making gathered network diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp index 4e6c9fb..d708910 100644 --- a/website/web/WEB-INF/stats.jsp +++ b/website/web/WEB-INF/stats.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Statistics</title> + <title>Tor Metrics: Statistics</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,10 +10,10 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Statistics</h2> +<h2>Tor Metrics: Statistics</h2> <br> -<p>The metrics portal aggregates large amounts of Tor network +<p>Tor Metrics aggregates large amounts of Tor network <a href="data.html">data</a> and visualizes results in customizable <a href="graphs.html">graphs</a> and tables. All aggregated data are also available for download, so that people can diff --git a/website/web/WEB-INF/status.jsp b/website/web/WEB-INF/status.jsp index 0187c82..5142b7f 100644 --- a/website/web/WEB-INF/status.jsp +++ b/website/web/WEB-INF/status.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Status</title> + <title>Tor Metrics: Status</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Status</h2> + <h2>Tor Metrics: Status</h2> <br> <p>The network data collected by the Tor Metrics Project can be used to analyze the Tor network status from a few years ago until diff --git a/website/web/WEB-INF/tools.jsp b/website/web/WEB-INF/tools.jsp index b6754d5..0e1a5fc 100644 --- a/website/web/WEB-INF/tools.jsp +++ b/website/web/WEB-INF/tools.jsp @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Tools</title> + <title>Tor Metrics: Tools</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -10,7 +10,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> - <h2>Tor Metrics Portal: Tools</h2> + <h2>Tor Metrics: Tools</h2> <br> <p><font color="red"><b>Notice:</b> The tools listed on this site are now available on: diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 91f8ca2..84cab43 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -4,7 +4,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>Tor Metrics Portal: Users</title> + <title>Tor Metrics: Users</title> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> @@ -13,7 +13,7 @@ <div class="center"> <%@ include file="banner.jsp"%> <div class="main-column"> -<h2>Tor Metrics Portal: Users</h2> +<h2>Tor Metrics: Users</h2> <br> <a name="userstats-relay-country"></a>