Browse code

getinvolved/en/relays.wml improvements (2)

- put relay instructions at the beginning
since the (vanilla) bridges are not very useful these days.

nusenu authored on06/02/2018 11:48:29 • hiromipaw committed on07/02/2018 11:00:15
Showing1 changed files
... ...
@@ -49,9 +49,10 @@ network becomes.</p>
49 49
 see less traffic than a relay, and will only be the first hop in the
50 50
 three hop circuit. </p>
51 51
 
52
-<p>Read the instructions on how to configure a <a href="<page
53
-docs/bridges>#RunningABridge">bridge</a> or a <a href="<wiki>TorRelayGuide
54
-">relay</a>.</p>
52
+<p>You can find instructions on how to configure a relay in the
53
+<a href="<wiki>TorRelayGuide">Tor Relay Guide</a>.
54
+Instructions for <a href="<page docs/bridges>#RunningABridge">bridges</a>.
55
+</p>
55 56
 </div>
56 57
 </div>
57 58
 <div class="hundred toptwenty">
Browse code

getinvolved/en/relays.wml improvements

- remove section URLs (they are confusing since the page is tiny)
- replace old relay setup instruction URL with new Tor Relay Guide URL

nusenu authored on06/02/2018 11:27:25 • hiromipaw committed on07/02/2018 11:00:15
Showing1 changed files
... ...
@@ -41,12 +41,6 @@ network becomes.</p>
41 41
 
42 42
 <h1>Two ways to join and help out</h1>
43 43
 <hr>
44
-<ul class="hlist">
45
-<li><a href="#diy">Run it yourself,</a></li>
46
-<li class="last"><a href="#donate"> or donate to others to run it for
47
-you.</a></li>
48
-</ul>
49
-
50 44
 <div class="hundred toptwenty">
51 45
 <div class="dbox donate">
52 46
 <a name="diy"></a>
... ...
@@ -54,12 +48,12 @@ you.</a></li>
54 48
 <p>You can run Tor as either a relay or a bridge. A bridge will usually
55 49
 see less traffic than a relay, and will only be the first hop in the
56 50
 three hop circuit. </p>
57
-</div>
58
-</div>
59 51
 
60 52
 <p>Read the instructions on how to configure a <a href="<page
61
-docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
62
-docs/tor-doc-relay>#setup">relay</a>.</p>
53
+docs/bridges>#RunningABridge">bridge</a> or a <a href="<wiki>TorRelayGuide
54
+">relay</a>.</p>
55
+</div>
56
+</div>
63 57
 <div class="hundred toptwenty">
64 58
 <div class="dbox donate">
65 59
 <a name="donate"></a>
Browse code

make noisetor URL use HTTPS (not HTTP)

nusenu authored on06/02/2018 11:11:35 • hiromipaw committed on07/02/2018 11:00:15
Showing1 changed files
... ...
@@ -65,7 +65,7 @@ docs/tor-doc-relay>#setup">relay</a>.</p>
65 65
 <a name="donate"></a>
66 66
 <h2>Donate to others to run for you</h2>
67 67
 <p><a href="https://www.torservers.net/">Torservers</a>, <a
68
-href="http://noisetor.net/">Noisetor</a>, and <a href="https://nos-oignons.net">Nos Oignons</a> will turn your donation into Tor
68
+href="https://noisetor.net/">Noisetor</a>, and <a href="https://nos-oignons.net">Nos Oignons</a> will turn your donation into Tor
69 69
 exit relays.</p>
70 70
 </div>
71 71
 </div>
Browse code

We retired tor cloud

fixes #20675, thanks cypherpunks

Sebastian Hahn authored on23/11/2016 02:33:11
Showing1 changed files
... ...
@@ -39,12 +39,11 @@ href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-spanish.o
39 39
 people who run Tor as a relay or a bridge, the faster and safer the
40 40
 network becomes.</p>
41 41
 
42
-<h1>Three ways to join and help out</h1>
42
+<h1>Two ways to join and help out</h1>
43 43
 <hr>
44 44
 <ul class="hlist">
45
-<li><a href="#diy">Run it yourself.</a></li>
46
-<li><a href="#cloud">Run it in the cloud.</a></li>
47
-<li class="last"><a href="#donate">Donate to others to run it for
45
+<li><a href="#diy">Run it yourself,</a></li>
46
+<li class="last"><a href="#donate"> or donate to others to run it for
48 47
 you.</a></li>
49 48
 </ul>
50 49
 
Browse code

Remove some torcloud links

Sebastian Hahn authored on10/05/2015 00:05:33
Showing1 changed files
... ...
@@ -61,18 +61,6 @@ three hop circuit. </p>
61 61
 <p>Read the instructions on how to configure a <a href="<page
62 62
 docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
63 63
 docs/tor-doc-relay>#setup">relay</a>.</p>
64
-<div class="hundred toptwenty">
65
-<div class="dbox donate">
66
-<a name="cloud"></a>
67
-<h2>Use the cloud</h2>
68
-<p>The <a href="https://cloud.torproject.org/">Tor Cloud</a> project
69
-runs on the Amazon EC2 cloud computing platform. This gives you a
70
-user-friendly way of deploying bridges to help users access an uncensored
71
-Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and
72
-will only take you a couple of minutes.</p>
73
-</div>
74
-</div>
75
-
76 64
 <div class="hundred toptwenty">
77 65
 <div class="dbox donate">
78 66
 <a name="donate"></a>
