@@ -1,52 +1,8 @@

 ## translation metadata

 # Revision: $Revision$

-# Translation-Priority: 1-high

+# Status: obsolete

-#include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Redirecting" REDIRECT="projects/torbrowser.html#windows"

-<!-- TODO: we don't want windows relays. bridges maybe, but not relays! -->

-

-<div id="content" class="clearfix">

-  <div id="breadcrumbs">

-    <a href="<page index>">Home &raquo; </a>

-    <a href="<page docs/documentation>">Documentation &raquo; </a>

-    <a href="<page docs/tor-doc-windows>">Windows Client</a>

-  </div>

-  <div id="maincol">

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

-    <br>

-

-    <h2>

-    If you want to use Tor just for anonymous web browsing, simply download <a

-    href="<page projects/torbrowser>">Tor Browser</a> and you

-    are done.

-    </h2>

-

-    <p>If it's not working, look at <a href="<page

-    docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p>

-

-    <p>

-    Once it's working, learn more about

-    <a href="<page download/download>#Warning">what Tor does and does not offer</a>.

-    </p>

-

-    <hr>

-    <a id="server"></a>

-    <a id="relay"></a>

-    <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2>

-    <br>

-

-    <p>The Tor network relies on volunteers to donate bandwidth. If you

-    want to help <strong>make the Tor network faster</strong>, please

-    consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

-

-  </div>

-  <!-- END MAINCOL -->

-  <div id = "sidecol">

-#include "side.wmi"

-#include "info.wmi"

-  </div>

-  <!-- END SIDECOL -->

-</div>

-<!-- END CONTENT -->

 #include <foot.wmi>

+

@@ -22,9 +22,8 @@

     are done.

     </h2>

-    <p>If it's still not working, look at <a

-    href="<page docs/faq>#DoesntWork">this

-    FAQ entry</a> for hints.</p>

+    <p>If it's not working, look at <a href="<page

+    docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p>

     <p>

     Once it's working, learn more about

@@ -41,10 +40,6 @@

     want to help <strong>make the Tor network faster</strong>, please

     consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

-    <hr>

-

-    <p>If you have suggestions for improving this document, please <a

-    href="<page about/contact>">send them to us</a>. Thanks!</p>

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -11,8 +11,8 @@

     <a href="<page index>">Home &raquo; </a>

     <a href="<page docs/documentation>">Documentation &raquo; </a>

     <a href="<page docs/tor-doc-windows>">Windows Client</a>

-  </div> 

-  <div id="maincol"> 

+  </div>

+  <div id="maincol">

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

     <br>

@@ -21,28 +21,28 @@

     href="<page projects/torbrowser>">Tor Browser</a> and you

     are done.

     </h2>

-    

+

     <p>If it's still not working, look at <a

     href="<page docs/faq>#DoesntWork">this

     FAQ entry</a> for hints.</p>

-    

+

     <p>

     Once it's working, learn more about

     <a href="<page download/download>#Warning">what Tor does and does not offer</a>.

     </p>

-    

+

     <hr>

     <a id="server"></a>

     <a id="relay"></a>

     <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2>

     <br>

-    

+

     <p>The Tor network relies on volunteers to donate bandwidth. If you

     want to help <strong>make the Tor network faster</strong>, please

     consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

-    

+

     <hr>

-    

+

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

   </div>

@@ -54,4 +54,4 @@

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi>  

+#include <foot.wmi>

@@ -22,12 +22,6 @@

     are done.

     </h2>

-    <p>

