March 2012 - tor-commits - lists.torproject.org

r25543: {website} use div underline instead of both. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:56:54 +0000 (Mon, 12 Mar 2012) New Revision: 25543 Modified: website/trunk/getinvolved/en/relays.wml Log: use div underline instead of both. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:54:23 UTC (rev 25542) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:56:54 UTC (rev 25543) @@ -12,7 +12,6 @@  <h1>Join the Tor Network</h1> -<hr><br> <div class="underline"></div> <div align="center"> @@ -32,6 +31,7 @@ network becomes.</p> <h1>Three ways to join and help out</h1> +<div class="underline"></div> <ul class="hlist"> <li><a href="#diy">Run it yourself.</a></li> <li><a href="#cloud">Run it in the cloud.</a></li>

1 0

r25542: {website} revert back to dbox donate for sections. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:54:23 +0000 (Mon, 12 Mar 2012) New Revision: 25542 Modified: website/trunk/getinvolved/en/relays.wml Log: revert back to dbox donate for sections. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:50:54 UTC (rev 25541) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:54:23 UTC (rev 25542) @@ -88,7 +88,7 @@ </div> <div class="hundred toptwenty"> -<div class="dbox dsmall givv"> +<div class="dbox donate"> <a name="cloud"></a> <h2>Use the cloud</h2> <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> @@ -100,7 +100,7 @@ </div> <div class="hundred toptwenty"> -<div class="dbox dsmall givv"> +<div class="dbox donate"> <a name="donate"></a> <h2>Donate to others to run for you</h2> <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a

1 0

r25541: {website} make the last section not so linux specific. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:50:54 +0000 (Mon, 12 Mar 2012) New Revision: 25541 Modified: website/trunk/getinvolved/en/relays.wml Log: make the last section not so linux specific. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:49:30 UTC (rev 25540) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:50:54 UTC (rev 25541) @@ -77,7 +77,7 @@ 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>.</p> -<h3>Linux</h3> +<h3>Unix, Linux, BSD, and everything else</h3> <p>We assume you're an expert and can figure out how to install Tor by yourself. You can also download Tor from one of our <a href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>

1 0

r25540: {website} try to get the last two options to play nicely side by side. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:49:30 +0000 (Mon, 12 Mar 2012) New Revision: 25540 Modified: website/trunk/getinvolved/en/relays.wml Log: try to get the last two options to play nicely side by side. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:45:04 UTC (rev 25539) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:49:30 UTC (rev 25540) @@ -47,7 +47,7 @@ see less traffic than a relay, and will only be the first hop in the three hop circuit. </p> -<h3>Windows</h3> +<h3>Microsoft Windows</h3> <p> <ul> <li>Be a Bridge: <a @@ -65,7 +65,6 @@ </p> <h3>Mac OS X</h3> -<p> <ul> <li>Be a Bridge (Intel Macs): <a href="<package-osx-x86-bundle-stable>">package</a>, <a @@ -74,26 +73,22 @@ href="<package-osx-ppc-bundle-stable>">package</a>, <a href="<package-osx-ppc-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">bridge</a> or a -<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>. -</p> +<p>Read the instructions on how to configure 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>.</p> <h3>Linux</h3> -<p> -We assume you're an expert and can figure out how to install +<p>We assume you're an expert and can figure out how to install Tor by yourself. You can also download Tor from one of our <a href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p> -<p> -Read the instructions on how to configure 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>. -</p> +<p>Read the instructions on how to configure 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>.</p> </div> </div> <div class="hundred toptwenty"> -<div class="dbox dsmall"> +<div class="dbox dsmall givv"> <a name="cloud"></a> <h2>Use the cloud</h2> <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> @@ -105,7 +100,7 @@ </div> <div class="hundred toptwenty"> -<div class="dbox dsmall"> +<div class="dbox dsmall givv"> <a name="donate"></a> <h2>Donate to others to run for you</h2> <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a

1 0

