[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r15218: Update webpage for TBB 1.1.0 release (in website/trunk: include torbrowser/en torbrowser/img)
Author: sjm217
Date: 2008-06-13 09:49:49 -0400 (Fri, 13 Jun 2008)
New Revision: 15218
Added:
website/trunk/torbrowser/en/split.wml
website/trunk/torbrowser/img/screenshot1.png
website/trunk/torbrowser/img/screenshot2.png
website/trunk/torbrowser/img/screenshot3a.png
website/trunk/torbrowser/img/screenshot3b.png
website/trunk/torbrowser/img/split-screenshot1.png
website/trunk/torbrowser/img/split-screenshot2.png
Removed:
website/trunk/torbrowser/en/details-1.1.wml
website/trunk/torbrowser/en/img/
website/trunk/torbrowser/en/index-1.1.wml
website/trunk/torbrowser/en/split-1.1.wml
website/trunk/torbrowser/img/screenshot1.png
website/trunk/torbrowser/img/screenshot2.png
website/trunk/torbrowser/img/screenshot3.png
Modified:
website/trunk/include/versions.wmi
website/trunk/torbrowser/en/details.wml
website/trunk/torbrowser/en/index.wml
Log:
Update webpage for TBB 1.1.0 release
Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/include/versions.wmi 2008-06-13 13:49:49 UTC (rev 15218)
@@ -30,15 +30,15 @@
<define-tag version-rpmsuse-stable whitespace=delete>0.1.2.19</define-tag>
<define-tag version-rpmsuse-alpha whitespace=delete>0.2.0.27.rc</define-tag>
-<define-tag version-torbrowserbundle whitespace=delete>1.0.3</define-tag>
-<define-tag version-torbrowser-tor whitespace=delete>0.2.0.26-rc</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>1.1.0</define-tag>
+<define-tag version-torbrowser-tor whitespace=delete>0.2.1.1-alpha</define-tag>
<define-tag version-torbrowser-firefox whitespace=delete>2.0.0.14</define-tag>
-<define-tag version-torbrowser-torbutton whitespace=delete>1.1.18</define-tag>
+<define-tag version-torbrowser-torbutton whitespace=delete>1.2.0rc2</define-tag>
<define-tag version-torbrowser-polipo whitespace=delete>1.0.4</define-tag>
<define-tag version-torbrowser-pidgin whitespace=delete>2.4.2</define-tag>
<define-tag version-torbrowser-otr whitespace=delete>3.1</define-tag>
-<define-tag version-torimbrowserbundle whitespace=delete>1.0.3</define-tag>
+<define-tag version-torimbrowserbundle whitespace=delete>1.1.0</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>
Deleted: website/trunk/torbrowser/en/details-1.1.wml
===================================================================
--- website/trunk/torbrowser/en/details-1.1.wml 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/torbrowser/en/details-1.1.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -1,38 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-
-#include "head.wmi" TITLE="Tor Browser Bundle: Details"
-
-<div class="main-column">
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-
-<h2>Tor Browser Bundle: Details</h2>
-<hr>
-
-<h3 id="contents">Bundle contents</h3>
-
-<ul>
-<li>Vidalia (svn trunk revision 2718)</li>
-<li>Tor <version-torbrowser-tor> (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8h)</li>
-<li>FirefoxPortable <version-torbrowser-firefox> (includes Firefox
-<version-torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)</li>
-<li>Polipo <version-torbrowser-polipo></li>
-<li>Pidgin <version-torbrowser-pidgin> and OTR <version-torbrowser-otr> (only in Tor IM Browser Bundle)</li>
-</ul>
-
-<h3 id="build">Building the bundle</h3>
-
-<p>To re-build the bundle, download the <a
-href="dist/tor-browser-<version-torbrowserbundle>-src.tar.gz">source
-distribution</a> (<a
-href="dist/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">signature</a>).
-See <a
-href="https://svn.torproject.org/svn/torbrowser/trunk/README";>README</a> for
-the directory layout and changelog. Build instructions can be found in <a
-href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/INSTALL";>build-scripts/INSTALL</a>.</p>
-
-</div><!-- #main -->
-
-#include <foot.wmi>
-
Modified: website/trunk/torbrowser/en/details.wml
===================================================================
--- website/trunk/torbrowser/en/details.wml 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/torbrowser/en/details.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -13,12 +13,12 @@
<h3 id="contents">Bundle contents</h3>
<ul>
-<li>Vidalia (svn trunk revision 2346)</li>
-<li>Tor <version-torbrowser-tor> (with libevent-1.3e, zlib-1.2.3 and
-openssl-0.9.8g)</li>
+<li>Vidalia (svn trunk revision 2718)</li>
+<li>Tor <version-torbrowser-tor> (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8h)</li>
<li>FirefoxPortable <version-torbrowser-firefox> (includes Firefox
<version-torbrowser-firefox> and Torbutton <version-torbrowser-torbutton>)</li>
<li>Polipo <version-torbrowser-polipo></li>
+<li>Pidgin <version-torbrowser-pidgin> and OTR <version-torbrowser-otr> (only in Tor IM Browser Bundle)</li>
</ul>
<h3 id="build">Building the bundle</h3>
Deleted: website/trunk/torbrowser/en/index-1.1.wml
===================================================================
--- website/trunk/torbrowser/en/index-1.1.wml 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/torbrowser/en/index-1.1.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -1,193 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 1-high
-
-#include "head.wmi" TITLE="Tor Browser Bundle"
-
-<div class="main-column">
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-
-<h2>Tor Browser Bundle</h2>
-<hr>
-
-<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
-learning your physical location, and it lets you access sites which are
-blocked.</p>
-
-<p>The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows
-without needing to
-install any software. It can run off a USB flash drive, comes with a
-pre-configured web browser and is self contained.
-
-The <strong>Tor IM Browser Bundle</strong> additionally allows instant messaging and chat.
-
-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="<page download>">download
-Tor</a>.</p>
-
-<a id="Download"></a>
-<h3><a class="anchor" href="#Download">Download Tor Browser Bundle and Tor IM Browser Bundle</a></h3>
-
-<p>To start using the Tor Browser Bundle or Tor IM 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>If you have an unreliable Internet connection, it may be easier for you to download the bundle edition which is <a href="<page torbrowser/split-1.1>">split up</a> into smaller parts.</p>
-
-<p id="Download-torbrowserbundle" style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows with Firefox (version <version-torbrowserbundle>, 13 MB)</p>
-
-<ul>
-
-<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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">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: 90%;">signature</a>)</li>
-
-</ul>
-
-<p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, 20 MB)</p>
-
-<ul>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">English (en-US)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe">العربية (ar)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_de.exe">Deutsch (de)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe">Español (es-ES)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe">فارسی (fa-IR)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe">Français (fr)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe">Nederlands (nl)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe">Português (pt-PT)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe">Русский (ru)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe">简体字 (zh-CN)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc" style="font-size: 90%;">signature</a>)</li>
-
-</ul>
-
-<p>See our instructions on <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>how
-to verify package signatures</a>, which allows you to make sure you've
-downloaded the file we intended you to get.
-Also, note that the Firefox in our bundle is <a
-href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/";>modified</a>
-from the <a href="http://www.mozilla.com/firefox/";>default Firefox</a>;
-we're currently working with Mozilla to see if they want
-us to change the name to make this clearer.
-</p>
-
-<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
-to save the bundle then click <strong>OK</strong> (2). At least 50 MB free
-space must be available in the location you select. If you want to leave the
-bundle on the computer, saving it to the Desktop is a good choice. If you want
-to move it to a different computer or limit the traces you leave behind, save
-it to a USB disk.</p>
-
-<p>Click <strong>Extract</strong> (3) to begin extraction. This may take a
-few minutes to complete.</p>
-
-<p><img src="img/screenshot1.png" alt="Screenshot of extraction process"></p>
-
-<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>
-
-<p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called
-<strong>Start Tor Browser.exe</strong> on some systems.)</p>
-
-<p>The Vidalia window will shortly appear.</p>
-
-<p><img src="img/screenshot2.png" alt="Screenshot of bundle startup"></p>
-
-<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
-<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 Firefox windows before starting.</p>
-
-<p>If you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened.</p>
-
-<p>Once you are finished browsing, close any open Firefox windows by clicking
-on the <img src="img/close-button.png" alt="Close button (×)"> (6).
-For privacy reasons, the list of
-webpages you visited and any cookies will be deleted.<p>
-
-<p><img src="img/screenshot3a.png" alt="Screenshot of Firefox"></p>
-
-<p>With the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8).</p>
-
-<p><img src="img/screenshot3b.png" alt="Screenshot of Pidgin"></p>
-
-<p>To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in <a href="#Usage">"Usage"</a>.</p>
-
-<p>Remember that Tor anonymizes the origin of your traffic, and it
-encrypts everything inside the Tor network, but <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>it
-can't encrypt your traffic between the Tor network and its final
-destination.</a> If you are communicating sensitive information, you
-should use as much care as you would on the normal scary Internet —
-use HTTPS or other end-to-end encryption and authentication.
-</p>
-
-<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>
-
-<p><strong>What is Tor and why do I need it?</strong> To learn more about Tor, visit the <a
-href="https://www.torproject.org/";>Tor Project
-website</a>.</p>
-
-<p><strong>What is in the Tor Browser Bundle?</strong> It
-contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
-href="<page torbrowser/details>#contents">learn more</a>).</p>
-
-<p><strong>What is in the Tor IM Browser Bundle?</strong> It
-contains Tor, Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a
-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="<page torbrowser/details>#build">build instructions</a>.</p>
-
-</div><!-- #main -->
-
-#include <foot.wmi>
-
Modified: website/trunk/torbrowser/en/index.wml
===================================================================
--- website/trunk/torbrowser/en/index.wml 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/torbrowser/en/index.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -21,20 +21,26 @@
<p>The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows
without needing to
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
+pre-configured web browser and is self contained.
+
+The <strong>Tor IM Browser Bundle</strong> additionally allows instant messaging and chat.
+
+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="<page download>">download
Tor</a>.</p>
<a id="Download"></a>
-<h3><a class="anchor" href="#Download">Download Tor Browser bundle</a></h3>
+<h3><a class="anchor" href="#Download">Download Tor Browser Bundle and Tor IM 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 or Tor IM 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 <version-torbrowserbundle>, 13 MB)</p>
+<p>If you have an unreliable Internet connection, it may be easier for you to download the bundle edition which is <a href="<page torbrowser/split>">split up</a> into smaller parts.</p>
+<p id="Download-torbrowserbundle" style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows with Firefox (version <version-torbrowserbundle>, 13 MB)</p>
+
<ul>
<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: 90%;">signature</a>)</li>
@@ -59,6 +65,32 @@
</ul>
+<p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, 20 MB)</p>
+
+<ul>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">English (en-US)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe">العربية (ar)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_de.exe">Deutsch (de)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe">Español (es-ES)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe">فارسی (fa-IR)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe">Français (fr)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe">Nederlands (nl)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe">Português (pt-PT)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe">Русский (ru)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe">简体字 (zh-CN)</a> (<a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc" style="font-size: 90%;">signature</a>)</li>
+
+</ul>
+
<p>See our instructions on <a
href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>how
to verify package signatures</a>, which allows you to make sure you've
@@ -92,7 +124,7 @@
<p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>
<p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called
-<strong>Start Tor Browser.bat</strong> on some systems.)</p>
+<strong>Start Tor Browser.exe</strong> on some systems.)</p>
<p>The Vidalia window will shortly appear.</p>
@@ -105,14 +137,21 @@
before using it. To reduce the risk of confusion, don't run Firefox while using
the Tor Browser Bundle, and close existing Firefox windows before starting.</p>
-<p><img src="img/screenshot3.png" alt="Screenshot of Firefox"></p>
+<p>If you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened.</p>
<p>Once you are finished browsing, close any open Firefox windows by clicking
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 <a href="#Usage">"Usage"</a>.<p>
+For privacy reasons, the list of
+webpages you visited and any cookies will be deleted.<p>
+<p><img src="img/screenshot3a.png" alt="Screenshot of Firefox"></p>
+
+<p>With the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8).</p>
+
+<p><img src="img/screenshot3b.png" alt="Screenshot of Pidgin"></p>
+
+<p>To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in <a href="#Usage">"Usage"</a>.</p>
+
<p>Remember that Tor anonymizes the origin of your traffic, and it
encrypts everything inside the Tor network, but <a
href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>it
@@ -140,6 +179,10 @@
contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
href="<page torbrowser/details>#contents">learn more</a>).</p>
+<p><strong>What is in the Tor IM Browser Bundle?</strong> It
+contains Tor, Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a
+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="<page torbrowser/details>#build">build instructions</a>.</p>
Deleted: website/trunk/torbrowser/en/split-1.1.wml
===================================================================
--- website/trunk/torbrowser/en/split-1.1.wml 2008-06-13 13:13:12 UTC (rev 15217)
+++ website/trunk/torbrowser/en/split-1.1.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -1,104 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 1-high
-
-#include "head.wmi" TITLE="Tor Browser Bundle (split edition)"
-
-<div class="main-column">
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-
-<h2>Tor Browser Bundle (split edition)</h2>
-<hr>
-
-<h3><a class="anchor" href="#Download">Download Tor Browser Bundle and Tor IM Browser Bundle</a></h3>
-
-<p>If you have a reliable Internet connection, you can download the <a href="<page torbrowser/index>">single-file edition</a> of Tor Browser Bundle. Alternatively, follow the instructions on this page to download and install the split-file edition.</p>
-
-<p>Choose the language you would like, and whether you also need the Pidgin instant messaging client, then click on the link corresponding to your choice. Download all the files shown in the folder (the single file ending in <code>.exe</code> and all the files ending in <code>.rar</code>). The files in <code>signatures</code> allow you to check that you've downloaded the file we intended you to get. See our instructions on <a href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>how to verify package signatures</a>.</p>
-
-<p id="Download-torbrowserbundle" style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows with Firefox (version <version-torbrowserbundle>, split edition, 13 MB total)</p>
-
-<ul>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_en-US_split">English (en-US)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_ar_split">العربية (ar)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_de_split">Deutsch (de)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_es-ES_split">Español (es-ES)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR_split">فارسی (fa-IR)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_fr_split">Français (fr)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_nl_split">Nederlands (nl)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT_split">Português</li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_ru_split">Русский (ru)</a></li>
-
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN_split">简体字 (zh-CN)</a></li>
-
-</ul>
-
-<p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, split edition, 20 MB total)</p>
-
-<ul>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US_split">English (en-US)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar_split">العربية (ar)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_de_split">Deutsch (de)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES_split">Español (es-ES)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR_split">فارسی (fa-IR)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr_split">Français (fr)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl_split">Nederlands (nl)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT_split">Português (pt-PT)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru_split">Русский (ru)</a></li>
-
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN_split">简体字 (zh-CN)</a></li>
-
-</ul>
-
-
-<p>Note that the Firefox in our bundle is <a
-href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/";>modified</a>
-from the <a href="http://www.mozilla.com/firefox/";>default Firefox</a>;
-we're currently working with Mozilla to see if they want
-us to change the name to make this clearer.
-</p>
-
-<a id="Extraction"></a>
-<h3><a class="anchor" href="#Extraction">Extraction</a></h3>
-
-<p>After you have downloaded all the files above, double click on the file with the icon of a box (1).</p>
-
-<p><img src="img/split-screenshot1.png" alt="Screenshot of starting extraction process"></p>
-
-<p>Click on the button labelled <strong>Browse...</strong> (2) and select where you want
-to save the bundle then click <strong>OK</strong> (3). At least 50 MB free
-space must be available in the location you select. If you want to leave the
-bundle on the computer, saving it to the Desktop is a good choice. If you want
-to move it to a different computer or limit the traces you leave behind, save
-it to a USB disk.</p>
-
-<p>Click <strong>Install</strong> (4) to begin extraction. This may take a
-few minutes to complete.</p>
-
-<p><img src="img/split-screenshot2.png" alt="Screenshot of extraction process"></p>
-
-<p>Once the extraction has completed, see the <a href="<page torbrowser/index>#Usage">usage instructions</a> for how to start Tor.</p>
-
-</div><!-- #main -->
-
-#include <foot.wmi>
-
Copied: website/trunk/torbrowser/en/split.wml (from rev 15168, website/trunk/torbrowser/en/split-1.1.wml)
===================================================================
--- website/trunk/torbrowser/en/split.wml (rev 0)
+++ website/trunk/torbrowser/en/split.wml 2008-06-13 13:49:49 UTC (rev 15218)
@@ -0,0 +1,104 @@
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 1-high
+
+#include "head.wmi" TITLE="Tor Browser Bundle (split edition)"
+
+<div class="main-column">
+
+<!-- PUT CONTENT AFTER THIS TAG -->
+
+<h2>Tor Browser Bundle (split edition)</h2>
+<hr>
+
+<h3><a class="anchor" href="#Download">Download Tor Browser Bundle and Tor IM Browser Bundle</a></h3>
+
+<p>If you have a reliable Internet connection, you can download the <a href="<page torbrowser/index>">single-file edition</a> of Tor Browser Bundle. Alternatively, follow the instructions on this page to download and install the split-file edition.</p>
+
+<p>Choose the language you would like, and whether you also need the Pidgin instant messaging client, then click on the link corresponding to your choice. Download all the files shown in the folder (the single file ending in <code>.exe</code> and all the files ending in <code>.rar</code>). The files in <code>signatures</code> allow you to check that you've downloaded the file we intended you to get. See our instructions on <a href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>how to verify package signatures</a>.</p>
+
+<p id="Download-torbrowserbundle" style="font-size: 120%; margin: 5mm">Tor Browser Bundle for Windows with Firefox (version <version-torbrowserbundle>, split edition, 13 MB total)</p>
+
+<ul>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_en-US_split">English (en-US)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ar_split">العربية (ar)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_de_split">Deutsch (de)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_es-ES_split">Español (es-ES)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fa-IR_split">فارسی (fa-IR)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_fr_split">Français (fr)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_nl_split">Nederlands (nl)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_pt-PT_split">Português</li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_ru_split">Русский (ru)</a></li>
+
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_zh-CN_split">简体字 (zh-CN)</a></li>
+
+</ul>
+
+<p id="Download-torimbrowserbundle" style="font-size: 120%; margin: 5mm">Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-torimbrowserbundle>, split edition, 20 MB total)</p>
+
+<ul>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_en-US_split">English (en-US)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ar_split">العربية (ar)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_de_split">Deutsch (de)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_es-ES_split">Español (es-ES)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fa-IR_split">فارسی (fa-IR)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_fr_split">Français (fr)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_nl_split">Nederlands (nl)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_pt-PT_split">Português (pt-PT)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_ru_split">Русский (ru)</a></li>
+
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_zh-CN_split">简体字 (zh-CN)</a></li>
+
+</ul>
+
+
+<p>Note that the Firefox in our bundle is <a
+href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/";>modified</a>
+from the <a href="http://www.mozilla.com/firefox/";>default Firefox</a>;
+we're currently working with Mozilla to see if they want
+us to change the name to make this clearer.
+</p>
+
+<a id="Extraction"></a>
+<h3><a class="anchor" href="#Extraction">Extraction</a></h3>
+
+<p>After you have downloaded all the files above, double click on the file with the icon of a box (1).</p>
+
+<p><img src="img/split-screenshot1.png" alt="Screenshot of starting extraction process"></p>
+
+<p>Click on the button labelled <strong>Browse...</strong> (2) and select where you want
+to save the bundle then click <strong>OK</strong> (3). At least 50 MB free
+space must be available in the location you select. If you want to leave the
+bundle on the computer, saving it to the Desktop is a good choice. If you want
+to move it to a different computer or limit the traces you leave behind, save
+it to a USB disk.</p>
+
+<p>Click <strong>Install</strong> (4) to begin extraction. This may take a
+few minutes to complete.</p>
+
+<p><img src="img/split-screenshot2.png" alt="Screenshot of extraction process"></p>
+
+<p>Once the extraction has completed, see the <a href="<page torbrowser/index>#Usage">usage instructions</a> for how to start Tor.</p>
+
+</div><!-- #main -->
+
+#include <foot.wmi>
+
Deleted: website/trunk/torbrowser/img/screenshot1.png
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/screenshot1.png (from rev 15160, website/trunk/torbrowser/en/img/screenshot1.png)
===================================================================
(Binary files differ)
Deleted: website/trunk/torbrowser/img/screenshot2.png
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/screenshot2.png (from rev 15160, website/trunk/torbrowser/en/img/screenshot2.png)
===================================================================
(Binary files differ)
Deleted: website/trunk/torbrowser/img/screenshot3.png
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/screenshot3a.png (from rev 15160, website/trunk/torbrowser/en/img/screenshot3a.png)
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/screenshot3b.png (from rev 15160, website/trunk/torbrowser/en/img/screenshot3b.png)
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/split-screenshot1.png (from rev 15167, website/trunk/torbrowser/en/img/split-screenshot1.png)
===================================================================
(Binary files differ)
Copied: website/trunk/torbrowser/img/split-screenshot2.png (from rev 15167, website/trunk/torbrowser/en/img/split-screenshot2.png)
===================================================================
(Binary files differ)