Browse code

Replaced "the Tor Browser Bundle" in active docs.

Matt Pagan authored on20/12/2014 16:05:28
Showing11 changed files
... ...
@@ -221,8 +221,8 @@
221 221
     Tor can't solve all anonymity problems.  It focuses only on
222 222
     protecting the transport of data.  You need to use protocol-specific
223 223
     support software if you don't want the sites you visit to see your
224
-    identifying information. For example, you can use the <a href="<page
225
-    projects/torbrowser>">Tor Browser Bundle</a>
224
+    identifying information. For example, you can use <a href="<page
225
+    projects/torbrowser>">Tor Browser</a>
226 226
     while browsing the web to withhold some information about your computer's
227 227
     configuration.
228 228
     </p>
... ...
@@ -36,7 +36,7 @@
36 36
     </li>
37 37
 
38 38
     <li>
39
-    <a href="<page download/download>">Install the Tor Browser Bundle</a> and try it out.
39
+    <a href="<page download/download>">Install Tor Browser</a> and try it out.
40 40
     Be sure to read the
41 41
     <a href="<page download/download>#Warning">list of warnings</a> about ways you
42 42
     can screw up your anonymity. Look through the <a
... ...
@@ -16,8 +16,8 @@
16 16
 
17 17
     <p><a href="#General">General questions:</a><br />
18 18
     <a href="#CompilationAndInstallation">Compilation and Installation:</a><br />
19
-    <a href="#TBBGeneral">Tor Browser Bundle (general):</a><br />
20
-    <a href="#TBB3.x">Tor Browser Bundle (3.x series):</a><br />
19
+    <a href="#TBBGeneral">Tor Browser (general):</a><br />
20
+    <a href="#TBB3.x">Tor Browser (3.x and later):</a><br />
21 21
     <a href="#AdvancedTorUsage">Advanced Tor usage:</a><br />
22 22
     <a href="#RunningATorRelay">Running a Tor relay:</a><br />
23 23
     <a href="#TorHiddenServices">Tor hidden services:</a><br />
... ...
@@ -74,7 +74,7 @@ proxies?</a></li>
74 74
 includes Tor?</a></li>
75 75
     </ul>
76 76
 
77
-    <p>Tor Browser Bundle (general):</p>
77
+    <p>Tor Browser (general):</p>
78 78
     <ul>
79 79
 
80 80
     <li><a href="#TBBFlash">Why can't I view videos on YouTube and other
... ...
@@ -88,7 +88,7 @@ error message: "Cannot load XPCOM".</a></li>
88 88
     <li><a href="#TBBOtherExtensions">Can I install other Firefox
89 89
     extensions? Which extensions should I avoid using?</a></li>
90 90
     <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to
91
-allow JavaScript by default in the Tor Browser Bundle?  Isn't that
91
+allow JavaScript by default in Tor Browser?  Isn't that
92 92
 unsafe?</a></li>
93 93
     <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc
94 94
     with Tor.</a></li>
... ...
@@ -106,7 +106,7 @@ unsafe?</a></li>
106 106
     with my application?</a></li>
107 107
     </ul>
108 108
 
109
-    <p>Tor Browser Bundle (3.x series):</p>
109
+    <p>Tor Browser (3.x and later):</p>
110 110
 
111 111
     <ul>
112 112
     <li><a href="#WhereDidVidaliaGo">Where did the world map (Vidalia)
... ...
@@ -119,8 +119,8 @@ unsafe?</a></li>
119 119
     <li><a href="#ConfigureRelayOrBridge">How do I configure Tor as a relay
120 120
     or bridge?</a></li>
121 121
     <li><a href="#Timestamps">Why are the file timestamps from 2000?</a></li>
122
-    <li><a href="#TBBSourceCode">Where is the source code for the bundle? How do
123
-    I verify a build?</a></li>
122
+    <li><a href="#TBBSourceCode">Where is the source code for Tor Browser? 
123
+    How do I verify a build?</a></li>
124 124
     </ul>
125 125
 
126 126
     <p>Advanced Tor usage:</p>
... ...
@@ -432,8 +432,8 @@ encryption, what data you're sending to the destination.</dd>
432 432
 can I use with Tor?</a></h3>
433 433
 
434 434
     <p>
