commit 73ba951c071fa112678e41bf66e9cfa06b4722bb Author: Sebastian Hahn <sebastian@torproject.org> Date: Wed Feb 11 08:00:37 2015 +0100 Say Tor Browser Bundle in fewer places --- docs/en/pluggable-transports.wml | 2 +- docs/en/tor-doc-osx.wml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml index 5b079ed..45c07d9 100644 --- a/docs/en/pluggable-transports.wml +++ b/docs/en/pluggable-transports.wml @@ -146,7 +146,7 @@ transport API</a>, to make it easier to build interoperable programs. <hr> <a id="download"></a> - <h2><a href="<page download/download-easy>">Download the Pluggable Transports Tor Browser Bundle</a></h2> + <h2><a href="<page download/download-easy>">Download the Pluggable Transports Tor Browser</a></h2> <p> As of Tor Browser 3.6-beta-1, pluggable transports are now included in the <a href="<page download/download-easy>">official diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 1ea21ff..a3990af 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -15,11 +15,11 @@ <h2>These are advanced installation instructions for running Tor in a command line. The recommended way to use Tor is to simply download the - <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you + <a href="<page projects/torbrowser>">Tor Browser</a> and you are done. </h2> - <p>Even though the Tor Browser Bundle comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. + <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. <hr> <a id="installing"></a> <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2> @@ -54,7 +54,7 @@ <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2> <p> - 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), + If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. 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="<wikifaq>#SOCKSAndDNS">this FAQ entry</a> for why this may be dangerous. For applications