Browse code

Fix the relays page harder

Sebastian Hahn authored on18/03/2015 22:19:06
Showing1 changed files
... ...
@@ -55,6 +55,8 @@ you.</a></li>
55 55
 <p>You can run Tor as either a relay or a bridge. A bridge will usually
56 56
 see less traffic than a relay, and will only be the first hop in the
57 57
 three hop circuit. </p>
58
+</div>
59
+</div>
58 60
 
59 61
 <p>Read the instructions on how to configure a <a href="<page
60 62
 docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
Browse code

Let's see if that's better

Sebastian Hahn authored on18/03/2015 22:11:40
Showing1 changed files
... ...
@@ -47,7 +47,6 @@ network becomes.</p>
47 47
 <li class="last"><a href="#donate">Donate to others to run it for
48 48
 you.</a></li>
49 49
 </ul>
50
-</div>
51 50
 
52 51
 <div class="hundred toptwenty">
53 52
 <div class="dbox donate">
Browse code

Restore a missing </div>

Sebastian Hahn authored on12/02/2015 13:42:30
Showing1 changed files
... ...
@@ -47,6 +47,7 @@ network becomes.</p>
47 47
 <li class="last"><a href="#donate">Donate to others to run it for
48 48
 you.</a></li>
49 49
 </ul>
50
+</div>
50 51
 
51 52
 <div class="hundred toptwenty">
52 53
 <div class="dbox donate">
Browse code

Try and fix up the getinvolved/relays page a little

Sebastian Hahn authored on12/02/2015 13:34:56
Showing1 changed files
... ...
@@ -56,41 +56,9 @@ you.</a></li>
56 56
 see less traffic than a relay, and will only be the first hop in the
57 57
 three hop circuit. </p>
58 58
 
59
-<h3>Microsoft Windows</h3>
60
-<ul>
61
-<li>Be a Bridge: <a
62
-href="<package-win32-bridge-bundle-stable>">package</a>, <a
63
-href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
64
-<li>Be a Relay: <a href="<package-win32-relay-bundle-stable>">package</a>,
65
-<a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
66
-<li>Be an Exit Relay: <a
67
-href="<package-win32-exit-bundle-stable>">package</a>, <a
68
-href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
69
-</ul>
70
-<p>Read the instructions on how to configure a <a href="<page
71
-docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
72
-docs/tor-doc-relay>#setup">relay</a>.</p>
73
-
74
-<h3>Mac OS X</h3>
75
-<ul>
76
-<li>Be a Bridge (Intel Macs): <a
77
-href="<package-osx-x86-bundle-stable>">package</a>, <a
78
-href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
79
-<li>Be a Bridge (PowerPC Macs ): <a
80
-href="<package-osx-ppc-bundle-stable>">package</a>, <a
81
-href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
82
-</ul>
83 59
 <p>Read the instructions on how to configure a <a href="<page
84 60
 docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
85 61
 docs/tor-doc-relay>#setup">relay</a>.</p>
86
-
87
-<h3>Unix, Linux, BSD, and everything else</h3>
88
-<p>Read the instructions on how to configure a
89
-<a href="<page docs/tor-relay-debian>">relay</a>
90
-or a <a href="<page docs/bridges>#RunningABridge">bridge</a>.</p>
91
-</div>
92
-</div>
93
-
94 62
 <div class="hundred toptwenty">
95 63
 <div class="dbox donate">
96 64
 <a name="cloud"></a>
Browse code

add nos oignons to the list.

Andrew Lewman authored on26/05/2013 21:37:20
Showing1 changed files
... ...
@@ -5,10 +5,10 @@
5 5
 #include "head.wmi" TITLE="Tor: Join the Tor Network" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a> 
8
+    <a href="<page index>">Home &raquo; </a>
9 9
     <a href="<page getinvolved/relays>">Join the Tor Network</a>
10 10
   </div>
11
-  <div id="maincol"> 
11
+  <div id="maincol">
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
 
14 14
 <h1>Join the Tor Network</h1>
... ...
@@ -107,8 +107,8 @@ will only take you a couple of minutes.</p>
107 107
 <div class="dbox donate">
108 108
 <a name="donate"></a>
109 109
 <h2>Donate to others to run for you</h2>
110
-<p>Both <a href="https://www.torservers.net/">torservers</a> and <a
111
-href="http://noisetor.net/">Noisetor</a> will turn your donation into Tor
110
+<p><a href="https://www.torservers.net/">Torservers</a>, <a
111
+href="http://noisetor.net/">Noisetor</a>, and <a href="https://nos-oignons.net">Nos Oignons</a> will turn your donation into Tor
112 112
 exit relays.</p>
113 113
 </div>
114 114
 </div>
... ...
@@ -122,4 +122,4 @@ exit relays.</p>
122 122
   <!-- END SIDECOL -->
123 123
 </div>
124 124
 <!-- END CONTENT -->
125
-#include <foot.wmi> 
125
+#include <foot.wmi>
Browse code

link from the relays-activism page to the linux relay instructions too

Roger Dingledine authored on25/12/2012 20:44:05
Showing1 changed files
... ...
@@ -36,7 +36,7 @@ Chinese</a>, and <a
36 36
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-spanish.ogv">Spanish</a></p>
37 37
 
38 38
 <p>The Tor network relies on volunteers to donate bandwidth. The more
