Browse code

make the text more marketing-like.

Andrew Lewman authored on 12/03/2012 00:32:57
Showing 1 changed files
... ...
@@ -11,43 +11,47 @@
11 11
   <div id="maincol"> 
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
 
14
-<h1>Be a part of the Tor network</h1>
14
+<h1>Join the Tor network</h1>
15 15
 <hr><br>
16 16
 <div class="underline"></div>
17
-<p><a href="http://www.tacticaltech.org/">Tactical Tech</a> has produced a
18
-video to encourage more people to become a part of the Tor network.
19
-Below is the English version. We are working on translated videos as
20
-well.</p>
17
+<p><a href="http://www.tacticaltech.org/">Tactical Tech</a> created a
18
+video to encourage you to join the Tor Network. If you'd like to help
19
+us translate it to your language, <a href="<page about/contact>">let
20
+us know!</a></p>
21
+
21 22
 <div class="center">
22 23
 <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" controls="controls"></video></p>
23 24
 </div>
24
-<p>The Tor network relies on volunteers to donate bandwidth. The more
25
-people who run Tor as a bridge or a relay, and become a part of the Tor
26
-network, the faster the network will be.</p>
27 25
 
26
+<p>The Tor network relies on volunteers to donate bandwidth. The more
27
+people who run Tor as a bridge or a relay, the faster and safer the
28
+network becomes.</p>
28 29
 
29 30
 <h2>Option 1: Use your own computer</h2>
30 31
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
31
-see less traffic than a relay, and will only be used to transfer data
32
-from a client to the rest of the Tor network.</p>
32
+see less traffic than a relay, and will only be the first hop in the
33
+three hop circuit. </p>
34
+
33 35
 <h3>Windows</h3>
34 36
 <p>
35 37
 <ul>
36
-<li>Vidalia Bridge Bundle: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
37
-<li>Vidalia Relay Bundle: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
38
-<li>Vidalia Exit Bundle: <a href="<package-win32-exit-bundle-stable>">package</a>, <a href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
38
+<li>Be a Bridge: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
39
+<li>Be a Relay: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
40
+<li>Be an Exit Relay: <a href="<package-win32-exit-bundle-stable>">package</a>, <a href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
39 41
 </ul>
42
+Read the instructions on how to configure a <a
43
+href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
44
+<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
40 45
 </p>
41 46
 
42 47
 <h3>Mac OS X</h3>
43 48
 <p>
44 49
 <ul>
45
-<li>Vidalia Bundle, OS X Intel: <a href="<package-osx-x86-bundle-stable>">package</a>, <a href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
46
-<li>Vidalia Bundle, OS X Power PC: <a href="<package-osx-ppc-bundle-stable>">package</a>, <a href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
47
-<li>Vidalia Bundle, OS X Intel, unstable: <a href="<package-osx-x86-bundle-alpha>">package</a>, <a href="<package-osx-x86-bundle-alpha>.asc">signature</a></li>
48
-<li>idalia Bundle, OS X Power PC, unstable: <a href="<package-osx-ppc-bundle-alpha>">package</a>, <a href="<package-osx-ppc-bundle-alpha>.asc">signature</a></li>
50
+<li>Be a Bridge (Intel Macs only): <a href="<package-osx-x86-bundle-stable>">package</a>, <a href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
49 51
 </ul>
50
-Read the instructions for how to configure the Vidalia Bundle as either a <a href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
52
+Read the instructions on how to configure a <a
53
+href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
54
+<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
51 55
 </p>
52 56
 
53 57
 <h3>Linux</h3>
... ...
@@ -64,18 +68,24 @@ href="https://www.torproject.org/download/download-unix.html.en">repositories</a
64 68
 
65 69
 <div class="nb">
66 70
 <h2>Option 2: Use the cloud</h2>
67
-<p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> runs on the Amazon EC2 cloud computing platform, and gives you a user-friendly way of deploying bridges to help users access an uncensored Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and will only take you a couple of minutes.</p>
71
+<p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
72
+runs on the Amazon EC2 cloud computing platform. This gives you a
73
+user-friendly way of deploying bridges to help users access an uncensored
74
+Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and
75
+will only take you a couple of minutes.</p>
68 76
 </div>
69 77
 
70 78
 <div class="nb">
71 79
 <h2>Option 3: Donate</h2>
72
-<p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a href="http://noisetor.net/">Noisetor</a> will turn donations into Tor exit relays.</p>
80
+<p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
81
+href="http://noisetor.net/">Noisetor</a> will turn donations into Tor
82
+exit relays.</p>
73 83
 </div>
74 84
 
75 85
 
76
-  </div>
77
-  <!-- END MAINCOL -->
78
-  <div id = "sidecol">
86
+</div>
87
+<!-- END MAINCOL -->
88
+<div id = "sidecol">
79 89
 #include "side.wmi"
80 90
 #include "info.wmi"
81 91
   </div>