commit b7704a6ace20c077873c04a744abf94b6dda9730 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Sat Jan 9 17:40:51 2016 +0100 Rename "FreeBSD" to "BSD" in platform graphs. In fact, the "FreeBSD" line always contained non-FreeBSD-BSDs, so calling all of them "FreeBSD" was wrong. Spotted by Fabian Keil. --- modules/legacy/db/tordir.sql | 2 +- website/rserve/graphs.R | 2 +- website/web/WEB-INF/servers-data.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/legacy/db/tordir.sql b/modules/legacy/db/tordir.sql index f52e89b..e5f02f3 100644 --- a/modules/legacy/db/tordir.sql +++ b/modules/legacy/db/tordir.sql @@ -914,7 +914,7 @@ UNION ALL NULL AS bridges FROM relay_platforms WHERE date < current_date - 1) UNION ALL (SELECT date, NULL AS flag, NULL AS country, NULL AS version, - 'FreeBSD' AS platform, NULL AS ec2bridge, avg_bsd AS relays, + 'BSD' AS platform, NULL AS ec2bridge, avg_bsd AS relays, NULL AS bridges FROM relay_platforms WHERE date < current_date - 1) UNION ALL (SELECT date, NULL AS flag, NULL AS country, NULL AS version, diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index c35f1ec..75680b6 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -421,7 +421,7 @@ plot_platforms <- function(start, end, path) { scale_y_continuous(name = "", limits = c(0, max(platforms$value, na.rm = TRUE))) + scale_colour_manual(name = "Platform", - breaks = c("Linux", "Darwin", "FreeBSD", "Windows", "Other"), + breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2", "#333333")) + opts(title = "Relay platforms\n") ggsave(filename = path, width = 8, height = 5, dpi = 72) diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp index fb3788b..34ef552 100644 --- a/website/web/WEB-INF/servers-data.jsp +++ b/website/web/WEB-INF/servers-data.jsp @@ -57,7 +57,7 @@ regardless of the Tor software version they run. There are no statistics on the number of bridges by Tor software version.</li> <li><b>platform:</b> Operating system as reported by the relay. -Examples are <b>"Linux"</b>, <b>"Darwin"</b> (Mac OS X), <b>"FreeBSD"</b>, +Examples are <b>"Linux"</b>, <b>"Darwin"</b> (Mac OS X), <b>"BSD"</b>, <b>"Windows"</b>, and <b>"Other"</b>. If this column contains the empty string, all running relays are included, regardless of the operating system they run on.