39
-people who run Tor as a bridge or a relay, the faster and safer the
39
+people who run Tor as a relay or a bridge, the faster and safer the
40 40
 network becomes.</p>
41 41
 
42 42
 <h1>Three ways to join and help out</h1>
... ...
@@ -52,7 +52,7 @@ you.</a></li>
52 52
 <div class="dbox donate">
53 53
 <a name="diy"></a>
54 54
 <h2>Run it yourself</h2>
55
-<p>You can run Tor as either a bridge or a relay. A bridge will usually
55
+<p>You can run Tor as either a relay or a bridge. A bridge will usually
56 56
 see less traffic than a relay, and will only be the first hop in the
57 57
 three hop circuit. </p>
58 58
 
... ...
@@ -85,12 +85,9 @@ docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
85 85
 docs/tor-doc-relay>#setup">relay</a>.</p>
86 86
 
87 87
 <h3>Unix, Linux, BSD, and everything else</h3>
88
-<p>We assume you're an expert and can figure out how to install
89
-Tor by yourself. You can also download Tor from one of our <a
90
-href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>
91
-<p>Read the instructions on how to configure a <a href="<page
92
-docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
93
-docs/tor-doc-relay>#setup">relay</a>.</p>
88
+<p>Read the instructions on how to configure a
89
+<a href="<page docs/tor-relay-debian>">relay</a>
90
+or a <a href="<page docs/bridges>#RunningABridge">bridge</a>.</p>
94 91
 </div>
95 92
 </div>
96 93
 
Browse code

fix awkward grammar.

Andrew Lewman authored on12/04/2012 03:10:13
Showing1 changed files
... ...
@@ -22,9 +22,9 @@ autobuffer="true" controls="controls"></video>
22 22
 
23 23
 <p>We created a video with <a
24 24
 href="https://www.tacticaltech.org/">Tactical
25
-Tech</a> to help why being a relay matters (<a
25
+Tech</a> to help understand why being a relay matters (<a
26 26
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-english.ogv">HD
27
-version</a>). It's been translated into <a
27
+version</a>). It is translated into <a
28 28
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-arabic.ogv">Arabic</a>,
29 29
 <a
30 30
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-farsi.ogv">Farsi</a>,
Browse code

we have the relays video translated into a few languages.

Andrew Lewman authored on12/04/2012 02:43:58
Showing1 changed files
... ...
@@ -20,11 +20,20 @@ src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv"
20 20
 autobuffer="true" controls="controls"></video>
21 21
 </div>
22 22
 
23
-<p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
24
-created a video to encourage you to join the Tor Network (<a
25
-href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
26
-version</a>). If you want to help us translate it into your language,
27
-<a href="<page about/contact>">let us know</a>!</p>
23
+<p>We created a video with <a
24
+href="https://www.tacticaltech.org/">Tactical
25
+Tech</a> to help why being a relay matters (<a
26
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-english.ogv">HD
27
+version</a>). It's been translated into <a
28
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-arabic.ogv">Arabic</a>,
29
+<a
30
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-farsi.ogv">Farsi</a>,
31
+<a
32
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-german.ogv">German</a>,
33
+<a
34
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-mandarin.ogv">Mandarin
35
+Chinese</a>, and <a
36
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-spanish.ogv">Spanish</a></p>
28 37
 
29 38
 <p>The Tor network relies on volunteers to donate bandwidth. The more
30 39
 people who run Tor as a bridge or a relay, the faster and safer the
Browse code

change the torserver name to match their name on the site.

Andrew Lewman authored on12/03/2012 02:17:06
Showing1 changed files
... ...
@@ -89,7 +89,7 @@ docs/tor-doc-relay>#setup">relay</a>.</p>
89 89
 <div class="dbox donate">
90 90
 <a name="cloud"></a>
91 91
 <h2>Use the cloud</h2>
92
-<p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
92
+<p>The <a href="https://cloud.torproject.org/">Tor Cloud</a> project
93 93
 runs on the Amazon EC2 cloud computing platform. This gives you a
94 94
 user-friendly way of deploying bridges to help users access an uncensored
95 95
 Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and
... ...
@@ -101,8 +101,8 @@ will only take you a couple of minutes.</p>
101 101
 <div class="dbox donate">
102 102
 <a name="donate"></a>
103 103
 <h2>Donate to others to run for you</h2>
104
-<p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
105
-href="http://noisetor.net/">Noisetor</a> will turn donations into Tor
104
+<p>Both <a href="https://www.torservers.net/">torservers</a> and <a
105
+href="http://noisetor.net/">Noisetor</a> will turn your donation into Tor
106 106
 exit relays.</p>
107 107
 </div>
108 108
 </div>
Browse code

change the doc links to the correct sections and references.

Andrew Lewman authored on12/03/2012 02:09:41
Showing1 changed files
... ...
@@ -48,7 +48,6 @@ see less traffic than a relay, and will only be the first hop in the
48 48
 three hop circuit. </p>
49 49
 
50 50
 <h3>Microsoft Windows</h3>
51
-<p>
52 51
 <ul>
53 52
 <li>Be a Bridge: <a
54 53
 href="<package-win32-bridge-bundle-stable>">package</a>, <a
... ...
@@ -59,10 +58,9 @@ href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
59 58
 href="<package-win32-exit-bundle-stable>">package</a>, <a
60 59
 href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
61 60
 </ul>