435
-    If you want to use Tor with a web browser, we provide the Tor Browser
436
-    Bundle, which includes everything you need to browse the web safely using
435
+    If you want to use Tor with a web browser, we provide the Tor Browser,
436
+    which includes everything you need to browse the web safely using
437 437
     Tor. If you want to use another web browser with Tor, see <a
438 438
     href="#TBBOtherBrowser">Other web browsers</a>.
439 439
     </p>
... ...
@@ -919,8 +919,8 @@ executive
919 919
     </a></h3>
920 920
 
921 921
     <p>
922
-    Use the <a href="https://torproject.org/projects/torbrowser.html">Tor
923
-    Browser Bundle</a>. If you want a separate application for an
922
+    Use <a href="https://torproject.org/projects/torbrowser.html">Tor
923
+    Browser</a>. If you want a separate application for an
924 924
     ftp client, we've heard good things about  FileZilla for Windows. You can
925 925
     configure it to point to Tor as a "socks4a" proxy on "localhost" port
926 926
     "9050".
... ...
@@ -934,7 +934,7 @@ executive
934 934
 
935 935
     <p>No, it doesn't. You need to use a separate program that understands
936 936
     your application and protocol and knows how to clean or "scrub" the data
937
-    it sends. The Tor Browser Bundle tries to keep application-level data,
937
+    it sends. The Tor Browser tries to keep application-level data,
938 938
     like the user-agent string, uniform for all users. The Tor Browser can't
939 939
     do anything about text that you type into forms, though. <a
940 940
     href="<page download/download-easy>#warning">Be
... ...
@@ -1045,8 +1045,8 @@ country. How do I download Tor?</a></h3>
1045 1045
 <p>
1046 1046
 Some government or corporate firewalls censor connections to Tor's
1047 1047
 website. In those cases, you have three options. First, get it from
1048
-a friend &mdash; the <a href="<page projects/torbrowser>">Tor Browser
1049
-Bundle</a> fits nicely on a USB key. Second, find the <a
1048
+a friend &mdash; <a href="<page projects/torbrowser>">Tor Browser</a> 
1049
+fits nicely on a USB key. Second, find the <a
1050 1050
 href="https://encrypted.google.com/search?q=tor+mirrors">google
1051 1051
 cache</a>
1052 1052
 for the <a href="<page getinvolved/mirrors>">Tor mirrors</a> page
... ...
@@ -1105,15 +1105,13 @@ bundle that includes Tor?</a></h3>
1105 1105
 
1106 1106
     <p>
1107 1107
     Yes.  Use <a href="https://tails.boum.org/">The Amnesic Incognito
1108
-    Live System</a> or <a href="<page projects/torbrowser>">the Tor
1109
-Browser
1110
-    Bundle</a>.
1108
+    Live System</a> or <a href="<page projects/torbrowser>">Tor Browser</a>.
1111 1109
     </p>
1112 1110
 
1113 1111
 <hr>
1114 1112
 
1115 1113
 <a id="TBBGeneral"></a>
1116
-<h2><a class="anchor">Tor Browser Bundle (general):</a></h2>
1114
+<h2><a class="anchor">Tor Browser (general):</a></h2>
1117 1115
 
1118 1116
 <a id="TBBFlash"></a>
1119 1117
 <h3><a class="anchor" href="#TBBFlash">Why can't I view videos on
... ...
@@ -1201,14 +1199,14 @@ Firefox extensions?</a></h3>
1201 1199
 <p>
1202 1200
 The Tor Browser is free software, so there is nothing preventing you from
1203 1201
 modifying it any way you like. However, we do not recommend installing any
1204
-additional Firefox add-ons with the Tor Browser Bundle. Add-ons can break
1202
+additional Firefox add-ons with Tor Browser. Add-ons can break
1205 1203
 your anonymity in a number of ways, including browser fingerprinting and
1206 1204
 bypassing proxy settings.
1207 1205
 </p>
1208 1206
 <p>
1209 1207
 Some people have suggested we include ad-blocking software or
1210
-anti-tracking software with the Tor Browser Bundle. Right now, we do not
1211
-think that's such a good idea. The Tor Browser Bundle aims to provide
1208
+anti-tracking software with the Tor Browser. Right now, we do not
1209
+think that's such a good idea. Tor Browser aims to provide
1212 1210
 sufficient privacy that additional add-ons to stop ads and trackers are
1213 1211
 not necessary. Using add-ons like these may cause some sites to break, which