r25539: {website} boxes. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:45:04 +0000 (Mon, 12 Mar 2012) New Revision: 25539 Modified: website/trunk/getinvolved/en/relays.wml Log: boxes. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:39:14 UTC (rev 25538) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:45:04 UTC (rev 25539) @@ -16,7 +16,9 @@ <div class="underline"></div> <div align="center"> -<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p> +<video id="v1" +src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" +autobuffer="true" controls="controls"></video> </div> <p><a href="https://www.tacticaltech.org/">Tactical Tech</a> @@ -33,10 +35,12 @@ <ul class="hlist"> <li><a href="#diy">Run it yourself.</a></li> <li><a href="#cloud">Run it in the cloud.</a></li> -<li><a href="#donate">Donate to others to run it for you.</a></li> +<li class="last"><a href="#donate">Donate to others to run it for +you.</a></li> </ul> <div class="hundred toptwenty"> +<div class="dbox donate"> <a name="diy"></a> <h2>Run it yourself</h2> <p>You can run Tor as either a bridge or a relay. A bridge will usually @@ -46,9 +50,14 @@ <h3>Windows</h3> <p> <ul> -<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> +<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">bridge</a> or a @@ -58,7 +67,12 @@ <h3>Mac OS X</h3> <p> <ul> -<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> +<li>Be a Bridge (Intel Macs): <a +href="<package-osx-x86-bundle-stable>">package</a>, <a +href="<package-osx-x86-bundle-stable>.asc">signature</a></li> +<li>Be a Bridge (PowerPC Macs ): <a +href="<package-osx-ppc-bundle-stable>">package</a>, <a +href="<package-osx-ppc-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">bridge</a> or a @@ -76,8 +90,10 @@ <a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>. </p> </div> +</div> <div class="hundred toptwenty"> +<div class="dbox dsmall"> <a name="cloud"></a> <h2>Use the cloud</h2> <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> @@ -86,14 +102,17 @@ Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and will only take you a couple of minutes.</p> </div> +</div> <div class="hundred toptwenty"> +<div class="dbox dsmall"> <a name="donate"></a> <h2>Donate to others to run for you</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> </div> +</div> </div>

1 0

r25538: {website} try breaking up the sections visually. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:39:14 +0000 (Mon, 12 Mar 2012) New Revision: 25538 Modified: website/trunk/getinvolved/en/relays.wml Log: try breaking up the sections visually. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:35:30 UTC (rev 25537) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:39:14 UTC (rev 25538) @@ -29,13 +29,14 @@ people who run Tor as a bridge or a relay, the faster and safer the network becomes.</p> -<h1>3 ways to join and help out</h1> +<h1>Three ways to join and help out</h1> <ul class="hlist"> <li><a href="#diy">Run it yourself.</a></li> <li><a href="#cloud">Run it in the cloud.</a></li> <li><a href="#donate">Donate to others to run it for you.</a></li> </ul> +<div class="hundred toptwenty"> <a name="diy"></a> <h2>Run it yourself</h2> <p>You can run Tor as either a bridge or a relay. A bridge will usually @@ -74,10 +75,9 @@ 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>. </p> +</div> -<br> - -<div class="nb"> +<div class="hundred toptwenty"> <a name="cloud"></a> <h2>Use the cloud</h2> <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a> @@ -87,7 +87,7 @@ will only take you a couple of minutes.</p> </div> -<div class="nb"> +<div class="hundred toptwenty"> <a name="donate"></a> <h2>Donate to others to run for you</h2> <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a

1 0