62
-Read the instructions on how to configure a <a
63
-href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
64
-<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
65
-</p>
61
+<p>Read the instructions on how to configure a <a href="<page
62
+docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
63
+docs/tor-doc-relay>#setup">relay</a>.</p>
66 64
 
67 65
 <h3>Mac OS X</h3>
68 66
 <ul>
... ...
@@ -73,17 +71,17 @@ href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
73 71
 href="<package-osx-ppc-bundle-stable>">package</a>, <a
74 72
 href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
75 73
 </ul>
76
-<p>Read the instructions on how to configure a <a
77
-href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a
78
-href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
74
+<p>Read the instructions on how to configure a <a href="<page
75
+docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
76
+docs/tor-doc-relay>#setup">relay</a>.</p>
79 77
 
80 78
 <h3>Unix, Linux, BSD, and everything else</h3>
81 79
 <p>We assume you're an expert and can figure out how to install
82 80
 Tor by yourself. You can also download Tor from one of our <a
83 81
 href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>
84
-<p>Read the instructions on how to configure a <a
85
-href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a
86
-href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
82
+<p>Read the instructions on how to configure a <a href="<page
83
+docs/bridges>#RunningABridge">bridge</a> or a <a href="<page
84
+docs/tor-doc-relay>#setup">relay</a>.</p>
87 85
 </div>
88 86
 </div>
89 87
 
Browse code

we have no div class underline.

Andrew Lewman authored on12/03/2012 02:03:45
Showing1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
 
14 14
 <h1>Join the Tor Network</h1>
15
-<div class="underline"></div>
15
+<hr>
16 16
 
17 17
 <div align="center">
18 18
 <video id="v1"
... ...
@@ -24,14 +24,14 @@ autobuffer="true" controls="controls"></video>
24 24
 created a video to encourage you to join the Tor Network (<a
25 25
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
26 26
 version</a>). If you want to help us translate it into your language,
27
-<a href="<page about/contact>">let us know!</a>.</p>
27
+<a href="<page about/contact>">let us know</a>!</p>
28 28
 
29 29
 <p>The Tor network relies on volunteers to donate bandwidth. The more
30 30
 people who run Tor as a bridge or a relay, the faster and safer the
31 31
 network becomes.</p>
32 32
 
33 33
 <h1>Three ways to join and help out</h1>
34
-<div class="underline"></div>
34
+<hr>
35 35
 <ul class="hlist">
36 36
 <li><a href="#diy">Run it yourself.</a></li>
37 37
 <li><a href="#cloud">Run it in the cloud.</a></li>
Browse code

use div underline instead of both.

Andrew Lewman authored on12/03/2012 01:56:54
Showing1 changed files
... ...
@@ -12,7 +12,6 @@
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
 
14 14
 <h1>Join the Tor Network</h1>
15
-<hr><br>
16 15
 <div class="underline"></div>
17 16
 
18 17
 <div align="center">
... ...
@@ -32,6 +31,7 @@ people who run Tor as a bridge or a relay, the faster and safer the
32 31
 network becomes.</p>
33 32
 
34 33
 <h1>Three ways to join and help out</h1>
34
+<div class="underline"></div>
35 35
 <ul class="hlist">
36 36
 <li><a href="#diy">Run it yourself.</a></li>
37 37
 <li><a href="#cloud">Run it in the cloud.</a></li>
Browse code

revert back to dbox donate for sections.

Andrew Lewman authored on12/03/2012 01:54:23
Showing1 changed files
... ...
@@ -88,7 +88,7 @@ href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
88 88
 </div>
89 89
 
90 90
 <div class="hundred toptwenty">
91
-<div class="dbox dsmall givv">
91
+<div class="dbox donate">
92 92
 <a name="cloud"></a>
93 93
 <h2>Use the cloud</h2>
94 94
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
... ...
@@ -100,7 +100,7 @@ will only take you a couple of minutes.</p>
100 100
 </div>
101 101
 
102 102
 <div class="hundred toptwenty">
103
-<div class="dbox dsmall givv">
103
+<div class="dbox donate">
104 104
 <a name="donate"></a>
105 105
 <h2>Donate to others to run for you</h2>
106 106
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
Browse code

make the last section not so linux specific.

Andrew Lewman authored on12/03/2012 01:50:54
Showing1 changed files
... ...
@@ -77,7 +77,7 @@ href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
77 77
 href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a
78 78
 href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
79 79
 
80
-<h3>Linux</h3>
80
+<h3>Unix, Linux, BSD, and everything else</h3>
81 81
 <p>We assume you're an expert and can figure out how to install
82 82
 Tor by yourself. You can also download Tor from one of our <a
83 83
 href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>
Browse code

try to get the last two options to play nicely side by side.

Andrew Lewman authored on12/03/2012 01:49:30
Showing1 changed files
... ...
@@ -47,7 +47,7 @@ you.</a></li>
47 47
 see less traffic than a relay, and will only be the first hop in the
48 48
 three hop circuit. </p>
49 49
 
50
-<h3>Windows</h3>
50
+<h3>Microsoft Windows</h3>
51 51
 <p>
52 52
 <ul>
53 53
 <li>Be a Bridge: <a
... ...
@@ -65,7 +65,6 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
65 65
 </p>
66 66
 
67 67
 <h3>Mac OS X</h3>
68
-<p>
69 68
 <ul>
70 69
 <li>Be a Bridge (Intel Macs): <a
71 70
 href="<package-osx-x86-bundle-stable>">package</a>, <a
