rewrite the sponsors page per ticket #10013.
Andrew Lewman

Andrew Lewman commited on 2013-12-07 14:19:50
Zeige 1 geänderte Dateien mit 24 Einfügungen und 41 Löschungen.

... ...
@@ -14,47 +14,36 @@
14 14
     <p>
15 15
     The Tor Project's <a href="<page about/torusers>">diversity of
16 16
     users</a> means we have a diversity of funding sources too &mdash;
17
-    and we're eager to diversify even further! Our sponsorships are
18
-    divided into levels based on total funding received:
17
+    and we're eager to diversify even further!
18
+    </p>
19
+    <p>Thank you to all the people and groups who have made Tor possible
20
+    so far, and thank you especially to the individual volunteers who
21
+    have made non-financial contributions: coding, testing, documenting,
22
+    educating, researching, and running the relays that make up the
23
+    Tor network.
19 24
     </p>
20 25
 
21
-    <h3><i>Magnoliophyta</i> (over $1 million)</h3>
26
+    <h3>Active Sponsors in 2013:</h3>
22 27
       <ul>
23
-    		<li>An anonymous North American NGO (2008-2013)</li>
24 28
 	  <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2013)</li>
25 29
 	  <li><a href="http://www.sri.com/">SRI International</a> (2011-2014)</li>
26 30
 	  <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2015)</li>
27
-    	</ul>
28
-
29
-    <h3><i>Liliopsida</i> (up to $1 million)</h3>
30
-    	<ul>
31 31
           <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2013)</li>
32 32
 	  <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li>
33 33
 	  <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2014)</li>
34
-    	</ul>
35
-
36
-    <h3><i>Asparagales</i> (up to $500k)</h3>
37
-    	<ul>
38
-	    <li>Internews Europe (2006-2008)</li>
39
-            <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li>
40
-	    <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012)</li>
41
-    	</ul>
42
-
43
-    <h3><i>Alliaceae</i> (up to $250k)</h3>
44
-    	<ul>
45
-    		<li>You or your organization?</li>
46
-    	</ul>
47
-
48
-    <h3><i>Allium</i> (up to $125k)</h3>
49
-    	<ul>
50
-    		<li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li>
51
-    		<li><a href="http://www.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li>
34
+	  <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2013)</li>
52 35
 	  <li>An anonymous North American ISP (2009-present)</li>
36
+	  <li><a href="http://www.fordfoundation.org/">The Ford Foundation</a> (2013-2014)</li>
37
+	  <li>An anonymous North American NGO (2008-2013)</li>
38
+	  <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li>
53 39
       </ul>
54 40
 
55
-    <h3><i>Allium cepa</i> (up to $75k)</h3>
41
+    <h3>Past sponsors</h3>
42
+    <p>We greatly appreciate the support provided by our past sponsors
43
+    in keeping the pre-501(c)(3) Tor Project progressing through our
44
+    ambitious goals:</p>
56 45
     	<ul>
57
-	    <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li>
46
+          <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li>
58 47
 	  <li><a href="https://www.accessnow.org/">Access Now</a> (2012)</li>
59 48
 	  <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li>
60 49
 	  <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-present)</li>
... ...
@@ -62,11 +51,9 @@
62 51
 	  <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li>
63 52
           <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2011)</li>
64 53
           <li><a href="http://www.nationalchristian.com/">National Christian Foundation</a> (2010-2012)</li>
65
-      </ul>
66
-
67
-    <h3>Past sponsors</h3>
68
-    <p>We greatly appreciate the support provided by our past sponsors in keeping the pre-501(c)(3) Tor Project progressing through our ambitious goals:</p>
69
-    	<ul>
54
+	  <li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li>
55
+	  <li><a href="http://www.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li>
56
+	  <li>Internews Europe (2006-2008)</li>
70 57
 	  <li><a href="https://www.eff.org/">Electronic Frontier Foundation</a> (2004-2005)</li>
71 58
 	  <li><a href="http://chacs.nrl.navy.mil/">DARPA and ONR via Naval Research Laboratory</a> (2001-2006)</li>
72 59
 	  <li><a href="http://www.cyber-ta.org/">Cyber-TA project</a> (2006-2008)</li>
... ...
@@ -74,15 +61,11 @@
74 61
 	  <li><a href="http://www.omidyar.net/">Omidyar Network Enzyme Grant</a> (2006)</li>
75 62
 	  <li><a href="http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-study-security-of-p2p/">NSF via Rice University</a> (2006-2007)</li>
76 63
     	</ul>
77
-    <p>Thank you to all the people and groups who have made Tor possible so
78
-    far, and thank you especially to the individual volunteers who have made
79
-    non-financial contributions: coding, testing, documenting, educating,
80
-    researching, and running the relays that make up the Tor network.
81
-    </p>
64
+
82 65
     <p>This sponsors page is based upon un-audited and un-reviewed
83
-    financial data. Further details about our audited and reviewed funding
84
-    can be found on our <a href="<page about/financials>">Financial
85
-    Reports</a> page.
66
+    financial and in-kind donations, contract, and other data. Further
67
+    details about our audited and reviewed funding can be found on our
68
+    <a href="<page about/financials>">Financial Reports</a> page.
86 69
     </p>
87 70
   </div>
88 71
   <!-- END MAINCOL -->
89 72