diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index b193a35908..97f6927b20 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -17,8 +17,9 @@
 <p>
 The latest stable release of Tor for Windows 32 is <a
 href="http://tor.freehaven.net/dist/win32/tor-0.0.9.1-win32.exe">0.0.9.1</a>.
-Download it by clicking the link. You can find experimental versions
-<a href="http://tor.freehaven.net/dist/win32/">here</a>.
+Download it by clicking the link. You may be able to find experimental versions
+<a href="http://tor.freehaven.net/dist/win32/">here</a>, if you're looking for
+new features and new bugs.
 </p>
 
 <p>Our Tor installer should make everything pretty simple. Below is a
@@ -26,7 +27,7 @@ screenshot of the setup page:
 </p>
 
 <img alt="tor installer splash page"
-src="http://tor.freehaven.net/img/NGCS_005.jpg" />
+src="http://tor.freehaven.net/img/screenshot-installer-splash.jpg" />
 
 <p>
 By default, Tor is not configured to run at startup.
@@ -36,14 +37,15 @@ Be sure to leave the other boxes checked.
 </p>
 
 <img alt="select components to install"
-src="http://tor.freehaven.net/img/NGCS_008.jpg" />
+src="http://tor.freehaven.net/img/screenshot-installer-components.jpg" />
 
 <p>Once the installer is finished, it will run Tor in a DOS window so
 you can see its logs and errors. (You can minimize this window, but do
 not close it.)
 </p>
 
-<img alt="tor window screenshot" src="http://tor.freehaven.net/img/GCS_003.jpg" />
+<img alt="tor window screenshot"
+src="http://tor.freehaven.net/img/screenshot-dos-window.jpg" />
 
 <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
@@ -60,14 +62,16 @@ web proxy that integrates well with Tor. Once it's installed, it should
 appear in your system tray as a "P" in a circle, as pictured below:
 </p>
 
-<img alt="privoxy icon in the system tray" src="http://tor.freehaven.net/img/GCS_004.jpg" />
+<img alt="privoxy icon in the system tray"
+src="http://tor.freehaven.net/img/screenshot-privoxy-icon.jpg" />
 
 <p>You need to configure Privoxy to use Tor.
 Open Privoxy's main config file by selecting it from "Start Menu"|"All
 Programs":
 </p>
 
-<img border="1" alt="editing privoxy config" src="http://tor.freehaven.net/img/GCS_053.jpg" />
+<img border="1" alt="editing privoxy config"
+src="http://tor.freehaven.net/img/screenshot-privoxy-config.jpg" />
 
 <p>Add the line <br>
 <tt>forward-socks4a / localhost:9050 .</tt><br>
@@ -76,7 +80,8 @@ The easiest way is to select the above line and copy/paste it into
 the file. Be sure to save.
 </p>
 
-<img border="1" alt="privoxy points to tor" src="http://tor.freehaven.net/img/GCS_006.jpg" />
+<img border="1" alt="privoxy points to tor"
+src="http://tor.freehaven.net/img/screenshot-privoxy-edit.jpg" />
 
 <p>Then change your browser to http proxy at localhost port 8118.
 In Mozilla, this is in Edit|Preferences|Advanced|Proxies. In IE, it's
@@ -84,8 +89,10 @@ Tools|Internet Options|Connections|LAN Settings|Advanced.
 You should also set your SSL proxy (IE calls it "Secure") to the same
 thing, to hide your SSL traffic. In IE, this looks something like:</p>
 
-<img alt="LAN settings in IE" src="http://tor.freehaven.net/img/GCS_001.jpg" />
-<img alt="Proxy settings in IE" src="http://tor.freehaven.net/img/GCS_002.jpg" />
+<img alt="LAN settings in IE"
+src="http://tor.freehaven.net/img/screenshot-ie-lan.jpg" />
+<img alt="Proxy settings in IE"
+src="http://tor.freehaven.net/img/screenshot-ie-proxies.jpg" />
 
 <p>Using privoxy is <b>necessary</b> because <a
 href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">browsers leak your
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index 416150ba3e..af6a5e7617 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -155,16 +155,6 @@ even already have Tor started in the background (logging to
 default configuration file, and most people won't need to change any of
 the settings.</p>
 
-<!--
-<p>The only setting you might need to change is "SocksBindAddress".
-By default, your Tor client only listens for applications that connect
-from localhost. Connections from other computers are refused. If you
-want to torify applications on different computers than the Tor client,
-you should copy torrc.sample to torrc (it's installed by default
-to /usr/local/etc/tor/), change the SocksBindAddress line to
-0.0.0.0, and then hup or restart Tor.</p>
--->
-
 <p>After installing Tor, you should install <a
 href="http://www.privoxy.org/">privoxy</a>, which is a filtering web
 proxy that integrates well with Tor. Add the line <br>