tor-webwml.git

@@ -53,7 +53,7 @@

     <li><a href="#TBBSocksPort">I'm on OSX or Linux and I want to

     run another application through the Tor launched by Tor Browser

-    Bundle. How do I predict my SOCKS port?</a></li>

+    Bundle. How do I predict my Socks port?</a></li>

     <li><a href="#TBBPolipo">I need an HTTP proxy. Where did Polipo

     go?</a></li>

     <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc

@@ -741,10 +741,10 @@ other than our official HTTPS website.

 <a id="TBBSocksPort"></a>

 <h3><a class="anchor" href="#TBBSocksPort">I'm on OSX or Linux and

 I want to run another application through the Tor launched by Tor

-Browser Bundle. How do I predict my SOCKS port?</a></h3>

+Browser Bundle. How do I predict my Socks port?</a></h3>

 <p>

-Typically Tor listens for SOCKS connections on port 9050. TBB

+Typically Tor listens for Socks connections on port 9050. TBB

 on OSX and Linux has an experimental feature where Tor listens

 on random unused ports rather than a fixed port each time. The

 goal is to avoid conflicting with a "system" Tor install,

@@ -752,14 +752,14 @@ so you can run a system Tor and TBB at the same time. We're <a

 href="https://trac.torproject.org/projects/tor/ticket/3948">working on

 a feature</a> where Tor will try the usual ports first and then back

 off to a random choice if they're already in use. Until then, if you

-want to configure some other application to use Tor as a SOCKS proxy,

+want to configure some other application to use Tor as a Socks proxy,

 here's a workaround:

 </p>

 <p>

 In Vidalia, go to Settings->Advanced and uncheck the box that says

 'Configure ControlPort automatically'. Click OK and restart TBB. Your

-SOCKS port will then be on 9050.

+Socks port will then be on 9050.

 </p>

 <hr>

@@ -780,7 +780,7 @@ Firefox's interaction with websites.

 If you are trying to use some external application with Tor, step zero

 should be to <a href="<page download/download>#warning">reread the set

 of warnings</a> for ways you can screw up. Step one should be to try

-to use a SOCKS proxy rather than an http proxy — Tor runs a SOCKS

+to use a Socks proxy rather than an http proxy — Tor runs a Socks

 proxy on port 9050 on Windows, or <a href="#TBBSocksPort">see above</a>

 for OSX and Linux.

 </p>

@@ -1221,7 +1221,7 @@ for more information on how to remove the Tor service.

     sure there are no spaces between the commas and the list items.

     </p>

     <p>

-    If you want to access a service directly through Tor's SOCKS interface

+    If you want to access a service directly through Tor's Socks interface

     (eg. using ssh via connect.c), another option is to set up an

     internal mapping in your configuration file using <tt>MapAddress</tt>.

     See the manual page for details.