... ...
@@ -74,26 +73,22 @@ href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
74 73
 href="<package-osx-ppc-bundle-stable>">package</a>, <a
75 74
 href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
76 75
 </ul>
77
-Read the instructions on how to configure a <a
78
-href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
79
-<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
80
-</p>
76
+<p>Read the instructions on how to configure a <a
77
+href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a
78
+href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
81 79
 
82 80
 <h3>Linux</h3>
83
-<p>
84
-We assume you're an expert and can figure out how to install
81
+<p>We assume you're an expert and can figure out how to install
85 82
 Tor by yourself. You can also download Tor from one of our <a
86 83
 href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>
87
-<p>
88
-Read the instructions on how to configure a <a
89
-href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
90
-<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
91
-</p>
84
+<p>Read the instructions on how to configure a <a
85
+href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a <a
86
+href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.</p>
92 87
 </div>
93 88
 </div>
94 89
 
95 90
 <div class="hundred toptwenty">
96
-<div class="dbox dsmall">
91
+<div class="dbox dsmall givv">
97 92
 <a name="cloud"></a>
98 93
 <h2>Use the cloud</h2>
99 94
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
... ...
@@ -105,7 +100,7 @@ will only take you a couple of minutes.</p>
105 100
 </div>
106 101
 
107 102
 <div class="hundred toptwenty">
108
-<div class="dbox dsmall">
103
+<div class="dbox dsmall givv">
109 104
 <a name="donate"></a>
110 105
 <h2>Donate to others to run for you</h2>
111 106
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
Browse code

boxes.

Andrew Lewman authored on12/03/2012 01:45:04
Showing1 changed files
... ...
@@ -16,7 +16,9 @@
16 16
 <div class="underline"></div>
17 17
 
18 18
 <div align="center">
19
-<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p>
19
+<video id="v1"
20
+src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv"
21
+autobuffer="true" controls="controls"></video>
20 22
 </div>
21 23
 
22 24
 <p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
... ...
@@ -33,10 +35,12 @@ network becomes.</p>
33 35
 <ul class="hlist">
34 36
 <li><a href="#diy">Run it yourself.</a></li>
35 37
 <li><a href="#cloud">Run it in the cloud.</a></li>
36
-<li><a href="#donate">Donate to others to run it for you.</a></li>
38
+<li class="last"><a href="#donate">Donate to others to run it for
39
+you.</a></li>
37 40
 </ul>
38 41
 
39 42
 <div class="hundred toptwenty">
43
+<div class="dbox donate">
40 44
 <a name="diy"></a>
41 45
 <h2>Run it yourself</h2>
42 46
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
... ...
@@ -46,9 +50,14 @@ three hop circuit. </p>
46 50
 <h3>Windows</h3>
47 51
 <p>
48 52
 <ul>
49
-<li>Be a Bridge: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
50
-<li>Be a Relay: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
51
-<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>
53
+<li>Be a Bridge: <a
54
+href="<package-win32-bridge-bundle-stable>">package</a>, <a
55
+href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
56
+<li>Be a Relay: <a href="<package-win32-relay-bundle-stable>">package</a>,
57
+<a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
58
+<li>Be an Exit Relay: <a
59
+href="<package-win32-exit-bundle-stable>">package</a>, <a
60
+href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
52 61
 </ul>
53 62
 Read the instructions on how to configure a <a
54 63
 href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
... ...
@@ -58,7 +67,12 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
58 67
 <h3>Mac OS X</h3>
59 68
 <p>
60 69
 <ul>
61
-<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>
70
+<li>Be a Bridge (Intel Macs): <a
71
+href="<package-osx-x86-bundle-stable>">package</a>, <a
72
+href="<package-osx-x86-bundle-stable>.asc">signature</a></li>
73
+<li>Be a Bridge (PowerPC Macs ): <a
74
+href="<package-osx-ppc-bundle-stable>">package</a>, <a
75
+href="<package-osx-ppc-bundle-stable>.asc">signature</a></li>
62 76
 </ul>
63 77
 Read the instructions on how to configure a <a
64 78
 href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
... ...
@@ -76,8 +90,10 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
76 90
 <a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
77 91
 </p>
78 92
 </div>
93
+</div>
79 94
 
80 95
 <div class="hundred toptwenty">
96
+<div class="dbox dsmall">
81 97
 <a name="cloud"></a>
82 98
 <h2>Use the cloud</h2>
83 99
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
... ...
@@ -86,14 +102,17 @@ user-friendly way of deploying bridges to help users access an uncensored
86 102
 Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and
87 103
 will only take you a couple of minutes.</p>
88 104
 </div>
105
+</div>
89 106
 
90 107
 <div class="hundred toptwenty">
108
+<div class="dbox dsmall">
91 109
 <a name="donate"></a>
92 110
 <h2>Donate to others to run for you</h2>
93 111
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
94 112
 href="http://noisetor.net/">Noisetor</a> will turn donations into Tor
95 113
 exit relays.</p>
96 114
 </div>
115
+</div>
97 116
 
98 117
 </div>
99 118
 <!-- END MAINCOL -->
Browse code

try breaking up the sections visually.

Andrew Lewman authored on12/03/2012 01:39:14
Showing1 changed files
... ...
@@ -29,13 +29,14 @@ version</a>). If you want to help us translate it into your language,
29 29
 people who run Tor as a bridge or a relay, the faster and safer the
30 30
 network becomes.</p>
31 31
 
