Browse code

Revised Windows instructions. rm torbutton screenshot, explains different Vidalia bundles

Moritz Bartl authored on 19/01/2013 13:18:07
Showing 2 changed files
... ...
@@ -14,16 +14,13 @@
14 14
     <br>
15 15
 
16 16
     <h2>
17
-    Note that these are the installation instructions for running a Tor
18
-    client. The easiest way to do this is to simply download the <a
17
+    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
19 18
     href="<page projects/torbrowser>">Tor Browser Bundle</a> and you
20 19
     are done.
21 20
     </h2>
22 21
     
23 22
     <p>
24
-    <b>Note that these are the installation instructions for running a Tor
25
-    client on Microsoft Windows (XP, Vista, 7, and Server Editions).
26
-    If you want to relay traffic for others to help the network grow (please
23
+    <b>If you want to relay traffic for others to help the network grow (please
27 24
     do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
28 25
     guide.</b>
29 26
     </p>
... ...
@@ -43,16 +40,15 @@
43 40
     <br>
44 41
     
45 42
     <p>
46
-    The Vidalia Bundle for Windows contains <a href="<page
47
-    index>">Tor</a>, <a href="<page projects/vidalia>">Vidalia</a>
48
-    (a GUI for Tor), and <a href="<page torbutton/index>">Torbutton</a>
49
-    (a plugin for Mozilla Firefox) packaged into one bundle, with the
50
-    three applications pre-configured to work together.  Download either
51
-    the <a href="../<package-win32-bundle-stable>">stable</a> or the <a
52
-    href="../<package-win32-bundle-alpha>">experimental</a> version of
53
-    the Vidalia Bundle, or look for more options on the <a href="<page
54
-    download/download>">download page</a>.</p>
55
-    
43
+    The Vidalia Bundles for Windows contain <a href="<page
44
+    index>">Tor</a> and <a href="<page projects/vidalia>">Vidalia</a>
45
+    (a graphical user interface for Tor).
46
+    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.
47
+    </p>
48
+
49
+    <p>
50
+    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>
51
+ 
56 52
     <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">
57 53
     
58 54
     <p>If you have previously installed Tor and Vidalia you can deselect
... ...
@@ -66,38 +62,17 @@
66 62
     you selected will automatically be started for you.
67 63
     </p>
68 64
     
69
-    <p>Tor comes configured as a client by default. It uses a built-in
70
-    default configuration file, and most people won't need to change any of
71
-    the settings. Tor is now installed.
72
-    </p>
73
-    
74 65
     <hr>
75 66
     <a id="using"></a>
76 67
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
77 68
     <br>
78 69
     
79
-    <p>After installing Tor, you need to configure your applications to
80
-    use them. The first step is to set up web browsing.</p>
81
-    
82
-    <p>You should use Tor with Firefox and Torbutton, for best safety. The
83
-    bundle installs the <a href="<page torbutton/index>">Torbutton
84
-    plugin</a> for you. Restart your Firefox, and you're all set:
85
-    </p>
86
-    
87
-    <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>
88
-    
89
-    <br>
90
-    
91 70
     <p>
92
-    If you plan to run Firefox on a different computer than Tor, see the <a
93
-    href="<wikifaq>#SocksListenAddress">FAQ
94
-    entry for running Tor on a different computer</a>.
95
-    </p>
96
-    
97
-    <p>To use SOCKS directly (for instant messaging, Jabber, IRC,
98
-    etc), you can point your application directly at Tor (localhost
71
+    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),
72
+    you can point your application at Tor (localhost
99 73
     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ
100
-    entry</a> for why this may be dangerous. For applications that
74
+    entry</a> for why this may be dangerous. 
75
+    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
101 76
     support neither SOCKS nor HTTP, take a look at SocksCap or <a
102 77
     href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free
103 78
     software; SocksCap is proprietary.)</p>
... ...
@@ -122,15 +97,6 @@
122 97
     
123 98
     <img alt="Vidalia Tray Icon" src="$(IMGROOT)/screenshot-win32-vidalia.png"/>
124 99
     
125
-    <p>
126
-    Next, you should try using your browser with Tor and make
127
-    sure that your IP address is being anonymized. Click on <a
128
-    href="https://check.torproject.org/">the Tor detector</a> and see
129
-    whether it thinks you're using Tor or not.  (If that site is down, see <a
130
-    href="<wikifaq>#IsMyConnectionPrivate">this
131
-    FAQ entry</a> for more suggestions on how to test your Tor.)
132
-    </p>
133
-    
134 100
     <p>If you have a personal firewall that limits your computer's ability
135 101
     to connect to itself, be sure to allow connections from your local
136 102
     applications to local port 9050. If your firewall blocks outgoing
137 103
deleted file mode 100644
138 104
Binary files a/images/screenshot-torbutton.png and /dev/null differ