[or-cvs] r13192: we run on more windowses than just win32, or at least we wil (website/trunk/docs/en)

Sat Jan 19 23:39:14 UTC 2008

Author: arma
Date: 2008-01-19 18:39:14 -0500 (Sat, 19 Jan 2008)
New Revision: 13192

Added:
   website/trunk/docs/en/tor-doc-windows.wml
Removed:
   website/trunk/docs/en/tor-doc-win32.wml
Log:
we run on more windowses than just win32, or at least we will
before i notice this problem again.


Deleted: website/trunk/docs/en/tor-doc-win32.wml
===================================================================

--- website/trunk/docs/en/tor-doc-win32.wml	2008-01-19 20:34:14 UTC (rev 13191)
+++ website/trunk/docs/en/tor-doc-win32.wml	2008-01-19 23:39:14 UTC (rev 13192)
@@ -1,192 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 2-medium
-
-#include "head.wmi" TITLE="MS Windows Install Instructions"
-
-<div class="center">
-
-<div class="main-column">
-
-<h1>Running the <a href="<page index>">Tor</a> client on MS Windows</h1>
-<br />
-
-<p>
-<b>Note that these are the installation instructions for running a Tor
-client on MS Windows (98, 98SE, NT4, 2000, XP, Vista, Server).
-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>
-
-<hr />
-<a id="installing"></a>
-<h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
-<br />
-
-<p>
-The install for MS Windows bundles <a href="<page index>">Tor</a>,
-<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), and <a
-href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into
-one package, with the three applications pre-configured to work together.
-<a href="<page download>">Download either the stable or the experimental
-version of the Windows bundle from the download page</a>.
-</p>
-
-<p>If the bundles don't work for you, you can download Tor by itself
-from the <a href="<page download>">download page</a>,
-and then <a href="<page docs/tor-doc-unix>#privoxy">install
-and configure Privoxy on your own</a>.
-</p>
-
-<img alt="tor installer splash page"
-src="../img/screenshot-win32-installer-splash.png" />
-
-<p>If you have previously installed Tor, Vidalia, or Privoxy
-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" />
-
-<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>
-<h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
-<br />
-
-<p>After installing Tor and Privoxy, you need to configure your
-applications to use them. The first step is to set up web browsing.</p>
-
-<p>If you're using Firefox (we recommend it), the Vidalia 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">
-
-<br />
-
-<p>
-(<a href="https://torbutton.torproject.org/">Learn more about
-Torbutton here</a>.
-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
-entry for running Tor on a different computer</a>. If you need to
-use a browser other than Firefox, you'll have to <a href="<page
-docs/tor-doc-web>">configure its proxy settings yourself</a>.)
-</p>
-
-<p>Using Privoxy is <strong>necessary</strong> because <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">browsers
-leak your DNS requests when they use a SOCKS proxy directly</a>, which
-is bad for your anonymity. Privoxy also removes certain dangerous
-headers from your web requests, and blocks obnoxious ad sites like
-Doubleclick.</p>
-
-<p>To Torify other applications that support HTTP proxies, just
-point them at Privoxy (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
-FAQ entry</a> for why this may be dangerous. For applications
-that support neither SOCKS nor HTTP, take a look at <a
-href="http://www.socks.permeo.com/Download/SocksCapDownload/index.asp">SocksCap</a> 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
-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 Privoxy and Vidalia are running. Privoxy's icon is
-a blue or green circle with a "P" in it, and 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="../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="http://torcheck.xenobite.eu/">the
-Tor detector</a>
-and see whether it thinks you're using Tor or not.
-#<a href="http://ipchicken.com/">this site</a>
-#to see what IP address it thinks you're using.
-(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>
-
-<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="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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
-FAQ entry</a> for hints.</p>
-
-<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 />
-
-<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
-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="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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>
-
-<hr />
-
-<p>If you have suggestions for improving this document, please <a
-href="<page contact>">send them to us</a>. Thanks!</p>
-
-  </div><!-- #main -->
-</div>
-
-#include <foot.wmi>
-

Copied: website/trunk/docs/en/tor-doc-windows.wml (from rev 13191, website/trunk/docs/en/tor-doc-win32.wml)
===================================================================
--- website/trunk/docs/en/tor-doc-windows.wml	                        (rev 0)
+++ website/trunk/docs/en/tor-doc-windows.wml	2008-01-19 23:39:14 UTC (rev 13192)
@@ -0,0 +1,192 @@
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 2-medium
+
+#include "head.wmi" TITLE="MS Windows Install Instructions"
+
+<div class="center">
+
+<div class="main-column">
+
+<h1>Running the <a href="<page index>">Tor</a> client on MS Windows</h1>
+<br />
+
+<p>
+<b>Note that these are the installation instructions for running a Tor
+client on MS Windows (98, 98SE, NT4, 2000, XP, Vista, Server).
+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>
+
+<hr />
+<a id="installing"></a>
+<h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
+<br />
+
+<p>
+The install for MS Windows bundles <a href="<page index>">Tor</a>,
+<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), and <a
+href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into
+one package, with the three applications pre-configured to work together.
+<a href="<page download>">Download either the stable or the experimental
+version of the Windows bundle from the download page</a>.
+</p>
+
+<p>If the bundles don't work for you, you can download Tor by itself
+from the <a href="<page download>">download page</a>,
+and then <a href="<page docs/tor-doc-unix>#privoxy">install
+and configure Privoxy on your own</a>.
+</p>
+
+<img alt="tor installer splash page"
+src="../img/screenshot-win32-installer-splash.png" />
+
+<p>If you have previously installed Tor, Vidalia, or Privoxy
+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" />
+
+<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>
+<h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
+<br />
+
+<p>After installing Tor and Privoxy, you need to configure your
+applications to use them. The first step is to set up web browsing.</p>
+
+<p>If you're using Firefox (we recommend it), the Vidalia 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">
+
+<br />
+
+<p>
+(<a href="https://torbutton.torproject.org/">Learn more about
+Torbutton here</a>.
+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
+entry for running Tor on a different computer</a>. If you need to
+use a browser other than Firefox, you'll have to <a href="<page
+docs/tor-doc-web>">configure its proxy settings yourself</a>.)
+</p>
+
+<p>Using Privoxy is <strong>necessary</strong> because <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">browsers
+leak your DNS requests when they use a SOCKS proxy directly</a>, which
+is bad for your anonymity. Privoxy also removes certain dangerous
+headers from your web requests, and blocks obnoxious ad sites like
+Doubleclick.</p>
+
+<p>To Torify other applications that support HTTP proxies, just
+point them at Privoxy (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
+FAQ entry</a> for why this may be dangerous. For applications
+that support neither SOCKS nor HTTP, take a look at <a
+href="http://www.socks.permeo.com/Download/SocksCapDownload/index.asp">SocksCap</a> 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
+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 Privoxy and Vidalia are running. Privoxy's icon is
+a blue or green circle with a "P" in it, and 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="../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="http://torcheck.xenobite.eu/">the
+Tor detector</a>
+and see whether it thinks you're using Tor or not.
+#<a href="http://ipchicken.com/">this site</a>
+#to see what IP address it thinks you're using.
+(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>
+
+<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="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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
+FAQ entry</a> for hints.</p>
+
+<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 />
+
+<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
+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="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#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>
+
+<hr />
+
+<p>If you have suggestions for improving this document, please <a
+href="<page contact>">send them to us</a>. Thanks!</p>
+
+  </div><!-- #main -->
+</div>
+
+#include <foot.wmi>
+

