commit 0abf1ea2e43b94dc45c3a590c9668e6567f36622
Author: iwakeh <[email protected]>
Date: Mon Jan 9 15:07:27 2017 +0100
Adapt the wording to the fact that graphs are above the description.
---
website/etc/metrics.json | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/website/etc/metrics.json b/website/etc/metrics.json
index e8e7e85..1ba21a4 100644
--- a/website/etc/metrics.json
+++ b/website/etc/metrics.json
@@ -3,7 +3,7 @@
"id": "networksize",
"title": "Relays and bridges",
"type": "Graph",
- "description": "<p>The following graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> and <a
href=\"glossary.html#bridge\">bridges</a> in the network.</p>",
+ "description": "<p>This graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> and <a
href=\"glossary.html#bridge\">bridges</a> in the network.</p>",
"function": "plot_networksize",
"parameters": [
"start",
@@ -17,7 +17,7 @@
"id": "relayflags",
"title": "Relays by relay flag",
"type": "Graph",
- "description": "<p>The following graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> that have had certain <a
href=\"glossary.html#relay-flag\">flags</a> assigned by the <a
href=\"glossary.html#directory-authority\">directory authorities</a>. These
flags indicate that a relay should be preferred for either guard (\"Guard\") or
exit positions (\"Exit\"), that a relay is suitable for high-bandwidth
(\"Fast\") or long-lived circuits (\"Stable\"), or that a relay is considered a
onion service directory (\"HSDir\").</p>",
+ "description": "<p>This graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> that have had certain <a
href=\"glossary.html#relay-flag\">flags</a> assigned by the <a
href=\"glossary.html#directory-authority\">directory authorities</a>. These
flags indicate that a relay should be preferred for either guard (\"Guard\") or
exit positions (\"Exit\"), that a relay is suitable for high-bandwidth
(\"Fast\") or long-lived circuits (\"Stable\"), or that a relay is considered a
onion service directory (\"HSDir\").</p>",
"function": "plot_relayflags",
"parameters": [
"start",
@@ -32,7 +32,7 @@
"id": "versions",
"title": "Relays by version",
"type": "Graph",
- "description": "<p>The following graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> by tor software version. Relays report
their tor software version when they announce themselves in the network. More
details on when these versions were declared stable or unstable can be found on
the <a href=\"https://www.torproject.org/download/download.html\";>download
page</a> and in the <a
href=\"https://gitweb.torproject.org/tor.git/tree/ChangeLog\";>changes
file</a>.</p>",
+ "description": "<p>This graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> by tor software version. Relays report
their tor software version when they announce themselves in the network. More
details on when these versions were declared stable or unstable can be found on
the <a href=\"https://www.torproject.org/download/download.html\";>download
page</a> and in the <a
href=\"https://gitweb.torproject.org/tor.git/tree/ChangeLog\";>changes
file</a>.</p>",
"function": "plot_versions",
"parameters": [
"start",
@@ -46,7 +46,7 @@
"id": "platforms",
"title": "Relays by platform",
"type": "Graph",
- "description": "<p>The following graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> by operating system. Relays report
their operating system when they announce themselves in the network.</p>",
+ "description": "<p>This graph shows the number of running <a
href=\"glossary.html#relay\">relays</a> by operating system. Relays report
their operating system when they announce themselves in the network.</p>",
"function": "plot_platforms",
"parameters": [
"start",
@@ -60,7 +60,7 @@
"id": "bandwidth",
"title": "Total relay bandwidth",
"type": "Graph",
- "description": "<p>The following graph shows the total <a
href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of all <a
href=\"glossary.html#relay\">relays</a> in the network.</p>",
+ "description": "<p>This graph shows the total <a
href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of all <a
href=\"glossary.html#relay\">relays</a> in the network.</p>",
"function": "plot_bandwidth",
"parameters": [
"start",
@@ -74,7 +74,7 @@
"id": "bwhist-flags",
"title": "Consumed bandwidth by Exit/Guard flag combination",
"type": "Graph",
- "description": "<p>The following graph shows the <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> reported by
relays, subdivided into four distinct subsets by assigned \"Exit\" and/or
\"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>.</p>",
+ "description": "<p>This graph shows the <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> reported by
relays, subdivided into four distinct subsets by assigned \"Exit\" and/or
\"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>.</p>",
"function": "plot_bwhist_flags",
"parameters": [
"start",
@@ -88,7 +88,7 @@
"id": "bandwidth-flags",
"title": "Advertised and consumed bandwidth by relay flag",
"type": "Graph",
- "description": "<p>The following graph shows <a
href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of relays with
either \"Exit\" or \"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>
assigned by the directory authorities. These sets are not distinct, because a
relay that has both the \"Exit\" and \"Guard\" flags assigned will be included
in both sets.</p>",
+ "description": "<p>This graph shows <a
href=\"glossary.html#advertised-bandwidth\">advertised</a> and <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> of relays with
either \"Exit\" or \"Guard\" <a href=\"glossary.html#relay-flag\">flags</a>
assigned by the directory authorities. These sets are not distinct, because a
relay that has both the \"Exit\" and \"Guard\" flags assigned will be included
in both sets.</p>",
"function": "plot_bandwidth_flags",
"parameters": [
"start",
@@ -102,7 +102,7 @@
"id": "dirbytes",
"title": "Bandwidth spent on answering directory requests",
"type": "Graph",
- "description": "<p>The following graph shows the portion of <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a
href=\"glossary.html#directory-authority\">directory authorities</a> and <a
href=\"glossary.html#directory-mirror\">mirrors</a> have spent on answering
directory requests. Not all directories report these statistics, so the graph
shows an estimation of total consumed bandwidth as it would be observed if all
directories reported these statistics.</p>",
+ "description": "<p>This graph shows the portion of <a
href=\"glossary.html#bandwidth-history\">consumed bandwidth</a> that <a
href=\"glossary.html#directory-authority\">directory authorities</a> and <a
href=\"glossary.html#directory-mirror\">mirrors</a> have spent on answering
directory requests. Not all directories report these statistics, so the graph
shows an estimation of total consumed bandwidth as it would be observed if all
directories reported these statistics.</p>",
"function": "plot_dirbytes",
"parameters": [
"start",
@@ -116,7 +116,7 @@
"id": "advbwdist-perc",
"title": "Advertised bandwidth distribution",
"type": "Graph",
- "description": "<p>The following graph shows the distribution of the <a
href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of relays
in the network. Each percentile represents the advertised bandwidth that a
given percentage of relays does not exceed (and that in turn the remaining
relays either match or exceed). For example, 99% of relays advertise at most
the bandwidth value shown in the 99th percentile line (and the remaining 1%
advertise at least that amount).</p>",
+ "description": "<p>This graph shows the distribution of the <a
href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of relays
in the network. Each percentile represents the advertised bandwidth that a
given percentage of relays does not exceed (and that in turn the remaining
relays either match or exceed). For example, 99% of relays advertise at most
the bandwidth value shown in the 99th percentile line (and the remaining 1%
advertise at least that amount).</p>",
"function": "plot_advbwdist_perc",
"parameters": [
"start",
@@ -131,7 +131,7 @@
"id": "advbwdist-relay",
"title": "Advertised bandwidth of n-th fastest relays",
"type": "Graph",
- "description": "<p>The following graph shows the <a
href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of the
n-th fastest relays in the network for different values of n.</p>",
+ "description": "<p>This graph shows the <a
href=\"glossary.html#advertised-bandwidth\">advertised bandwidth</a> of the
n-th fastest relays in the network for different values of n.</p>",
"function": "plot_advbwdist_relay",
"parameters": [
"start",
@@ -151,7 +151,7 @@
"id": "userstats-relay-country",
"title": "Relay users",
"type": "Graph",
- "description": "<p>The following graph shows the estimated number of
directly-connecting <a href=\"glossary.html#client\">clients</a>; that is, it
excludes clients connecting via <a href=\"glossary.html#bridge\">bridges</a>.
These estimates are derived from the number of directory requests counted on <a
href=\"glossary.html#directory-authority\">directory authorities</a> and <a
href=\"glossary.html#directory-mirror\">mirrors</a>. Relays resolve client IP
addresses to country codes, so that graphs are available for most countries.
Furthermore, it is possible to display indications of censorship events as
obtained from an anomaly-based censorship-detection system (for more details,
see this <a
href=\"https://research.torproject.org/techreports/detector-2011-09-09.pdf\";>technical
report</a>). For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
+ "description": "<p>This graph shows the estimated number of
directly-connecting <a href=\"glossary.html#client\">clients</a>; that is, it
excludes clients connecting via <a href=\"glossary.html#bridge\">bridges</a>.
These estimates are derived from the number of directory requests counted on <a
href=\"glossary.html#directory-authority\">directory authorities</a> and <a
href=\"glossary.html#directory-mirror\">mirrors</a>. Relays resolve client IP
addresses to country codes, so that graphs are available for most countries.
Furthermore, it is possible to display indications of censorship events as
obtained from an anomaly-based censorship-detection system (for more details,
see this <a
href=\"https://research.torproject.org/techreports/detector-2011-09-09.pdf\";>technical
report</a>). For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
"function": "plot_userstats_relay_country",
"parameters": [
"start",
@@ -213,7 +213,7 @@
"id": "userstats-bridge-country",
"title": "Bridge users by country",
"type": "Graph",
- "description": "<p>The following graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges resolve client IP addresses of
incoming directory requests to country codes, so that graphs are available for
most countries. For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
+ "description": "<p>This graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges resolve client IP addresses of
incoming directory requests to country codes, so that graphs are available for
most countries. For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
"function": "plot_userstats_bridge_country",
"parameters": [
"start",
@@ -250,7 +250,7 @@
"id": "userstats-bridge-transport",
"title": "Bridge users by transport",
"type": "Graph",
- "description": "<p>The following graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges distinguish connecting clients
by transport protocol, which may include <a
href=\"glossary.html#pluggable-transport\">pluggable transports</a>, so that
graphs are available for different transports. For further details see these
<a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
+ "description": "<p>This graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges distinguish connecting clients
by transport protocol, which may include <a
href=\"glossary.html#pluggable-transport\">pluggable transports</a>, so that
graphs are available for different transports. For further details see these
<a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
"function": "plot_userstats_bridge_transport",
"parameters": [
"start",
@@ -265,7 +265,7 @@
"id": "userstats-bridge-combined",
"title": "Bridge users by country and transport",
"type": "Graph",
- "description": "<p>The following graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges resolve client IP addresses of
incoming directory requests to country codes, and they distinguish connecting
clients by transport protocol, which may include <a
href=\"glossary.html#pluggable-transport\">pluggable transports</a>. Even
though bridges don't report a combination of clients by country and transport,
it's possible to derive and graph lower and upper bounds from existing usage
statistics. For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
+ "description": "<p>This graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges resolve client IP addresses of
incoming directory requests to country codes, and they distinguish connecting
clients by transport protocol, which may include <a
href=\"glossary.html#pluggable-transport\">pluggable transports</a>. Even
though bridges don't report a combination of clients by country and transport,
it's possible to derive and graph lower and upper bounds from existing usage
statistics. For further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
"function": "plot_userstats_bridge_combined",
"parameters": [
"start",
@@ -280,7 +280,7 @@
"id": "userstats-bridge-version",
"title": "Bridge users by IP version",
"type": "Graph",
- "description": "<p>The following graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges distinguish connecting clients
by IP version, so that graphs are available for both IP versions 4 and 6. For
further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
+ "description": "<p>This graph shows the estimated number of <a
href=\"glossary.html#client\">clients</a> connecting via <a
href=\"glossary.html#bridge\">bridges</a>. These numbers are derived from
directory requests counted on bridges. Bridges distinguish connecting clients
by IP version, so that graphs are available for both IP versions 4 and 6. For
further details see these <a
href=\"https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt\";>questions
and answers about user statistics</a>.</p>",
"function": "plot_userstats_bridge_version",
"parameters": [
"start",
@@ -301,7 +301,7 @@
"id": "torperf",
"title": "Time to download files over Tor",
"type": "Graph",
- "description": "<p>The following graph shows overall performance when
downloading static files of different sizes over Tor. The graph shows the
range of measurements from first to third quartile, and highlights the median.
The slowest and fastest quarter of measurements are omitted from the
graph.</p>",
+ "description": "<p>This graph shows overall performance when downloading
static files of different sizes over Tor. The graph shows the range of
measurements from first to third quartile, and highlights the median. The
slowest and fastest quarter of measurements are omitted from the graph.</p>",
"function": "plot_torperf",
"parameters": [
"start",
@@ -317,7 +317,7 @@
"id": "torperf-failures",
"title": "Timeouts and failures of downloading files over Tor",
"type": "Graph",
- "description": "<p>The following graph shows the fraction of timeouts and
failures when downloading static files of different sizes over Tor. A timeout
occurs when a download does not complete within the scheduled time, in which
case it is aborted in order not to overlap with the next scheduled download. A
failure occurs when the download completes, but the response is smaller than
expected.</p>",
+ "description": "<p>This graph shows the fraction of timeouts and failures
when downloading static files of different sizes over Tor. A timeout occurs
when a download does not complete within the scheduled time, in which case it
is aborted in order not to overlap with the next scheduled download. A failure
occurs when the download completes, but the response is smaller than
expected.</p>",
"function": "plot_torperf_failures",
"parameters": [
"start",
@@ -333,7 +333,7 @@
"id": "connbidirect",
"title": "Fraction of connections used uni-/bidirectionally",
"type": "Graph",
- "description": "<p>The following graph shows the fraction of direct
connections between a <a href=\"glossary.html#relay\">relay</a> and other nodes
in the network that are used uni- or bi-directionally. Every 10 seconds,
relays determine for every direct connection whether they read and wrote less
than a threshold of 20 KiB. Connections below this threshold are excluded from
the graph. For the remaining connections, relays determine whether they
read/wrote at least 10 times as many bytes as they wrote/read. If so, they
classify a connection as \"Mostly reading\" or \"Mostly writing\",
respectively. All other connections are classified as \"Both reading and
writing\". After classifying connections, read and write counters are reset
for the next 10-second interval. The graph shows daily medians and
inter-quartile ranges of reported fractions.</p>",
+ "description": "<p>This graph shows the fraction of direct connections
between a <a href=\"glossary.html#relay\">relay</a> and other nodes in the
network that are used uni- or bi-directionally. Every 10 seconds, relays
determine for every direct connection whether they read and wrote less than a
threshold of 20 KiB. Connections below this threshold are excluded from the
graph. For the remaining connections, relays determine whether they read/wrote
at least 10 times as many bytes as they wrote/read. If so, they classify a
connection as \"Mostly reading\" or \"Mostly writing\", respectively. All
other connections are classified as \"Both reading and writing\". After
classifying connections, read and write counters are reset for the next
10-second interval. The graph shows daily medians and inter-quartile ranges of
reported fractions.</p>",
"function": "plot_connbidirect",
"parameters": [
"start",
@@ -347,7 +347,7 @@
"id": "hidserv-dir-onions-seen",
"title": "Unique .onion addresses",
"type": "Graph",
- "description": "<p>The following graph shows the number of unique .onion
addresses in the network per day. These numbers are extrapolated from
aggregated statistics on unique .onion addresses reported by single <a
href=\"glossary.html#relay\">relays</a> acting as <a
href=\"glossary.html#onion-service\">onion-service</a> directories, if at least
1% of relays reported these statistics. For more details on the extrapolation
algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
+ "description": "<p>This graph shows the number of unique .onion addresses
in the network per day. These numbers are extrapolated from aggregated
statistics on unique .onion addresses reported by single <a
href=\"glossary.html#relay\">relays</a> acting as <a
href=\"glossary.html#onion-service\">onion-service</a> directories, if at least
1% of relays reported these statistics. For more details on the extrapolation
algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
"function": "plot_hidserv_dir_onions_seen",
"parameters": [
"start",
@@ -361,7 +361,7 @@
"id": "hidserv-rend-relayed-cells",
"title": "Onion-service traffic",
"type": "Graph",
- "description": "<p>The following graph shows the amount of onion-service
traffic in the network per day. This number is extrapolated from aggregated
statistics on onion-service traffic reported by single <a
href=\"glossary.html#relay\">relays</a> acting as rendezvous points for <a
href=\"glossary.html#onion-service\">onion services</a>, if at least 1% of
relays reported these statistics. For more details on the extrapolation
algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
+ "description": "<p>This graph shows the amount of onion-service traffic in
the network per day. This number is extrapolated from aggregated statistics on
onion-service traffic reported by single <a
href=\"glossary.html#relay\">relays</a> acting as rendezvous points for <a
href=\"glossary.html#onion-service\">onion services</a>, if at least 1% of
relays reported these statistics. For more details on the extrapolation
algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
"function": "plot_hidserv_rend_relayed_cells",
"parameters": [
"start",
@@ -375,7 +375,7 @@
"id": "hidserv-frac-reporting",
"title": "Fraction of relays reporting onion-service statistics",
"type": "Graph",
- "description": "<p>The following graph shows the fraction of <a
href=\"glossary.html#relay\">relays</a> that report statistics on <a
href=\"glossary.html#onion-service\">onion service</a> usage. If at least 1%
of relays report a statistic, it gets extrapolated towards a network total,
where higher fractions are produce more accurate results. For more details on
the extrapolation algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
+ "description": "<p>This graph shows the fraction of <a
href=\"glossary.html#relay\">relays</a> that report statistics on <a
href=\"glossary.html#onion-service\">onion service</a> usage. If at least 1%
of relays report a statistic, it gets extrapolated towards a network total,
where higher fractions are produce more accurate results. For more details on
the extrapolation algorithm, see <a
href=\"https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post</a> and <a
href=\"https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>this
technical report</a>.</p>",
"function": "plot_hidserv_frac_reporting",
"parameters": [
"start",
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
