Browse code

Use "Tor" as a descriptor rather than a noun; add anchors for the page sections; make 0.0.8 into a variable.

Roger Dingledine authored on04/03/2008 02:12:38
Showing2 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 <define-tag version-stable whitespace=delete>0.1.2.19</define-tag>
2
-<define-tag version-alpha whitespace=delete>0.2.0.20-rc</define-tag>
2
+<define-tag version-alpha whitespace=delete>0.2.0.21-rc</define-tag>
3 3
 
4 4
 <define-tag version-win32-stable whitespace=delete>0.1.2.19</define-tag>
5 5
 <define-tag version-win32-alpha whitespace=delete>0.2.0.20-rc</define-tag>
... ...
@@ -29,6 +29,8 @@
29 29
 <define-tag version-rpmsuse-stable whitespace=delete>0.1.2.19</define-tag>
30 30
 <define-tag version-rpmsuse-alpha whitespace=delete>0.2.0.20.rc</define-tag>
31 31
 
32
+<define-tag version-torbrowserbundle whitespace=delete>0.0.8</define-tag>
33
+
32 34
 <define-tag package-rpm4-stable whitespace=delete>dist/rpm/tor-<version-rpm4-stable>-tor.0.rh4_6.i386.rpm</define-tag>
33 35
 <define-tag package-srpm4-stable whitespace=delete>dist/rpm/tor-<version-rpm4-stable>-tor.0.rh4_6.src.rpm</define-tag>
34 36
 
... ...
@@ -11,7 +11,7 @@
11 11
 <h2>Tor Browser Bundle</h2>
12 12
 <hr>
13 13
 
14
-<p><strong>Tor</strong> is a software project that protects you by bouncing
14
+<p>The <strong>Tor</strong> software protects you by bouncing
15 15
 your communications around a distributed network of relays run by volunteers
16 16
 all around the world: it prevents somebody watching your Internet connection
17 17
 from learning what sites you visit, it prevents the sites you visit from
... ...
@@ -22,38 +22,39 @@ blocked.</p>
22 22
 install any software.  It can run off a USB flash drive, comes with a
23 23
 pre-configured web browser and is self contained.  If you would prefer to use
24 24
 your existing web browser, install Tor permanently, or if you don't use
25
-Windows, see the other ways to <a href="/download.html.en">download
25
+Windows, see the other ways to <a href="<page download>">download
26 26
 Tor</a>.</p>
27 27
 
28
-<h3>Download Tor Browser bundle</h3>
28
+<a id="Download"></a>
29
+<h3><a class="anchor" href="#Download">Download Tor Browser bundle</a></h3>
29 30
 
30
-<p>To start using the Tor Browser bundle, download the file for your preferred
31
+<p>To start using the Tor Browser Bundle, download the file for your preferred
31 32
 language. This file can be saved wherever is convenient, e.g. the Desktop or a
32 33
 USB flash drive.</p>
33 34
 
34
-<p style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows (version 0.0.8, 13 MB)</p>
35
+<p style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows (version <version-torbrowserbundle>, 13 MB)</p>
35 36
 
36 37
 <ul>
37 38
 
38
-<li><a href="dist/tor-browser-0.0.8_en-US.exe">English (en-US)</a> (<a href="dist/tor-browser-0.0.8_en-US.exe.asc" style="font-size: 80%;">signature</a>)</li>
39
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe">English (en-US)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc" style="font-size: 80%;">signature</a>)</li>
39 40
 
40
-<li><a href="dist/tor-browser-0.0.8_ar.exe">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a href="dist/tor-browser-0.0.8_ar.exe.asc" style="font-size: 80%;">signature</a>)</li>
41
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ar.exe">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_ar.exe.asc" style="font-size: 80%;">signature</a>)</li>
41 42
 
42
-<li><a href="dist/tor-browser-0.0.8_de.exe">Deutsch (de)</a> (<a href="dist/tor-browser-0.0.8_de.exe.asc" style="font-size: 80%;">signature</a>)</li>
43
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_de.exe">Deutsch (de)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_de.exe.asc" style="font-size: 80%;">signature</a>)</li>
43 44
 
44
-<li><a href="dist/tor-browser-0.0.8_es-ES.exe">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> (<a href="dist/tor-browser-0.0.8_es-ES.exe.asc" style="font-size: 80%;">signature</a>)</li>
45
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_es-ES.exe">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc" style="font-size: 80%;">signature</a>)</li>
45 46
 
46
-<li><a href="dist/tor-browser-0.0.8_fa-IR.exe">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a> (<a href="dist/tor-browser-0.0.8_fa-IR.exe.asc" style="font-size: 80%;">signature</a>)</li>
47
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa-IR)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe.asc" style="font-size: 80%;">signature</a>)</li>
47 48
 
48
-<li><a href="dist/tor-browser-0.0.8_fr.exe">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> (<a href="dist/tor-browser-0.0.8_fr.exe.asc" style="font-size: 80%;">signature</a>)</li>
49
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fr.exe">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc" style="font-size: 80%;">signature</a>)</li>
49 50
 