32
-<h1>3 ways to join and help out</h1>
32
+<h1>Three ways to join and help out</h1>
33 33
 <ul class="hlist">
34 34
 <li><a href="#diy">Run it yourself.</a></li>
35 35
 <li><a href="#cloud">Run it in the cloud.</a></li>
36 36
 <li><a href="#donate">Donate to others to run it for you.</a></li>
37 37
 </ul>
38 38
 
39
+<div class="hundred toptwenty">
39 40
 <a name="diy"></a>
40 41
 <h2>Run it yourself</h2>
41 42
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
... ...
@@ -74,10 +75,9 @@ Read the instructions on how to configure a <a
74 75
 href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
75 76
 <a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
76 77
 </p>
78
+</div>
77 79
 
78
-<br>
79
-
80
-<div class="nb">
80
+<div class="hundred toptwenty">
81 81
 <a name="cloud"></a>
82 82
 <h2>Use the cloud</h2>
83 83
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
... ...
@@ -87,7 +87,7 @@ Internet. Setting up a Tor bridge on Amazon EC2 is cheap, simple, and
87 87
 will only take you a couple of minutes.</p>
88 88
 </div>
89 89
 
90
-<div class="nb">
90
+<div class="hundred toptwenty">
91 91
 <a name="donate"></a>
92 92
 <h2>Donate to others to run for you</h2>
93 93
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
Browse code

move the anchors above the title

Andrew Lewman authored on12/03/2012 01:35:30
Showing1 changed files
... ...
@@ -36,8 +36,8 @@ network becomes.</p>
36 36
 <li><a href="#donate">Donate to others to run it for you.</a></li>
37 37
 </ul>
38 38
 
39
-<h2>Run it yourself</h2>
40 39
 <a name="diy"></a>
40
+<h2>Run it yourself</h2>
41 41
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
42 42
 see less traffic than a relay, and will only be the first hop in the
43 43
 three hop circuit. </p>
... ...
@@ -78,8 +78,8 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
78 78
 <br>
79 79
 
80 80
 <div class="nb">
81
-<h2>Use the cloud</h2>
82 81
 <a name="cloud"></a>
82
+<h2>Use the cloud</h2>
83 83
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
84 84
 runs on the Amazon EC2 cloud computing platform. This gives you a
85 85
 user-friendly way of deploying bridges to help users access an uncensored
... ...
@@ -88,14 +88,13 @@ will only take you a couple of minutes.</p>
88 88
 </div>
89 89
 
90 90
 <div class="nb">
91
-<h2>Donate to others to run for you</h2>
92 91
 <a name="donate"></a>
92
+<h2>Donate to others to run for you</h2>
93 93
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
94 94
 href="http://noisetor.net/">Noisetor</a> will turn donations into Tor
95 95
 exit relays.</p>
96 96
 </div>
97 97
 
98
-
99 98
 </div>
100 99
 <!-- END MAINCOL -->
101 100
 <div id = "sidecol">
Browse code

close an open a tag.

Andrew Lewman authored on12/03/2012 01:32:48
Showing1 changed files
... ...
@@ -37,7 +37,7 @@ network becomes.</p>
37 37
 </ul>
38 38
 
39 39
 <h2>Run it yourself</h2>
40
-<a name="diy">
40
+<a name="diy"></a>
41 41
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
42 42
 see less traffic than a relay, and will only be the first hop in the
43 43
 three hop circuit. </p>
Browse code

create a menu up top, re-center the video, anchor the sections.

Andrew Lewman authored on12/03/2012 01:32:09
Showing1 changed files
... ...
@@ -6,30 +6,38 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a> 
9
-    <a href="<page getinvolved/relays>">Set up relays</a>
9
+    <a href="<page getinvolved/relays>">Join the Tor Network</a>
10 10
   </div>
11 11
   <div id="maincol"> 
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
13 13
 
14
-<h1>Join the Tor network</h1>
14
+<h1>Join the Tor Network</h1>
15 15
 <hr><br>
16 16
 <div class="underline"></div>
17 17
 
18
-<div class="center">
18
+<div align="center">
19 19
 <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p>
20 20
 </div>
21 21
 
22 22
 <p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
23 23
 created a video to encourage you to join the Tor Network (<a
24 24
 href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
25
-version</a>). If you'd like to help us translate it to your language,
26
-<a href="<page about/contact>">let us know!</a></p>
25
+version</a>). If you want to help us translate it into your language,
26
+<a href="<page about/contact>">let us know!</a>.</p>
27 27
 
28 28
 <p>The Tor network relies on volunteers to donate bandwidth. The more
29 29
 people who run Tor as a bridge or a relay, the faster and safer the
30 30
 network becomes.</p>
31 31
 
32
-<h2>Option 1: Use your own computer</h2>
32
+<h1>3 ways to join and help out</h1>
33
+<ul class="hlist">
34
+<li><a href="#diy">Run it yourself.</a></li>
35
+<li><a href="#cloud">Run it in the cloud.</a></li>
36
+<li><a href="#donate">Donate to others to run it for you.</a></li>
37
+</ul>
38
+
39
+<h2>Run it yourself</h2>
40
+<a name="diy">
33 41
 <p>You can run Tor as either a bridge or a relay. A bridge will usually
34 42
 see less traffic than a relay, and will only be the first hop in the
35 43
 three hop circuit. </p>
... ...
@@ -70,7 +78,8 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
70 78
 <br>
71 79
 