r25537: {website} move the anchors above the title (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:35:30 +0000 (Mon, 12 Mar 2012) New Revision: 25537 Modified: website/trunk/getinvolved/en/relays.wml Log: move the anchors above the title Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:32:48 UTC (rev 25536) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:35:30 UTC (rev 25537) @@ -36,8 +36,8 @@ <li><a href="#donate">Donate to others to run it for you.</a></li> </ul> -<h2>Run it yourself</h2> <a name="diy"></a> +<h2>Run it yourself</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 the first hop in the three hop circuit. </p> @@ -78,8 +78,8 @@ <br> <div class="nb"> -<h2>Use the cloud</h2> <a name="cloud"></a> +<h2>Use the cloud</h2> <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 @@ -88,14 +88,13 @@ </div> <div class="nb"> -<h2>Donate to others to run for you</h2> <a name="donate"></a> +<h2>Donate to others to run for you</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> </div> - </div>  <div id = "sidecol">

1 0

r25536: {website} close an open a tag. (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:32:48 +0000 (Mon, 12 Mar 2012) New Revision: 25536 Modified: website/trunk/getinvolved/en/relays.wml Log: close an open a tag. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-12 00:32:09 UTC (rev 25535) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:32:48 UTC (rev 25536) @@ -37,7 +37,7 @@ </ul> <h2>Run it yourself</h2> -<a name="diy"> +<a name="diy"></a> <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 the first hop in the three hop circuit. </p>

1 0

r25535: {website} create a menu up top, re-center the video, anchor the sectio (website/trunk/getinvolved/en)
by Andrew Lewman 12 Mar '12

12 Mar '12

Author: phobos Date: 2012-03-12 00:32:09 +0000 (Mon, 12 Mar 2012) New Revision: 25535 Modified: website/trunk/getinvolved/en/relays.wml Log: create a menu up top, re-center the video, anchor the sections. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-11 23:51:25 UTC (rev 25534) +++ website/trunk/getinvolved/en/relays.wml 2012-03-12 00:32:09 UTC (rev 25535) @@ -6,30 +6,38 @@ <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> - <a href="<page getinvolved/relays>">Set up relays</a> + <a href="<page getinvolved/relays>">Join the Tor Network</a> </div> <div id="maincol">  -<h1>Join the Tor network</h1> +<h1>Join the Tor Network</h1> <hr><br> <div class="underline"></div> -<div class="center"> +<div align="center"> <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p> </div> <p><a href="https://www.tacticaltech.org/">Tactical Tech</a> created a video to encourage you to join the Tor Network (<a href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD -version</a>). If you'd like to help us translate it to your language, -<a href="<page about/contact>">let us know!</a></p> +version</a>). If you want to help us translate it into your language, +<a href="<page about/contact>">let us know!</a>.</p> <p>The Tor network relies on volunteers to donate bandwidth. The more 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> +<h1>3 ways to join and help out</h1> +<ul class="hlist"> +<li><a href="#diy">Run it yourself.</a></li> +<li><a href="#cloud">Run it in the cloud.</a></li> +<li><a href="#donate">Donate to others to run it for you.</a></li> +</ul> + +<h2>Run it yourself</h2> +<a name="diy"> <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 the first hop in the three hop circuit. </p> @@ -70,7 +78,8 @@ <br> <div class="nb"> -<h2>Option 2: Use the cloud</h2> +<h2>Use the cloud</h2> +<a name="cloud"></a> <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 @@ -79,7 +88,8 @@ </div> <div class="nb"> -<h2>Option 3: Donate</h2> +<h2>Donate to others to run for you</h2> +<a name="donate"></a> <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>

1 0

r25534: {website} put the video up top. (website/trunk/getinvolved/en)
by Andrew Lewman 11 Mar '12

11 Mar '12

Author: phobos Date: 2012-03-11 23:51:25 +0000 (Sun, 11 Mar 2012) New Revision: 25534 Modified: website/trunk/getinvolved/en/relays.wml Log: put the video up top. Modified: website/trunk/getinvolved/en/relays.wml =================================================================== --- website/trunk/getinvolved/en/relays.wml 2012-03-11 23:47:36 UTC (rev 25533) +++ website/trunk/getinvolved/en/relays.wml 2012-03-11 23:51:25 UTC (rev 25534) @@ -2,7 +2,7 @@ # Revision: $Revision: 25517 $ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Become a part of the Tor network" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Join the Tor Network" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> @@ -14,16 +14,17 @@ <h1>Join the Tor network</h1> <hr><br> <div class="underline"></div> + +<div class="center"> +<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p> +</div> + <p><a href="https://www.tacticaltech.org/">Tactical Tech</a> created a video to encourage you to join the Tor Network (<a href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD -Version here</a>). If you'd like to help us translate it to your language, +version</a>). 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.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, the faster and safer the network becomes.</p>

1 0