Author: phobos Date: 2012-03-11 23:32:57 +0000 (Sun, 11 Mar 2012) New Revision: 25529

Modified: website/trunk/getinvolved/en/relays.wml Log: make the text more marketing-like.

Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-11 23:25:58 UTC (rev 25528) +++ website/trunk/getinvolved/en/relays.wml 2012-03-11 23:32:57 UTC (rev 25529) @@ -11,43 +11,47 @@ <div id="maincol"> <!-- PUT CONTENT AFTER THIS TAG -->

-<h1>Be a part of the Tor network</h1> +<h1>Join the Tor network</h1> <hr><br> <div class="underline"></div> -<p><a href="http://www.tacticaltech.org/">Tactical Tech</a> has produced a -video to encourage more people to become a part of the Tor network. -Below is the English version. We are working on translated videos as -well.</p> +<p><a href="http://www.tacticaltech.org/">Tactical Tech</a> created a +video to encourage you to join the Tor Network. If you'd like to help +us translate it to your language, <a href="<page about/contact>">let +us know!</a></p> + <div class="center"> <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" controls="controls"></video></p> </div> + <p>The Tor network relies on volunteers to donate bandwidth. The more -people who run Tor as a bridge or a relay, and become a part of the Tor -network, the faster the network will be.</p> +people who run Tor as a bridge or a relay, the faster and safer the +network becomes.</p>

- <h2>Option 1: Use your own computer</h2> <p>You can run Tor as either a bridge or a relay. A bridge will usually -see less traffic than a relay, and will only be used to transfer data -from a client to the rest of the Tor network.</p> +see less traffic than a relay, and will only be the first hop in the +three hop circuit. </p> + <h3>Windows</h3> <p> <ul> -<li>Vidalia Bridge Bundle: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li> -<li>Vidalia Relay Bundle: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li> -<li>Vidalia Exit Bundle: <a href="<package-win32-exit-bundle-stable>">package</a>, <a href="<package-win32-exit-bundle-stable>.asc">signature</a></li> +<li>Be a Bridge: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li> +<li>Be a Relay: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li> +<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> </ul> +Read the instructions on how to configure a <a +href="https://www.torproject.org/docs/bridges.html.en%22%3Ebridge</a> or a +<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>. </p>

<h3>Mac OS X</h3> <p> <ul> -<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> -<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> -<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> -<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> +<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> </ul> -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>. +Read the instructions on how to configure a <a +href="https://www.torproject.org/docs/bridges.html.en%22%3Ebridge</a> or a +<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>. </p>

<h3>Linux</h3> @@ -64,18 +68,24 @@

<div class="nb"> <h2>Option 2: Use the cloud</h2> -<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> +<p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> +runs on the Amazon EC2 cloud computing platform. This 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> </div>

<div class="nb"> <h2>Option 3: Donate</h2> -<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> +<p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a +href="http://noisetor.net/%22%3ENoisetor</a> will turn donations into Tor +exit relays.</p> </div>

- </div> - <!-- END MAINCOL --> - <div id = "sidecol"> +</div> +<!-- END MAINCOL --> +<div id = "sidecol"> #include "side.wmi" #include "info.wmi" </div>