capitalize acronyms, clarify windows doc a bit.

svn:r3197
author: Nick Mathewson <nickm@torproject.org> 2004-12-21 05:43:17 +0000
committer: Nick Mathewson <nickm@torproject.org> 2004-12-21 05:43:17 +0000
commit: 0c0a504611c794fe01ea3d709f596bacb9821f28 (patch)
tree: 99cd9738b02db1f0824f301a66708d1350e99e19 /doc
parent: a742b5bbb00572633aba18e80285cb2bb72ac0fc (diff)
download: tor-0c0a504611c794fe01ea3d709f596bacb9821f28.tar
tor-0c0a504611c794fe01ea3d709f596bacb9821f28.tar.gz
6 files changed, 30 insertions, 26 deletions
diff --git a/doc/socks-extensions.txt b/doc/socks-extensions.txt
index b2988ef5c..2cb6f7f8c 100644
--- a/doc/socks-extensions.txt
+++ b/doc/socks-extensions.txt
@@ -48,7 +48,7 @@ Tor's extensions to the SOCKS protocol
 
 3. HTTP-resistance
 
-  Tor checks the first byte of each socks request to see whether it looks
+  Tor checks the first byte of each SOCKS request to see whether it looks
   more like an HTTP request (that is, it starts with a "G", "H", or "P").  If
   so, Tor returns a small webpage, telling the user that his/her browser is
   misconfigured.  This is helpful for the many users who mistakenly try to
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index 97f6927b2..4edeb9bfa 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -9,10 +9,10 @@
 
 <body>
 
-<h1><a href="http://tor.freehaven.net/">Tor</a> for Win32</h1>
+<h1>Running <a href="http://tor.freehaven.net/">Tor</a> on Win32</h1>
 
 <a name="installing"></a>
-<h2>Installing Tor</h2>
+<h2>Step One: Download and Install Tor</h2>
 
 <p>
 The latest stable release of Tor for Windows 32 is <a
@@ -51,8 +51,8 @@ src="http://tor.freehaven.net/img/screenshot-dos-window.jpg" />
 default configuration file, and most people won't need to change any of
 the settings. Tor is now installed.</p>
 
-<a name="using"></a>
-<h2>Configuring your applications to use Tor</h2>
+<a name="privoxy"></a>
+<h2>Step Two: Install Privoxy for Web Browsing</h2>
 
 <p>After installing Tor, you need to configure your applications to use it.
 The first step is to set up web browsing. Start by installing <a
@@ -83,7 +83,11 @@ the file. Be sure to save.
 <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.