1214 1212
 <a href="https://www.torproject.org/projects/torbrowser/design/#philosophy">
... ...
@@ -1222,12 +1220,12 @@ users.
1222 1220
 <a id="TBBJavaScriptEnabled"></a>
1223 1221
 <a id="TBBCanIBlockJS"></a>
1224 1222
 <h3><a class="anchor" href="#TBBJavaScriptEnabled">Why is NoScript
1225
-configured to allow JavaScript by default in the Tor Browser Bundle?
1223
+configured to allow JavaScript by default in Tor Browser?
1226 1224
 Isn't that unsafe?</a></h3>
1227 1225
 
1228 1226
 <p>
1229
-We configure NoScript to allow JavaScript by default in the Tor
1230
-Browser Bundle because many websites will not work with JavaScript
1227
+We configure NoScript to allow JavaScript by default in Tor
1228
+Browser because many websites will not work with JavaScript
1231 1229
 disabled.  Most users would give up on Tor entirely if a website
1232 1230
 they want to use requires JavaScript, because they would not know
1233 1231
 how to allow a website to use JavaScript (or that enabling
... ...
@@ -1478,7 +1476,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed
1478 1476
 <hr>
1479 1477
 
1480 1478
 <a id="TBB3.x"></a>
1481
-<h2><a class="anchor">Tor Browser Bundle (3.x series):</a></h2>
1479
+<h2><a class="anchor">Tor Browser (3.x and later):</a></h2>
1482 1480
     <a id="WhereDidVidaliaGo"></a>
1483 1481
     <h3><a class="anchor" href="#WhereDidVidaliaGo">Where did the world map
1484 1482
     (Vidalia) go?</a></h3>
... ...
@@ -1641,7 +1639,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed
1641 1639
     from 2000?</a></h3>
1642 1640
 
1643 1641
     <p>One of the huge new features in TBB 3.x is the "deterministic build"
1644
-    process, which allows many people to build the Tor Browser Bundle and
1642
+    process, which allows many people to build Tor Browser and
1645 1643
     verify that they all make exactly the same package. See Mike's <a
1646 1644
     href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">first
1647 1645
     blog</a> post for the motivation, and his <a
... ...
@@ -1656,7 +1654,8 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed
1656 1654
     <hr>
1657 1655
 
1658 1656
     <a id="TBBSourceCode"></a>
1659
-    <h3><a class="anchor" href="#TBBSourceCode">Where is the source code for the bundle? How do I verify a build?</a></h3>
1657
+    <h3><a class="anchor" href="#TBBSourceCode">Where is the source code for 
1658
+    Tor Browser? How do I verify a build?</a></h3>
1660 1659
 
1661 1660
     <p>
1662 1661
     Start with <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">https://gitweb.torproject.org/builders/tor-browser-bundle.git</a> and <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build">https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build</a>.
... ...
@@ -1678,9 +1677,9 @@ instructions for how your Tor program should behave. The default
1678 1677
 configuration should work fine for most Tor users.
1679 1678
 </p>
1680 1679
 <p>
1681
-If you installed Tor Browser Bundle, look for
1682
-<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory.
1683
-On OS X, you must right-click or command-click on the browser bundle icon,
1680
+If you installed Tor Browser, look for
1681
+<code>Data/Tor/torrc</code> inside your Tor Browser directory.
1682
+On OS X, you must right-click or command-click on the Tor Browser icon,
1684 1683
 and select "Show Package Contents" before the Tor Browser directories become
1685 1684
 visible.
1686 1685
 </p>
... ...
@@ -1810,12 +1809,12 @@ their logs.
1810 1809
 working.</a></h3>
1811 1810
 
1812 1811
 <p>
1813
-Once you've got the Tor bundle up and running, the first question to
1812
+Once you've got Tor Browser up and running, the first question to
1814 1813
 ask is whether your Tor client is able to establish a circuit.
1815 1814
 </p>
1816 1815
 
1817 1816
 <p>If Tor can establish a circuit, the onion icon in
1818
-Vidalia will turn green (and if you're running Tor Browser Bundle, it
1817
+Vidalia will turn green (and if you're running Tor Browser, it
1819 1818
 will
1820 1819
 automatically launch a browser for you). You can also check in the
1821 1820
 Vidalia
... ...
@@ -3542,9 +3541,9 @@ diversity,
3542 3541
     these technologies must be disabled in your browser to use Tor safely.
3543 3542
     </p>
3544 3543
     <p>
3545
-    That's where the <a
3546
-    href="<page projects/torbrowser>">Tor Browser
3547
-    Bundle</a> comes in. We produce a web browser that is preconfigured to
3544
+    That's where <a
3545
+    href="<page projects/torbrowser>">Tor Browser</a> comes in. We produce 
3546
+    a web browser that is preconfigured to
3548 3547
     help you control the risks to your privacy and anonymity while browsing
3549 3548
     the Internet. Not only are the above technologies disabled to prevent
3550 3549
     identity leaks, the Tor Browser also includes browser extensions like
... ...
@@ -46,7 +46,7 @@
46 46
 
47 47
     <p>Alas, since Vidalia (a graphical interface for Tor) is <a
48 48
     href="<page docs/faq>#WhereDidVidaliaGo">no longer included</a>
49
-    in the standard Tor Browser Bundle, there are currently no
49
+    in Tor Browser, there are currently no
50 50
     easy relay packages for OS X users. One option might be to run
51 51
     Debian in a VM, or use a different means of getting a Tor binary on
52 52
     your system (Homebrew, Macports). Please help make this process
... ...
@@ -14,8 +14,8 @@
14 14
     <br>
15 15
     
16 16
     <h2>Note that these are the installation instructions for running a
17
-    Tor client. The easiest way to do this is to simply download the <a
18
-    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are
17
+    Tor client. The easiest way to do this is to simply download <a
18
+    href="<page projects/torbrowser>">Tor Browser</a> and you are
19 19
     done.
20 20
     </h2>
21 21
     
... ...
@@ -56,7 +56,7 @@
56 56
     <br>
57 57
     
58 58
     <p>
59
-    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),
59
+    If you want to use Tor for anonymous web browsing, please use <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),
60 60
     you can point your application directly at Tor (localhost
61 61
     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ
62 62
     entry</a> for why this may be dangerous. For applications
... ...
@@ -67,7 +67,7 @@
67 67
     you will need to tell Windows the full path to the GnuPG program. If
68 68
     you installed GnuPG with the default values, the path should be
69 69
     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>
70
-    <p>Erinn Clark signs the Tor Browser Bundles. Import her key
70
+    <p>Erinn Clark signs the Tor Browsers. Import her key
71 71
     (0x416F061063FEE659) by starting <i>cmd.exe</i> and typing:</p>
72 72
     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659</pre>
73 73
     <p>After importing the key, you can verify that the fingerprint
... ...
@@ -112,7 +112,7 @@
112 112
     </p>
113 113
 
114 114
     <p>Once it's installed, use GnuPG to import the key that signed
115
-    your package. Erinn Clark signs the Tor Browser Bundles. Import her
115
+    your package. Erinn Clark signs the Tor Browsers. Import her
116 116
     key (0x416F061063FEE659) by starting the terminal (under "Applications")
117 117
     and typing:</p>
118 118
 
... ...
@@ -188,13 +188,13 @@
188 188
     <hr>
189 189
     <p>Build reproducibility is a <a 
190 190
        href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">security 
191
-       property</a> of Tor Browser Bundle 3.0 and later. Anyone can build the 
192
-       Tor Browser Bundle on their own machine and produce a binary that is 
191
+       property</a> of Tor Browser 3.0 and later. Anyone can build 
192
+       Tor Browser on their own machine and produce a binary that is 
193 193
        bit-for-bit identical to the binary we offer on the download page. 
194 194
        Fortunately, it is not necessary for everyone to build the Tor Browser 
195 195
        locally to get this security. Verifying and comparing the signed list 
196 196
        of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a> 
197
-       will confirm that multiple people have built Tor Browser Bundles 
197
+       will confirm that multiple people have built Tor Browsers 
198 198
        identical to the download.</p>
199 199
 
200 200
       <p>The steps below walk through this process:</p>
... ...
@@ -233,7 +233,7 @@
233 233
     <p><a href="https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures">Scripts</a> 
234 234
     to <a href="http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x">automate</a> 
235 235
     these steps have been written, but to use them you will need to modify 
236
-    them yourself with the latest Tor Browser Bundle filename.</p>
236
+    them yourself with the latest Tor Browser filename.</p>
237 237
     
238 238
     <hr>
239 239
 
... ...
@@ -88,18 +88,18 @@
88 88
 
89 89
     <p>
90 90
     Torbutton is the component in <a href="<page projects/torbrowser>">Tor
91
-    Browser Bundle</a> that takes care of application-level
91
+    Browser</a> that takes care of application-level
92 92
     security and privacy concerns in Firefox.  To keep you safe,
93 93
     Torbutton disables many types of active content.
94 94
     </p>
95 95
 
96 96
     <p>
97
-    Now that the <a href="<page projects/torbrowser>">Tor Browser
98
-    Bundle</a> includes a patched version of Firefox, and because we don't
97
+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a>
98
+    includes a patched version of Firefox, and because we don't
99 99
     have enough developer resources to keep up with the accelerated
100 100
     Firefox release schedule, the toggle model of Torbutton is <a
101 101
     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
102
-    longer supported</a>. <b>Users should be using Tor Browser Bundle,
102
+    longer supported</a>. <b>Users should be using Tor Browser,
103 103
     not installing Torbutton themselves.</b>
104 104
     </p>
105 105
 
... ...
@@ -17,18 +17,18 @@
17 17
 
18 18
     <p>
19 19
     Torbutton is the component in <a href="<page projects/torbrowser>">Tor
20
-    Browser Bundle</a> that takes care of application-level
20
+    Browser</a> that takes care of application-level
21 21
     security and privacy concerns in Firefox.  To keep you safe,
22 22
     Torbutton disables many types of active content.
23 23
     </p>
24 24
 
25 25
     <p>
26
-    Now that the <a href="<page projects/torbrowser>">Tor Browser
27
-    Bundle</a> includes a patched version of Firefox, and because we don't
26
+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a> 
27
+    includes a patched version of Firefox, and because we don't
28 28
     have enough developer resources to keep up with the accelerated
29 29
     Firefox release schedule, the toggle model of Torbutton is <a
30 30
     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
31
-    longer supported</a>. <b>Users should be using Tor Browser Bundle,
31
+    longer supported</a>. <b>Users should be using Tor Browser,
32 32
     not installing Torbutton themselves.</b>
33 33
     </p>
34 34
   
... ...
@@ -17,18 +17,18 @@
17 17
 
18 18
     <p>
19 19
     Torbutton is the component in <a href="<page projects/torbrowser>">Tor
20
-    Browser Bundle</a> that takes care of application-level
20
+    Browser</a> that takes care of application-level
21 21
     security and privacy concerns in Firefox.  To keep you safe,
22 22
     Torbutton disables many types of active content.
23 23
     </p>
24 24
   
25 25
     <p>
26
-    Now that the <a href="<page projects/torbrowser>">Tor Browser
27
-    Bundle</a> includes a patched version of Firefox, and because we don't
26
+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a>
27
+    includes a patched version of Firefox, and because we don't
28 28
     have enough developer resources to keep up with the accelerated
29 29
     Firefox release schedule, the toggle model of Torbutton is <a
30 30
     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
31
-    longer supported</a>. <b>Users should be using Tor Browser Bundle,
31
+    longer supported</a>. <b>Users should be using Tor Browser,
32 32
     not installing Torbutton themselves.</b>
33 33
     </p>
34 34
     </div>
... ...
@@ -111,10 +111,7 @@ serious reliability and security bugs in these downloads.  Please be prepared to
111 111
 <div class="nb">
112 112
 <p>
113 113
 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
114
-under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. The
115
-bundles also include <a href="<page projects/vidalia>">Vidalia</a>
116
-and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>, which are supporting
117
-applications distributed under the GNU GPL.
114
+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. 
118 115
 </p>
119 116
 <p>
120 117
 There is no fee for installing Tor, or using the Tor network, but
... ...
@@ -18,8 +18,8 @@ experience safer and better.</p>
18 18
 src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75"
19 19
 height="75"></a>
20 20
 <div class="projectdesc"><div class="name"><a href="<page
21
-projects/torbrowser>">Tor Browser Bundle</a></div> <p>The Tor Browser
22
-Bundle contains everything you need to safely browse the Internet. This
21
+projects/torbrowser>">Tor Browser</a></div> <p>The Tor Browser
22
+contains everything you need to safely browse the Internet. This
23 23
 package requires no installation. Just extract it and run.</p>
24 24
 </div></div>
25 25