50
-<li><a href="dist/tor-browser-0.0.8_nl.exe">Nederlands (nl)</a> (<a href="dist/tor-browser-0.0.8_nl.exe.asc" style="font-size: 80%;">signature</a>)</li>
51
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_nl.exe">Nederlands (nl)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_nl.exe.asc" style="font-size: 80%;">signature</a>)</li>
51 52
 
52
-<li><a href="dist/tor-browser-0.0.8_pt-PT.exe">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a> (<a href="dist/tor-browser-0.0.8_pt-PT.exe.asc" style="font-size: 80%;">signature</a>)</li>
53
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc" style="font-size: 80%;">signature</a>)</li>
53 54
 
54
-<li><a href="dist/tor-browser-0.0.8_ru.exe">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a href="dist/tor-browser-0.0.8_ru.exe.asc" style="font-size: 80%;">signature</a>)</li>
55
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ru.exe">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc" style="font-size: 80%;">signature</a>)</li>
55 56
 
56
-<li><a href="dist/tor-browser-0.0.8_zh-CN.exe">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href="dist/tor-browser-0.0.8_zh-CN.exe.asc" style="font-size: 80%;">signature</a>)</li>
57
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc" style="font-size: 80%;">signature</a>)</li>
57 58
 
58 59
 </ul>
59 60
 
... ...
@@ -62,7 +63,8 @@ href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures">ho
62 63
 to verify package signatures</a>, which allows you to make sure you've
63 64
 downloaded the file we intended you to get.</p>
64 65
 
65
-<h3>Extraction</h3>
66
+<a id="Extraction"></a>
67
+<h3><a class="anchor" href="#Extraction">Extraction</a></h3>
66 68
 
67 69
 <p>Download the file above, and save it somewhere, then double click on it.
68 70
 Click on the button labelled <strong>"..."</strong> (1) and select where you want
... ...
@@ -77,7 +79,8 @@ few minutes to complete.</p>
77 79
 
78 80
 <p><img src="img/screenshot1.png" alt="Screenshot of extraction process"></p>
79 81
 
80
-<h3>Usage</h3>
82
+<a id="Usage"></a>
83
+<h3><a class="anchor" href="#Usage">Usage</a></h3>
81 84
 
82 85
 <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>
83 86
 
... ...
@@ -90,10 +93,10 @@ few minutes to complete.</p>
90 93
 
91 94
 <p>Once Tor is ready, Firefox will automatically be opened. Only web pages
92 95
 visited through the included Firefox browser will be sent via Tor. Other web
93
-browsers, such as Internet Explorer are not affected. Make sure that it says
96
+browsers such as Internet Explorer are not affected. Make sure that it says
94 97
 <span style="color: #0a0">"Tor Enabled"</span> (5) in the bottom right corner
95 98
 before using it. To reduce the risk of confusion, don't run Firefox while using
96
-the Tor Browser Bundle, and close existing windows before starting.</p>
99
+the Tor Browser Bundle, and close existing Firefox windows before starting.</p>
97 100
 
98 101
 <p><img src="img/screenshot3.png" alt="Screenshot of Firefox"></p>
99 102
 
... ...
@@ -101,14 +104,17 @@ the Tor Browser Bundle, and close existing windows before starting.</p>
101 104
 on the <img src="img/close-button.png" alt="Close button (&times;)"> (6).
102 105
 Vidalia and Tor will automatically close.  For privacy reasons, the list of
103 106
 webpages you visited and any cookies will be deleted. To use it again, repeat
104
-the steps in "Usage".<p>
107
+the steps in <a href="#Usage">"Usage"</a>.<p>
105 108
 
106
-<h3>Comments and suggestions</h3>
109
+<a id="Feedback"></a>
110
+<h3><a class="anchor" href="#Feedback">Comments and suggestions</a></h3>
107 111
 
108 112
 <p>The Tor Browser Bundle is under development and not yet complete.
109 113
 To discuss improvements and submit comments, please use the <a
110 114
 href="http://archives.seul.org/or/talk/">or-talk</a> mailing list.</p>
111 115
 
116
+<a id="More"></a>
117
+<h3><a class="anchor" href="#More">More information</a></h3>
112 118
 <h3>More information</h3>
113 119
 
114 120
 <p><strong>What is Tor and why do I need it?</strong> To learn more about Tor, visit the <a
... ...
@@ -117,11 +123,11 @@ website</a>.</p>
117 123
 
118 124
 <p><strong>What is in the Tor Browser Bundle?</strong> It
119 125
 contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
120
-href="details.html#contents">learn more</a>).</p>
126
+href="<page torbrowser/details>#contents">learn more</a>).</p>
121 127
 
122 128
 <p><strong>How can I make my own bundle?</strong> To download
123 129
 the source code and learn how to build the bundle yourself, read the
124
-<a href="details.html#build">build instructions</a>.</p>
130
+<a href="<page torbrowser/details>#build">build instructions</a>.</p>
125 131
 
126 132
 </div><!-- #main -->
127 133