72 80
 <div class="nb">
73
-<h2>Option 2: Use the cloud</h2>
81
+<h2>Use the cloud</h2>
82
+<a name="cloud"></a>
74 83
 <p><a href="https://cloud.torproject.org/">The Tor Cloud project</a>
75 84
 runs on the Amazon EC2 cloud computing platform. This gives you a
76 85
 user-friendly way of deploying bridges to help users access an uncensored
... ...
@@ -79,7 +88,8 @@ will only take you a couple of minutes.</p>
79 88
 </div>
80 89
 
81 90
 <div class="nb">
82
-<h2>Option 3: Donate</h2>
91
+<h2>Donate to others to run for you</h2>
92
+<a name="donate"></a>
83 93
 <p>Both <a href="https://www.torservers.net/">torservers.net</a> and <a
84 94
 href="http://noisetor.net/">Noisetor</a> will turn donations into Tor
85 95
 exit relays.</p>
Browse code

put the video up top.

Andrew Lewman authored on12/03/2012 00:51:25
Showing1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # Revision: $Revision: 25517 $
3 3
 # Translation-Priority: 4-optional
4 4
 
5
-#include "head.wmi" TITLE="Tor: Become a part of the Tor network" CHARSET="UTF-8"
5
+#include "head.wmi" TITLE="Tor: Join the Tor Network" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a> 
... ...
@@ -14,16 +14,17 @@
14 14
 <h1>Join the Tor network</h1>
15 15
 <hr><br>
16 16
 <div class="underline"></div>
17
-<p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
18
-created a video to encourage you to join the Tor Network (<a
19
-href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
20
-Version here</a>). If you'd like to help us translate it to your language,
21
-<a href="<page about/contact>">let us know!</a></p>
22 17
 
23 18
 <div class="center">
24 19
 <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p>
25 20
 </div>
26 21
 
22
+<p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
23
+created a video to encourage you to join the Tor Network (<a
24
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
25
+version</a>). If you'd like to help us translate it to your language,
26
+<a href="<page about/contact>">let us know!</a></p>
27
+
27 28
 <p>The Tor network relies on volunteers to donate bandwidth. The more
28 29
 people who run Tor as a bridge or a relay, the faster and safer the
29 30
 network becomes.</p>
Browse code

video tags play the 320 version instead of HD by default.

Andrew Lewman authored on12/03/2012 00:47:36
Showing1 changed files
... ...
@@ -21,7 +21,7 @@ Version here</a>). If you'd like to help us translate it to your language,
21 21
 <a href="<page about/contact>">let us know!</a></p>
22 22
 
23 23
 <div class="center">
24
-<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" controls="controls"></video></p>
24
+<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges.ogv" autobuffer="true" controls="controls"></video></p>
25 25
 </div>
26 26
 
27 27
 <p>The Tor network relies on volunteers to donate bandwidth. The more
Browse code

link to the HD version, work on a smaller 320 video for the autoplay in the page.

Andrew Lewman authored on12/03/2012 00:42:46
Showing1 changed files
... ...
@@ -14,10 +14,11 @@
14 14
 <h1>Join the Tor network</h1>
15 15
 <hr><br>
16 16
 <div class="underline"></div>
17
-<p><a href="https://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>
17
+<p><a href="https://www.tacticaltech.org/">Tactical Tech</a>
18
+created a video to encourage you to join the Tor Network (<a
19
+href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv">HD
20
+Version here</a>). If you'd like to help us translate it to your language,
21
+<a href="<page about/contact>">let us know!</a></p>
21 22
 
22 23
 <div class="center">
23 24
 <p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" controls="controls"></video></p>
Browse code

rework the linux section.

Andrew Lewman authored on12/03/2012 00:37:10
Showing1 changed files
... ...
@@ -56,12 +56,13 @@ href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
56 56
 
57 57
 <h3>Linux</h3>
58 58
 <p>
59
-<ul>
60
-<li>Tor Browser Bundle: <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">package</a>, <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">signature</a></li>
61
-<li>Tor Browser Bundle, 64-bit: <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">package</a>, <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">signature</a></li>
62
-</ul>
63
-You can also download Tor from one of our <a
64
-href="https://www.torproject.org/download/download-unix.html.en">repositories</a>. Read the instructions for how to configure Tor 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>.
59
+We assume you're an expert and can figure out how to install
60
+Tor by yourself. You can also download Tor from one of our <a
61
+href="https://www.torproject.org/download/download-unix.html.en">repositories</a>.</p>
62
+<p>
63
+Read the instructions on how to configure a <a
64
+href="https://www.torproject.org/docs/bridges.html.en">bridge</a> or a
65
+<a href="https://www.torproject.org/docs/tor-doc-relay.html.en">relay</a>.
65 66
 </p>
66 67
 
67 68
 <br>
Browse code

from skep, link to TTC https site.

Andrew Lewman authored on12/03/2012 00:34:51
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 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> created a
17
+<p><a href="https://www.tacticaltech.org/">Tactical Tech</a> created a
18 18
 video to encourage you to join the Tor Network. If you'd like to help
19 19
 us translate it to your language, <a href="<page about/contact>">let
20 20
 us know!</a></p>
Browse code

make the text more marketing-like.

Andrew Lewman authored on12/03/2012 00:32:57
Showing1 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>
Browse code

forcing non-native height makes the video look funny.

