tor-webwml.git

@@ -8,7 +8,7 @@

 <div class="main-column">

-<h1>Running the <a href="<page index>">Tor</a> client on MS Windows</h1>

+<h1>Running the <a href="<page index>">Tor</a> client on Microsoft Windows</h1>

 <br />

 <p>

@@ -25,38 +25,34 @@ guide.</b>

 <br />

 <p>

-The install for MS Windows bundles <a href="<page index>">Tor</a>,

+Microsoft Windows bundles contain <a href="<page index>">Tor</a>,

 <a href="<page vidalia/index>">Vidalia</a> (a GUI for Tor), Torbutton (a

 plugin for Mozilla Firefox), and <a

-href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy) into

-one package, with the four applications pre-configured to work together.

+href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web

+proxy) packaged into one bundle, with the four applications pre-configured to work together.

 Download either the <a href="../<package-win32-bundle-stable>">stable</a>

 or the <a href="../<package-win32-bundle-alpha>">experimental</a>

 version of the Windows bundle, or look for more options on the

 <a href="<page download>">download page</a>.

 </p>

-<img alt="tor installer splash page"

-src="../img/screenshot-win32-installer-splash.png" />

+<img alt="tor installer splash page" src="../img/screenshot-win32-installer-splash.png" />

 <p>If you have previously installed Tor, Vidalia, or Polipo

 you can deselect whichever components you do not need to install

 in the dialog shown below.

 </p>

-<img alt="select components to install"

-src="../img/screenshot-win32-installer-components.png" />

+<img alt="select components to install" src="../img/screenshot-win32-installer-components.png" />

 <p>After you have completed the installer, the components

 you selected will automatically be started for you.

 </p>

-<!--

 <p>Tor comes configured as a client by default. It uses a built-in

 default configuration file, and most people won't need to change any of

 the settings. Tor is now installed.

 </p>

--->

 <hr />

 <a id="using"></a>

@@ -66,15 +62,13 @@ the settings. Tor is now installed.

 <p>After installing Tor and Polipo, you need to configure your

 applications to use them. The first step is to set up web browsing.</p>

-<p>You should use Tor with Firefox and Torbutton, for best safety. The

-bundle installs

-the <a href="https://addons.mozilla.org/firefox/2275/">Torbutton

-plugin</a> for you. Restart your Firefox, and you're all set:

+<p>You should use Tor with Firefox and Torbutton,

+for best safety. The bundle installs the <a

+href="https://addons.mozilla.org/firefox/2275/">Torbutton plugin</a>

+for you. Restart your Firefox, and you're all set:

 </p>

-<img alt="Torbutton plugin for Firefox"

-src="../img/screenshot-torbutton.png"

-border="1"/>

+<img alt="Torbutton plugin for Firefox" src="../img/screenshot-torbutton.png" border="1"/>

 <br />

@@ -112,16 +106,13 @@ on Vidalia's icon in your system tray and selecting "Start" or "Stop"

 from the menu as shown below:

 </p>

-<img alt="Vidalia Tray Icon"

-src="../img/screenshot-win32-vidalia.png"/>

+<img alt="Vidalia Tray Icon" src="../img/screenshot-win32-vidalia.png"/>

 <p>

 Next, you should try using your browser with Tor and make

-sure that your IP address is being anonymized. Click on

-<a href="https://check.torproject.org/">the

-Tor detector</a>

-and see whether it thinks you're using Tor or not.

-(If that site is down, see <a

+sure that your IP address is being anonymized. Click on <a

+href="https://check.torproject.org/">the Tor detector</a> and see

+whether it thinks you're using Tor or not.  (If that site is down, see <a

 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this

 FAQ entry</a> for more suggestions on how to test your Tor.)

 </p>