[or-cvs] r13836: Use "Tor" as a descriptor rather than a noun; add anchors fo (in website/trunk: include torbrowser/en)
arma at seul.org
arma at seul.org
Tue Mar 4 01:12:38 UTC 2008
Author: arma
Date: 2008-03-03 20:12:38 -0500 (Mon, 03 Mar 2008)
New Revision: 13836
Modified:
website/trunk/include/versions.wmi
website/trunk/torbrowser/en/index.wml
Log:
Use "Tor" as a descriptor rather than a noun; add anchors
for the page sections; make 0.0.8 into a variable.
Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi 2008-03-03 22:11:22 UTC (rev 13835)
+++ website/trunk/include/versions.wmi 2008-03-04 01:12:38 UTC (rev 13836)
@@ -1,5 +1,5 @@
<define-tag version-stable whitespace=delete>0.1.2.19</define-tag>
-<define-tag version-alpha whitespace=delete>0.2.0.20-rc</define-tag>
+<define-tag version-alpha whitespace=delete>0.2.0.21-rc</define-tag>
<define-tag version-win32-stable whitespace=delete>0.1.2.19</define-tag>
<define-tag version-win32-alpha whitespace=delete>0.2.0.20-rc</define-tag>
@@ -29,6 +29,8 @@
<define-tag version-rpmsuse-stable whitespace=delete>0.1.2.19</define-tag>
<define-tag version-rpmsuse-alpha whitespace=delete>0.2.0.20.rc</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>0.0.8</define-tag>
+
<define-tag package-rpm4-stable whitespace=delete>dist/rpm/tor-<version-rpm4-stable>-tor.0.rh4_6.i386.rpm</define-tag>
<define-tag package-srpm4-stable whitespace=delete>dist/rpm/tor-<version-rpm4-stable>-tor.0.rh4_6.src.rpm</define-tag>
Modified: website/trunk/torbrowser/en/index.wml
===================================================================
--- website/trunk/torbrowser/en/index.wml 2008-03-03 22:11:22 UTC (rev 13835)
+++ website/trunk/torbrowser/en/index.wml 2008-03-04 01:12:38 UTC (rev 13836)
@@ -11,7 +11,7 @@
<h2>Tor Browser Bundle</h2>
<hr>
-<p><strong>Tor</strong> is a software project that protects you by bouncing
+<p>The <strong>Tor</strong> software protects you by bouncing
your communications around a distributed network of relays run by volunteers
all around the world: it prevents somebody watching your Internet connection
from learning what sites you visit, it prevents the sites you visit from
@@ -22,38 +22,39 @@
install any software. It can run off a USB flash drive, comes with a
pre-configured web browser and is self contained. If you would prefer to use
your existing web browser, install Tor permanently, or if you don't use
-Windows, see the other ways to <a href="/download.html.en">download
+Windows, see the other ways to <a href="<page download>">download
Tor</a>.</p>
-<h3>Download Tor Browser bundle</h3>
+<a id="Download"></a>
+<h3><a class="anchor" href="#Download">Download Tor Browser bundle</a></h3>
-<p>To start using the Tor Browser bundle, download the file for your preferred
+<p>To start using the Tor Browser Bundle, download the file for your preferred
language. This file can be saved wherever is convenient, e.g. the Desktop or a
USB flash drive.</p>
-<p style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows (version 0.0.8, 13 MB)</p>
+<p style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows (version <version-torbrowserbundle>, 13 MB)</p>
<ul>
-<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>
+<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>
-<li><a href="dist/tor-browser-0.0.8_ar.exe">العربية (ar)</a> (<a href="dist/tor-browser-0.0.8_ar.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ar.exe">العربية (ar)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_ar.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<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>
+<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>
-<li><a href="dist/tor-browser-0.0.8_es-ES.exe">Español (es-ES)</a> (<a href="dist/tor-browser-0.0.8_es-ES.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_es-ES.exe">Español (es-ES)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<li><a href="dist/tor-browser-0.0.8_fa-IR.exe">فارسی (fa-IR)</a> (<a href="dist/tor-browser-0.0.8_fa-IR.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe">فارسی (fa-IR)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<li><a href="dist/tor-browser-0.0.8_fr.exe">Français (fr)</a> (<a href="dist/tor-browser-0.0.8_fr.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fr.exe">Français (fr)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_fr.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<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>
+<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>
-<li><a href="dist/tor-browser-0.0.8_pt-PT.exe">Português (pt-PT)</a> (<a href="dist/tor-browser-0.0.8_pt-PT.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe">Português (pt-PT)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<li><a href="dist/tor-browser-0.0.8_ru.exe">Русский (ru)</a> (<a href="dist/tor-browser-0.0.8_ru.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ru.exe">Русский (ru)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc" style="font-size: 80%;">signature</a>)</li>
-<li><a href="dist/tor-browser-0.0.8_zh-CN.exe">简体字 (zh-CN)</a> (<a href="dist/tor-browser-0.0.8_zh-CN.exe.asc" style="font-size: 80%;">signature</a>)</li>
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe">简体字 (zh-CN)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc" style="font-size: 80%;">signature</a>)</li>
</ul>
@@ -62,7 +63,8 @@
to verify package signatures</a>, which allows you to make sure you've
downloaded the file we intended you to get.</p>
-<h3>Extraction</h3>
+<a id="Extraction"></a>
+<h3><a class="anchor" href="#Extraction">Extraction</a></h3>
<p>Download the file above, and save it somewhere, then double click on it.
Click on the button labelled <strong>"..."</strong> (1) and select where you want
@@ -77,7 +79,8 @@
<p><img src="img/screenshot1.png" alt="Screenshot of extraction process"></p>
-<h3>Usage</h3>
+<a id="Usage"></a>
+<h3><a class="anchor" href="#Usage">Usage</a></h3>
<p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>
@@ -90,10 +93,10 @@
<p>Once Tor is ready, Firefox will automatically be opened. Only web pages
visited through the included Firefox browser will be sent via Tor. Other web
-browsers, such as Internet Explorer are not affected. Make sure that it says
+browsers such as Internet Explorer are not affected. Make sure that it says
<span style="color: #0a0">"Tor Enabled"</span> (5) in the bottom right corner
before using it. To reduce the risk of confusion, don't run Firefox while using
-the Tor Browser Bundle, and close existing windows before starting.</p>
+the Tor Browser Bundle, and close existing Firefox windows before starting.</p>
<p><img src="img/screenshot3.png" alt="Screenshot of Firefox"></p>
@@ -101,14 +104,17 @@
on the <img src="img/close-button.png" alt="Close button (×)"> (6).
Vidalia and Tor will automatically close. For privacy reasons, the list of
webpages you visited and any cookies will be deleted. To use it again, repeat
-the steps in "Usage".<p>
+the steps in <a href="#Usage">"Usage"</a>.<p>
-<h3>Comments and suggestions</h3>
+<a id="Feedback"></a>
+<h3><a class="anchor" href="#Feedback">Comments and suggestions</a></h3>
<p>The Tor Browser Bundle is under development and not yet complete.
To discuss improvements and submit comments, please use the <a
href="http://archives.seul.org/or/talk/">or-talk</a> mailing list.</p>
+<a id="More"></a>
+<h3><a class="anchor" href="#More">More information</a></h3>
<h3>More information</h3>
<p><strong>What is Tor and why do I need it?</strong> To learn more about Tor, visit the <a
@@ -117,11 +123,11 @@
<p><strong>What is in the Tor Browser Bundle?</strong> It
contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
-href="details.html#contents">learn more</a>).</p>
+href="<page torbrowser/details>#contents">learn more</a>).</p>
<p><strong>How can I make my own bundle?</strong> To download
the source code and learn how to build the bundle yourself, read the
-<a href="details.html#build">build instructions</a>.</p>
+<a href="<page torbrowser/details>#build">build instructions</a>.</p>
</div><!-- #main -->
More information about the tor-commits
mailing list