-    <b>If you want to relay traffic for others to help the network grow (please

-    do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

-    guide.</b>

-    </p>

-        

     <p>If it's still not working, look at <a

     href="<page docs/faq>#DoesntWork">this

     FAQ entry</a> for hints.</p>

@@ -43,23 +37,9 @@

     <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2>

     <br>

-    <p>The Tor network relies on volunteers to donate bandwidth. The more

-    people who run relays, the faster the Tor network will be. If you have

-    at least 250 KiloBytes/s each way, please help out Tor by configuring your

-    Tor to be a relay too. We have many features that make Tor relays easy

-    and convenient, including rate limiting for bandwidth, exit policies so

-    you can limit your exposure to abuse complaints, and support for dynamic

-    IP addresses.</p>

-    

-    <p>Having relays in many different places on the Internet is what

-    makes Tor users secure. <a

-    href="<wikifaq>#RelayAnonymity">You

-    may also get stronger anonymity yourself</a>,

-    since remote sites can't know whether connections originated at your

-    computer or were relayed from others.</p>

-    

-    <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

-    guide.</p>

+    <p>The Tor network relies on volunteers to donate bandwidth. If you

+    want to help <strong>make the Tor network faster</strong>, please

+    consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

     <hr>

@@ -45,7 +45,7 @@

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 100 KiloBytes/s each way, please help out Tor by configuring your

+    at least 250 KiloBytes/s each way, please help out Tor by configuring your

     Tor to be a relay too. We have many features that make Tor relays easy

     and convenient, including rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

@@ -17,8 +17,8 @@

     <br>

     <h2>

-    Note that these are advanced installation instructions for running Tor. If you want to use Tor just for anonymous web browsing, simply download the <a

-    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

+    If you want to use Tor just for anonymous web browsing, simply download <a

+    href="<page projects/torbrowser>">Tor Browser</a> and you

     are done.

     </h2>

@@ -27,87 +27,7 @@

     do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</b>

     </p>

-    

-    <p>Freedom House has produced a video on how to install Tor.  You can

-    view it at <a href="https://media.torproject.org/video/2009-install-and-use-tor.ogv">How

-    to install Tor on Windows</a>.  Know of a better video, or one

-    translated into your language?  Let us know!</p>

-    

-    <div class="center">

-    <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p>

-    </div>

-    

-    <hr>

-    <a id="installing"></a>

-    <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>

-    <br>

-    

-    <p>

-    The Vidalia Bundles for Windows contain <a href="<page

-    index>">Tor</a> and <a href="<page projects/vidalia>">Vidalia</a>

-    (a graphical user interface for Tor).

-    They come in different flavors, preconfigured for a convenient setup: The Relay bundle is set to forward traffic for other Tor users, the Bridge bundle turns your computer into a <a href="<page docs/bridges>">bridge</a>. Apart from that preconfiguration, all Vidalia bundles are the same and can easily be reconfigured.

-    </p>

-

-    <p>

-    For anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a> and not one of the Vidalia bundles. If you want to use Tor as a client for other applications, download one of the Vidalia bundles and turn it into a client (Settings -&gt; Sharing -&gt; Run as a client only).</p>

- 

-    <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">

-    

-    <p>If you have previously installed Tor and Vidalia you can deselect

-    whichever components you do not need to install in the dialog

-    shown below.

-    </p>

-    

-    <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png">

-    

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

-    you selected will automatically be started for you.

-    </p>

-    

-    <hr>

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

-    <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

-    <br>

-    

-    <p>

-    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

-    you can point your application at Tor (localhost

-    port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

-    entry</a> for why this may be dangerous. 

-    For applications with HTTP proxy support, but no support for Tor's SOCKS proxy, try <a href="http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/">polipo</a>. For applications that

-    support neither SOCKS nor HTTP, take a look at SocksCap or <a

-    href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free

-    software; SocksCap is proprietary.)</p>

-    

-    <p>For information on how to Torify other applications, check out the

-    <a href="<wiki>doc/TorifyHOWTO">Torify

-    HOWTO</a>.

-    </p>

-    

-    <hr>

-    <a id="verify"></a>

-    <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>

-    <br>

-    

-    <p>

-    Check to see that Vidalia is running.  Vidalia uses a small green onion

-    to indicate Tor is running or a dark onion with a red "X" when Tor is

-    not running. You can start or stop Tor by right-clicking

-    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="$(IMGROOT)/screenshot-win32-vidalia.png"/>

-    

-    <p>If you have a personal firewall that limits your computer's ability

-    to connect to itself, be sure to allow connections from your local

-    applications to local port 9050. If your firewall blocks outgoing

-    connections, punch a hole so it can connect to at least TCP ports

-    80 and 443, and then see <a href="<wikifaq>#FirewalledClient">this

-    FAQ entry</a>.

-    </p>

-    

+        

     <p>If it's still not working, look at <a

     href="<page docs/faq>#DoesntWork">this

     FAQ entry</a> for hints.</p>

@@ -120,12 +40,12 @@

     <hr>

     <a id="server"></a>

     <a id="relay"></a>

-    <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>

+    <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2>

     <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 50 kilobytes/s each way, please help out Tor by configuring your

+    at least 100 KiloBytes/s each way, please help out Tor by configuring your

     Tor to be a relay too. We have many features that make Tor relays easy

     and convenient, including rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

@@ -3,6 +3,9 @@

 # Translation-Priority: 1-high

 #include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8"

+

+<!-- TODO: we don't want windows relays. bridges maybe, but not relays! -->

+

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -122,7 +122,7 @@

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 20 kilobytes/s each way, please help out Tor by configuring your

+    at least 50 kilobytes/s each way, please help out Tor by configuring your

     Tor to be a relay too. We have many features that make Tor relays easy

     and convenient, including rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

@@ -14,16 +14,13 @@

     <br>

     <h2>

-    Note that these are the installation instructions for running a Tor

-    client. The easiest way to do this is to simply download the <a

+    Note that these are advanced installation instructions for running Tor. If you want to use Tor just for anonymous web browsing, simply download the <a

     href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

     are done.

     </h2>

     <p>

-    <b>Note that these are the installation instructions for running a Tor

-    client on Microsoft Windows (XP, Vista, 7, and Server Editions).

-    If you want to relay traffic for others to help the network grow (please

+    <b>If you want to relay traffic for others to help the network grow (please

     do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</b>

     </p>

@@ -43,16 +40,15 @@

     <br>

     <p>

-    The Vidalia Bundle for Windows contains <a href="<page

-    index>">Tor</a>, <a href="<page projects/vidalia>">Vidalia</a>

-    (a GUI for Tor), and <a href="<page torbutton/index>">Torbutton</a>

-    (a plugin for Mozilla Firefox) packaged into one bundle, with the

-    three 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 Vidalia Bundle, or look for more options on the <a href="<page

-    download/download>">download page</a>.</p>

-    

+    The Vidalia Bundles for Windows contain <a href="<page

+    index>">Tor</a> and <a href="<page projects/vidalia>">Vidalia</a>

+    (a graphical user interface for Tor).

+    They come in different flavors, preconfigured for a convenient setup: The Relay bundle is set to forward traffic for other Tor users, the Bridge bundle turns your computer into a <a href="<page docs/bridges>">bridge</a>. Apart from that preconfiguration, all Vidalia bundles are the same and can easily be reconfigured.

+    </p>

+

+    <p>

+    For anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a> and not one of the Vidalia bundles. If you want to use Tor as a client for other applications, download one of the Vidalia bundles and turn it into a client (Settings -&gt; Sharing -&gt; Run as a client only).</p>

+ 

     <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">

     <p>If you have previously installed Tor and Vidalia you can deselect

@@ -66,38 +62,17 @@

     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>

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

     <br>

-    <p>After installing Tor, 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="<page torbutton/index>">Torbutton

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

-    </p>

-    

-    <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>

-    

-    <br>

-    

     <p>

-    If you plan to run Firefox on a different computer than Tor, see the <a

-    href="<wikifaq>#SocksListenAddress">FAQ

-    entry for running Tor on a different computer</a>.

-    </p>

-    

-    <p>To use SOCKS directly (for instant messaging, Jabber, IRC,

-    etc), you can point your application directly at Tor (localhost

+    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

+    you can point your application at Tor (localhost

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

-    entry</a> for why this may be dangerous. For applications that

+    entry</a> for why this may be dangerous. 

+    For applications with HTTP proxy support, but no support for Tor's SOCKS proxy, try <a href="http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/">polipo</a>. For applications that

     support neither SOCKS nor HTTP, take a look at SocksCap or <a

     href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free

     software; SocksCap is proprietary.)</p>

@@ -122,15 +97,6 @@

     <img alt="Vidalia Tray Icon" src="$(IMGROOT)/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

-    href="<wikifaq>#IsMyConnectionPrivate">this

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

-    </p>

-    

     <p>If you have a personal firewall that limits your computer's ability

     to connect to itself, be sure to allow connections from your local

     applications to local port 9050. If your firewall blocks outgoing

@@ -43,23 +43,21 @@

     <br>

     <p>

-    The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a

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

-    href="<page torbutton/index>">Torbutton</a> (a plugin for Mozilla Firefox), and <a

-    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

+    The Vidalia Bundle for Windows contains <a href="<page

+    index>">Tor</a>, <a href="<page projects/vidalia>">Vidalia</a>

+    (a GUI for Tor), and <a href="<page torbutton/index>">Torbutton</a>

+    (a plugin for Mozilla Firefox) packaged into one bundle, with the

+    three 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 Vidalia Bundle, or look for more options on the <a href="<page

-    download/download>">download page</a>.

-    </p>

+    download/download>">download page</a>.</p>

     <img alt="tor installer splash page" src="$(IMGROOT)/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>If you have previously installed Tor and Vidalia you can deselect

+    whichever components you do not need to install in the dialog

+    shown below.

     </p>

     <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png">

@@ -78,13 +76,12 @@

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

     <br>

-    <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>After installing Tor, 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="<page torbutton/index>">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="<page torbutton/index>">Torbutton

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

     </p>

     <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>

@@ -97,15 +94,13 @@

     entry for running Tor on a different computer</a>.

     </p>

-    <p>To Torify other applications that support HTTP proxies, just

-    point them at Polipo (that is, localhost port 8118). To use SOCKS

-    directly (for instant messaging, Jabber, IRC, etc), you can point

-    your application directly at Tor (localhost port 9050), but see <a

-    href="<wikifaq>#SOCKSAndDNS">this

-    FAQ entry</a> for why this may be dangerous. For applications

-    that support neither SOCKS nor HTTP, take a look at SocksCap or

-    <a href="http://www.freecap.ru/eng/">FreeCap</a>.

-    (FreeCap is free software; SocksCap is proprietary.)</p>

+    <p>To use SOCKS directly (for instant messaging, Jabber, IRC,

+    etc), you can point your application directly at Tor (localhost

+    port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

+    entry</a> for why this may be dangerous. For applications that

+    support neither SOCKS nor HTTP, take a look at SocksCap or <a

+    href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free

+    software; SocksCap is proprietary.)</p>

     <p>For information on how to Torify other applications, check out the

     <a href="<wiki>doc/TorifyHOWTO">Torify

@@ -136,12 +131,11 @@

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

     </p>

-    <p>If you have a personal firewall that limits your computer's

-    ability to connect to itself, be sure to allow connections from

-    your local applications to local port 8118 and port 9050. If

-    your firewall blocks outgoing connections, punch a hole so

-    it can connect to at least TCP ports 80 and 443, and then see <a

-    href="<wikifaq>#FirewalledClient">this

+    <p>If you have a personal firewall that limits your computer's ability

+    to connect to itself, be sure to allow connections from your local

+    applications to local port 9050. If your firewall blocks outgoing

+    connections, punch a hole so it can connect to at least TCP ports

+    80 and 443, and then see <a href="<wikifaq>#FirewalledClient">this

     FAQ entry</a>.

     </p>

@@ -13,9 +13,12 @@

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

     <br>

-    <p>We strongly encourage you to use the <a href="<page

-    projects/torbrowser>">Tor Browser Bundle</a> instead of configuring

-    your own browser for usage with Tor.</p>

+    <h2>

+    Note that these are the installation instructions for running a Tor

+    client. The easiest way to do this is to simply download the <a

+    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

+    are done.

+    </h2>

     <p>

     <b>Note that these are the installation instructions for running a Tor

@@ -12,6 +12,10 @@

   <div id="maincol"> 

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

     <br>

+

+    <p>We strongly encourage you to use the <a href="<page

+    projects/torbrowser>">Tor Browser Bundle</a> instead of configuring

+    your own browser for usage with Tor.</p>

     <p>

     <b>Note that these are the installation instructions for running a Tor

@@ -101,7 +101,7 @@

     (FreeCap is free software; SocksCap is proprietary.)</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify

+    <a href="<wiki>doc/TorifyHOWTO">Torify

     HOWTO</a>.

     </p>

@@ -22,12 +22,12 @@

     </p>

     <p>Freedom House has produced a video on how to install Tor.  You can

-    view it at <a href="http://media.torproject.org/video/2009-install-and-use-tor.ogv">How

+    view it at <a href="https://media.torproject.org/video/2009-install-and-use-tor.ogv">How

     to install Tor on Windows</a>.  Know of a better video, or one

     translated into your language?  Let us know!</p>

     <div class="center">

-    <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p>

+    <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p>

     </div>

     <hr>

@@ -38,7 +38,7 @@

     <p>

     The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a

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

-    href="https://www.torproject.org/torbutton/">Torbutton</a> (a plugin for Mozilla Firefox), and <a

+    href="<page torbutton/index>">Torbutton</a> (a plugin for Mozilla Firefox), and <a

     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

@@ -76,7 +76,7 @@

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

     for best safety. The bundle installs the <a

-    href="https://www.torproject.org/torbutton/">Torbutton plugin</a>

+    href="<page torbutton/index>">Torbutton plugin</a>

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

     </p>

@@ -38,7 +38,7 @@

     <p>

     The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a

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

-    href="https://addons.mozilla.org/firefox/2275/">Torbutton</a> (a plugin for Mozilla Firefox), and <a

+    href="https://www.torproject.org/torbutton/">Torbutton</a> (a plugin for Mozilla Firefox), and <a

     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

@@ -76,7 +76,7 @@

     <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>

+    href="https://www.torproject.org/torbutton/">Torbutton plugin</a>

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

     </p>

@@ -15,7 +15,7 @@

     <p>

     <b>Note that these are the installation instructions for running a Tor

-    client on Microsoft Windows (2000, XP, Vista, 7, and Server Editions).

+    client on Microsoft Windows (XP, Vista, 7, and Server Editions).

     If you want to relay traffic for others to help the network grow (please

     do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</b>

@@ -36,7 +36,7 @@

     <br>

     <p>

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

+    The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a

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

     href="https://addons.mozilla.org/firefox/2275/">Torbutton</a> (a plugin for Mozilla Firefox), and <a

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

@@ -44,7 +44,7 @@

     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

+    the Vidalia Bundle, or look for more options on the <a href="<page

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

     </p>

@@ -139,7 +139,7 @@

     </p>

     <p>If it's still not working, look at <a

-    href="<wikifaq>#ItDoesntWork">this

+    href="<page docs/faq>#DoesntWork">this

     FAQ entry</a> for hints.</p>

     <p>

@@ -1,5 +1,5 @@

 ## translation metadata

-# Revision: $Revision: 21995 $

+# Revision: $Revision$

 # Translation-Priority: 1-high

 #include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8"

@@ -80,7 +80,7 @@

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

     </p>

-    <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png" border="1"/>

+    <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>

     <br>

@@ -11,7 +11,7 @@

   </div> 

   <div id="maincol"> 

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

-    <br />

+    <br>

     <p>

     <b>Note that these are the installation instructions for running a Tor

@@ -30,10 +30,10 @@

     <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p>

     </div>

-    <hr />

+    <hr>

     <a id="installing"></a>

     <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>

-    <br />

+    <br>

     <p>

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

@@ -48,14 +48,14 @@

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

     </p>

-    <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png" />

+    <img alt="tor installer splash page" src="$(IMGROOT)/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="$(IMGROOT)/screenshot-win32-installer-components.png" />

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

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

     you selected will automatically be started for you.

@@ -66,10 +66,10 @@

     the settings. Tor is now installed.

     </p>

-    <hr />

+    <hr>

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

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

-    <br />

+    <br>

     <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>

@@ -82,7 +82,7 @@

     <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png" border="1"/>

-    <br />

+    <br>

     <p>

     If you plan to run Firefox on a different computer than Tor, see the <a

@@ -105,10 +105,10 @@

     HOWTO</a>.

     </p>

-    <hr />

+    <hr>

     <a id="verify"></a>

     <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>

-    <br />

+    <br>

     <p>

     Check to see that Vidalia is running.  Vidalia uses a small green onion

@@ -147,11 +147,11 @@

     <a href="<page download/download>#Warning">what Tor does and does not offer</a>.

     </p>

-    <hr />

+    <hr>

     <a id="server"></a>

     <a id="relay"></a>

     <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>

-    <br />

+    <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

@@ -171,7 +171,7 @@

     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</p>

-    <hr />

+    <hr>

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

@@ -48,14 +48,14 @@

     download/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="$(IMGROOT)/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="$(IMGROOT)/screenshot-win32-installer-components.png" />

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

     you selected will automatically be started for you.

@@ -80,7 +80,7 @@

     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="$(IMGROOT)/screenshot-torbutton.png" border="1"/>

     <br />

@@ -118,7 +118,7 @@

     from the menu as shown below:

     </p>

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

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

     <p>

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

@@ -86,7 +86,7 @@

     <p>

     If you plan to run Firefox on a different computer than Tor, see the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">FAQ

+    href="<wikifaq>#SocksListenAddress">FAQ

     entry for running Tor on a different computer</a>.

     </p>

@@ -94,14 +94,14 @@

     point them at Polipo (that is, localhost port 8118). To use SOCKS

     directly (for instant messaging, Jabber, IRC, etc), you can point

     your application directly at Tor (localhost port 9050), but see <a

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

+    href="<wikifaq>#SOCKSAndDNS">this

     FAQ entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at SocksCap or

     <a href="http://www.freecap.ru/eng/">FreeCap</a>.

     (FreeCap is free software; SocksCap is proprietary.)</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify

+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify

     HOWTO</a>.

     </p>

@@ -125,7 +125,7 @@

     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

+    href="<wikifaq>#IsMyConnectionPrivate">this

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

     </p>

@@ -134,12 +134,12 @@

     your local applications to local port 8118 and port 9050. If

     your firewall blocks outgoing connections, punch a hole so

     it can connect to at least TCP ports 80 and 443, and then see <a

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

+    href="<wikifaq>#FirewalledClient">this

     FAQ entry</a>.

     </p>

     <p>If it's still not working, look at <a

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

+    href="<wikifaq>#ItDoesntWork">this

     FAQ entry</a> for hints.</p>

     <p>

@@ -163,7 +163,7 @@

     <p>Having relays in many different places on the Internet is what

     makes Tor users secure. <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You

+    href="<wikifaq>#RelayAnonymity">You

     may also get stronger anonymity yourself</a>,