+<a name="using"></a>
+<h2>Step three: Configure your applications to use Tor</h2>
+
+<p>Then change your browser to HTTP proxy at localhost port 8118.
+(That's where Privoxy listens.)
 In Mozilla, this is in Edit|Preferences|Advanced|Proxies. In IE, it's
 Tools|Internet Options|Connections|LAN Settings|Advanced.
 You should also set your SSL proxy (IE calls it "Secure") to the same
@@ -94,9 +98,9 @@ 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
+<p>Using privoxy is <strong>necessary</strong> because <a
 href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">browsers leak your
-DNS requests when they use a socks proxy directly</a>, which is bad for
+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>
 
@@ -114,16 +118,17 @@ For more troubleshooting suggestions, see <a
 href="http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ">the FAQ</a>.
 </p>
 
-<p>To Torify an application that supports http, just point it at Privoxy
-(that is, localhost port 8118). To use socks directly (for example, for
+<p>To Torify another application that supports HTTP, just point it at Privoxy
+(that is, localhost port 8118). To use SOCKS directly (for example, for
 instant messaging, Jabber, IRC, etc), point your application directly at
-Tor (localhost port 9050). For applications that support neither socks
-nor http, take a look at <a
+Tor (localhost port 9050). 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>,
 <a href="http://www.freecap.ru/eng/">FreeCap</a>,
 or the <a
 href="http://www.hummingbird.com/products/nc/socks/index.html?cks=y">Hummingbird</a>
-SOCKS client. Let us know if you get them working so we can add better
+SOCKS client. (FreeCap is free software; the others are proprietary.)
+Let us know if you get them working so we can add better
 instructions here.</p>
 
 <p>If you have suggestions for improving this document, please <a
@@ -131,4 +136,3 @@ href="mailto:tor-bugs@freehaven.net">send them to us</a>. Thanks!</p>
 
 </body>
 </html>
-
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index af6a5e761..6eccc5d9c 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -165,7 +165,7 @@ top). Then change your browser to http proxy at localhost port 8118.
 You should also set your SSL proxy to the same
 thing, to hide your SSL traffic. Using privoxy is <b>necessary</b> because
 <a href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">Mozilla leaks your
-DNS requests when it uses a socks proxy directly</a>. Privoxy also gives
+DNS requests when it uses a SOCKS proxy directly</a>. Privoxy also gives
 you good html scrubbing.</p>
 
 <p>To test if it's working, go to <a
@@ -180,19 +180,19 @@ port 8118 and port 9050. If your firewall blocks outgoing connections,
 punch a hole so it can connect to TCP ports 80, 443, and 9001-9033.
 <!--If you're
 using Safari as your browser, keep in mind that OS X before 10.3 claims
-to support socks but does not. -->
+to support SOCKS but does not. -->
 For more troubleshooting suggestions, see <a
 href="http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ">the FAQ</a>.
 </p>
 
 <p>To Torify an application that supports http, just point it at Privoxy
-(that is, localhost port 8118). To use socks directly (for example, for
+(that is, localhost port 8118). To use SOCKS directly (for example, for
 instant messaging, Jabber, IRC, etc), point your application directly at
-Tor (localhost port 9050). For applications that support neither socks
+Tor (localhost port 9050). For applications that support neither SOCKS
 nor http, you should look at
 using <a href="http://tsocks.sourceforge.net/">tsocks</a>
 to dynamically replace the system calls in your program to
-route through Tor. If you want to use socks4a, consider using <a
+route through Tor. If you want to use SOCKS 4A, consider using <a
 href="http://www.dest-unreach.org/socat/">socat</a> (specific instructions
 are on <a href="http://6sxoyfb3h2nvok2d.onion/tor/SocatHelp">this hidden
 service url</a>).</p>
@@ -323,7 +323,7 @@ in /usr/local/etc/tor/), and edit the middle part. Then run Tor. It will
 create each HiddenServiceDir you have configured, and it will create a
 'hostname' file which specifies the url (xyz.onion) for that service. You
 can tell people the url, and they can connect to it via their Tor client,
-assuming they're using a proxy (such as Privoxy) that speaks socks4a.</p>
+assuming they're using a proxy (such as Privoxy) that speaks SOCKS 4A.</p>
 
 <a name="own-network"></a>
 <h2>Setting up your own network</h2>
diff --git a/doc/tor-resolve.1 b/doc/tor-resolve.1
index 9c25f4475..e1e3dc4f2 100644
--- a/doc/tor-resolve.1
+++ b/doc/tor-resolve.1
@@ -8,8 +8,8 @@ tor-resolve \- resolve a hostname to an IP address via tor
 \fBtor-resolve\fP\ [-4|-5] \fIhostname\fP\ [\fIsockshost\fP[:\fIsocksport]\fP]
 
 .SH DESCRIPTION
-\fBtor-resolve\fR is a simple script to connect to a socks proxy that
-knows about the socks RESOLVE command, hand it a hostname, and return
+\fBtor-resolve\fR is a simple script to connect to a SOCKS proxy that
+knows about the SOCKS RESOLVE command, hand it a hostname, and return
 an IP address.
 
 .SH SEE ALSO
diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt
index 073c685f4..58aa296de 100644
--- a/doc/tor-spec.txt
+++ b/doc/tor-spec.txt
@@ -838,7 +838,7 @@ entries.
 7.4. Behavior of a directory server
 
 lists nodes that are connected currently
-speaks http on a socket, spits out directory on request
+speaks HTTP on a socket, spits out directory on request
 
 Directory servers listen on a certain port (the DirPort), and speak a
 limited version of HTTP 1.0. Clients send either GET or POST commands.
@@ -852,7 +852,7 @@ The basic interactions are:
     request containing the descriptor.
 
   "host" is used to specify the address:port of the dirserver, so
-  the request can survive going through http proxies.
+  the request can survive going through HTTP proxies.
 
 A.1. Differences between spec and implementation
 
diff --git a/doc/tor.1.in b/doc/tor.1.in
index b548b58e2..f8d0ebd5b 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -186,10 +186,10 @@ Set this to 0 if you don't want to allow application connections. (Default:
 9050)
 .TP
 \fBSOCKSBindAddress \fR\fIIP\fP
-Bind to this address to listen for connections from socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports.
+Bind to this address to listen for connections from SOCKS-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports.
 .TP
 \fBSOCKSPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP
-Set an entrance policy for this server, to limit who can connect to the socks ports. The policies have the same form as exit policies below.
+Set an entrance policy for this server, to limit who can connect to the SOCKS ports. The policies have the same form as exit policies below.
 
 .SH SERVER OPTIONS
 .PP
author	Nick Mathewson <nickm@torproject.org>	2004-12-21 05:43:17 +0000
committer	Nick Mathewson <nickm@torproject.org>	2004-12-21 05:43:17 +0000
commit	0c0a504611c794fe01ea3d709f596bacb9821f28 (patch)
tree	99cd9738b02db1f0824f301a66708d1350e99e19 /doc
parent	a742b5bbb00572633aba18e80285cb2bb72ac0fc (diff)
download	tor-0c0a504611c794fe01ea3d709f596bacb9821f28.tar tor-0c0a504611c794fe01ea3d709f596bacb9821f28.tar.gz