[or-cvs] [metrics-web/master 2/2] Update website to show new user number estimate only.

[karsten@xxxxxxxxxxxxxx]

Author: karsten <karsten@xxxxxxxxxxxx>
Date: Tue, 30 Nov 2010 08:58:51 +0100
Subject: Update website to show new user number estimate only.
Commit: 59634821419605bcfda3e12ef908210278084648

---
 web/WEB-INF/users.jsp |   71 ++++--------------------------------------------
 1 files changed, 6 insertions(+), 65 deletions(-)

diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp
index 835aede..10c3ec7 100644
--- a/web/WEB-INF/users.jsp
+++ b/web/WEB-INF/users.jsp
@@ -13,73 +13,14 @@
     <div class="main-column">
 <h2>Tor Metrics Portal: Users</h2>
 <br>
-<h3>New or returning, directly connecting Tor users</h3>
-<br>
-<p>Users connecting to the Tor network for the first time request a list
-of running relays from one of currently seven directory authorities.
-Likewise, returning users whose network information is out of date connect
-to one of the directory authorities to download a fresh list of relays.
-The following graphs display an estimate of new or returning Tor users
-based on the requests as seen by gabelmoo, one of the directory
-authorities.</p>
-<a name="new-users"></a>
-<img src="new-users.png${new_users_url}"
-     width="576" height="360" alt="New users graph">
-<form action="users.html#new-users">
-  <div class="formrow">
-    <input type="hidden" name="graph" value="new-users">
-    <p>
-    <label>Start date (yyyy-mm-dd):</label>
-      <input type="text" name="start" size="10"
-             value="${new_users_start[0]}">
-    <label>End date (yyyy-mm-dd):</label>
-      <input type="text" name="end" size="10"
-             value="${new_users_end[0]}">
-    </p><p>
-      Source:
-      <input type="radio" name="country" value="all">All users
-      <input type="radio" name="country" value="au">Australia
-      <input type="radio" name="country" value="bh">Bahrain
-      <input type="radio" name="country" value="br">Brazil
-      <input type="radio" name="country" value="ca">Canada
-      <input type="radio" name="country" value="cn">China
-      <input type="radio" name="country" value="cu">Cuba
-      <input type="radio" name="country" value="de">Germany
-      <input type="radio" name="country" value="et">Ethiopia
-      <input type="radio" name="country" value="fr">France
-      <input type="radio" name="country" value="gb">U.K.
-      <input type="radio" name="country" value="ir">Iran
-      <input type="radio" name="country" value="it">Italy
-      <input type="radio" name="country" value="jp">Japan
-      <input type="radio" name="country" value="kr">South Korea
-      <input type="radio" name="country" value="mm">Burma
-      <input type="radio" name="country" value="pl">Poland
-      <input type="radio" name="country" value="ru">Russia
-      <input type="radio" name="country" value="sa">Saudi Arabia
-      <input type="radio" name="country" value="se">Sweden
-      <input type="radio" name="country" value="sy">Syria
-      <input type="radio" name="country" value="tn">Tunisia
-      <input type="radio" name="country" value="tm">Turkmenistan
-      <input type="radio" name="country" value="us">U.S.A.
-      <input type="radio" name="country" value="uz">Uzbekistan
-      <input type="radio" name="country" value="vn">Vietnam
-      <input type="radio" name="country" value="ye">Yemen
-    </p><p>
-    <input class="submit" type="submit" value="Update graph">
-    </p>
-  </div>
-</form>
-<p><a href="csv/new-users.csv">CSV</a> file containing all data.</p>
-<br>
 
-<h3>Recurring, directly connecting Tor users</h3>
+<h3>Directly connecting Tor users</h3>
 <br>
 <p>After being connected to the Tor network, users need to refresh their
 list of running relays on a regular basis. They send their requests to one
 out of a few hundred directory mirrors to save bandwidth of the directory
 authorities. The following graphs show an estimate of recurring Tor users
-based on the requests as seen by trusted, a particularly fast directory
-mirror.</p>
+based on the requests seen by a few dozen directory mirrors.</p>
 <a name="direct-users"></a>
 <img src="direct-users.png${direct_users_url}"
      width="576" height="360" alt="Direct users graph">
@@ -129,9 +70,9 @@ mirror.</p>
 </form>
 <p><a href="csv/direct-users.csv">CSV</a> file containing all data.</p>
 <p><a href="csv/monthly-users-peak.csv">CSV</a> file containing peak daily
-Tor users (recurring and bridge) per month by country.</p>
+Tor users (direct and bridge) per month by country.</p>
 <p><a href="csv/monthly-users-average.csv">CSV</a> file containing average
-daily Tor users (recurring and bridge) per month by country.</p>
+daily Tor users (direct and bridge) per month by country.</p>
 <br>
 
 <h3>Tor users via bridges</h3>
@@ -189,9 +130,9 @@ by a few hundred bridges.</p>
 </form>
 <p><a href="csv/bridge-users.csv">CSV</a> file containing all data.</p>
 <p><a href="csv/monthly-users-peak.csv">CSV</a> file containing peak daily
-Tor users (recurring and bridge) per month by country.</p>
+Tor users (direct and bridge) per month by country.</p>
 <p><a href="csv/monthly-users-average.csv">CSV</a> file containing average
-daily Tor users (recurring and bridge) per month by country.</p>
+daily Tor users (direct and bridge) per month by country.</p>
 <br>
     </div>
   </div>
-- 
1.7.1