Andrew Lewman authored on12/03/2012 00:25:58
Showing1 changed files
... ...
@@ -19,7 +19,7 @@ video to encourage more people to become a part of the Tor network.
19 19
 Below is the English version. We are working on translated videos as
20 20
 well.</p>
21 21
 <div class="center">
22
-<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" width="700" height="340" controls="controls"></video></p>
22
+<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" controls="controls"></video></p>
23 23
 </div>
24 24
 <p>The Tor network relies on volunteers to donate bandwidth. The more
25 25
 people who run Tor as a bridge or a relay, and become a part of the Tor
Browse code

Copy video tags from torbrowser.wml

Runa A. Sandvik authored on12/03/2012 00:23:11
Showing1 changed files
... ...
@@ -19,9 +19,7 @@ video to encourage more people to become a part of the Tor network.
19 19
 Below is the English version. We are working on translated videos as
20 20
 well.</p>
21 21
 <div class="center">
22
-<p><video id="v1" width="700" height="340" autobuffer="true" controls="controls">
23
-    <source src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" type="video/mp4" />
24
-</video></p>
22
+<p><video id="v1" src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" autobuffer="true" width="700" height="340" controls="controls"></video></p>
25 23
 </div>
26 24
 <p>The Tor network relies on volunteers to donate bandwidth. The more
27 25
 people who run Tor as a bridge or a relay, and become a part of the Tor
Browse code

Now with working video

Runa A. Sandvik authored on12/03/2012 00:12:54
Showing1 changed files
... ...
@@ -20,7 +20,7 @@ Below is the English version. We are working on translated videos as
20 20
 well.</p>
21 21
 <div class="center">
22 22
 <p><video id="v1" width="700" height="340" autobuffer="true" controls="controls">
23
-    <source src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.mp4" type="video/mp4" />
23
+    <source src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.ogv" type="video/mp4" />
24 24
 </video></p>
25 25
 </div>
26 26
 <p>The Tor network relies on volunteers to donate bandwidth. The more
Browse code

Add relays page, need to fix the video

Runa A. Sandvik authored on11/03/2012 23:54:27
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,87 @@
1
+## translation metadata
2
+# Revision: $Revision: 25517 $
3
+# Translation-Priority: 4-optional
4
+
5
+#include "head.wmi" TITLE="Tor: Become a part of the Tor network" CHARSET="UTF-8"
6
+<div id="content" class="clearfix">
7
+  <div id="breadcrumbs">
8
+    <a href="<page index>">Home &raquo; </a> 
9
+    <a href="<page getinvolved/relays>">Set up relays</a>
10
+  </div>
11
+  <div id="maincol"> 
12
+    <!-- PUT CONTENT AFTER THIS TAG -->
13
+
14
+<h1>Be a part of the Tor network</h1>
15
+<hr><br>
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>
21
+<div class="center">
22
+<p><video id="v1" width="700" height="340" autobuffer="true" controls="controls">
23
+    <source src="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD.mp4" type="video/mp4" />
24
+</video></p>
25
+</div>
26
+<p>The Tor network relies on volunteers to donate bandwidth. The more
27
+people who run Tor as a bridge or a relay, and become a part of the Tor
28
+network, the faster the network will be.</p>
29
+
30
+
31
+<h2>Option 1: Use your own computer</h2>
32
+<p>You can run Tor as either a bridge or a relay. A bridge will usually
33
+see less traffic than a relay, and will only be used to transfer data
34
+from a client to the rest of the Tor network.</p>
35
+<h3>Windows</h3>
36
+<p>
37
+<ul>
38
+<li>Vidalia Bridge Bundle: <a href="<package-win32-bridge-bundle-stable>">package</a>, <a href="<package-win32-bridge-bundle-stable>.asc">signature</a></li>
39
+<li>Vidalia Relay Bundle: <a href="<package-win32-relay-bundle-stable>">package</a>, <a href="<package-win32-relay-bundle-stable>.asc">signature</a></li>
40
+<li>Vidalia Exit Bundle: <a href="<package-win32-exit-bundle-stable>">package</a>, <a href="<package-win32-exit-bundle-stable>.asc">signature</a></li>
41
+</ul>
42
+</p>
43
+
44
+<h3>Mac OS X</h3>
45
+<p>
46
+<ul>
47
+<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>
48
+<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>
49
+<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>
50
+<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>
51
+</ul>
52
+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>.
53
+</p>
54
+
55
+<h3>Linux</h3>
56
+<p>
57
+<ul>
58
+<li>Tor Browser Bundle: <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">package</a>, <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">signature</a></li>
59
+<li>Tor Browser Bundle, 64-bit: <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">package</a>, <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">signature</a></li>
60
+</ul>
61
+You can also download Tor from one of our <a
62
+href="https://www.torproject.org/download/download-unix.html.en">repositories</a>. Read the instructions for how to configure Tor 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>.
63
+</p>
64
+
65
+<br>
66
+
67
+<div class="nb">
68
+<h2>Option 2: Use the cloud</h2>
69
+<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>
70
+</div>
71
+
72
+<div class="nb">
73
+<h2>Option 3: Donate</h2>
74
+<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>
75
+</div>
76
+
77
+
78
+  </div>
79
+  <!-- END MAINCOL -->
80
+  <div id = "sidecol">
81
+#include "side.wmi"
82
+#include "info.wmi"
83
+  </div>
84
+  <!-- END SIDECOL -->
85
+</div>
86
+<!-- END CONTENT -->
87
+#include <foot.wmi>