tor-webwml.git

@@ -255,7 +255,7 @@

           <dd>Researcher at University College London who works

           on security, performance, and usability of Tor. Original creator

           of the <a href="<page projects/torbrowser>">Tor Browser

-          Bundle</a> (now just called the Tor Browser). You can find

+          Bundle</a> (now just called Tor Browser). You can find

           out more about his work on his

           <a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">professional

           website</a>.</dd>

@@ -873,8 +873,8 @@ executive

     <p>No, it doesn't. You need to use a separate program that understands

     your application and protocol and knows how to clean or "scrub" the data

-    it sends. The Tor Browser tries to keep application-level data,

-    like the user-agent string, uniform for all users. The Tor Browser can't

+    it sends. Tor Browser tries to keep application-level data,

+    like the user-agent string, uniform for all users. Tor Browser can't

     do anything about text that you type into forms, though. <a

     href="<page download/download-easy>#warning">Be

     careful and be smart.</a>

@@ -1060,7 +1060,7 @@ from the graphical interface. Open "Files" (Unity's explorer), open

 Preferences-> Behavior Tab -> Set "Run executable text files when they are

 opened" to "Ask every time", then OK.

 </p>

-<p>You can also start the Tor Browser from the command line by running </p>

+<p>You can also start Tor Browser from the command line by running </p>

 <pre>./start-tor-browser</pre>

 <p>

 from inside the Tor Browser directory.

@@ -1104,7 +1104,7 @@ issue.

 Firefox extensions?</a></h3>

 <p>

-The Tor Browser is free software, so there is nothing preventing you from

+Tor Browser is free software, so there is nothing preventing you from

 modifying it any way you like. However, we do not recommend installing any

 additional Firefox add-ons with Tor Browser. Add-ons can break

 your anonymity in a number of ways, including browser fingerprinting and

@@ -1112,7 +1112,7 @@ bypassing proxy settings.

 </p>

 <p>

 Some people have suggested we include ad-blocking software or

-anti-tracking software with the Tor Browser. Right now, we do not

+anti-tracking software with Tor Browser. Right now, we do not

 think that's such a good idea. Tor Browser aims to provide

 sufficient privacy that additional add-ons to stop ads and trackers are

 not necessary. Using add-ons like these may cause some sites to break, which

@@ -1185,7 +1185,7 @@ really bad idea.

 Our efforts to work with the Chrome team to <a

 href="https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-and-fingerprinting">add

 missing APIs</a> were unsuccessful, unfortunately. Currently, it is impossible

-to use other browsers and get the same level of protections as when using the

+to use other browsers and get the same level of protections as when using

 Tor Browser.

 </p>

@@ -3375,9 +3375,9 @@ diversity,

     a web browser that is preconfigured to

     help you control the risks to your privacy and anonymity while browsing

     the Internet. Not only are the above technologies disabled to prevent

-    identity leaks, the Tor Browser also includes browser extensions like

+    identity leaks, Tor Browser also includes browser extensions like

     NoScript and Torbutton, as well as patches to the Firefox source

-    code. The full design of the Tor Browser can be read <a

+    code. The full design of Tor Browser can be read <a

     href="https://www.torproject.org/projects/torbrowser/design/">here</a>.

     In designing a safe, secure solution for browsing the web with Tor,

     we've discovered that configuring <a href="#TBBOtherBrowser">other

@@ -19,8 +19,8 @@

     are done.

     </h2>

-    <p>Even though the Tor Browser comes with a regular Tor, it will only run

-    as long as you keep the Tor Browser open. The following instructions will

+    <p>Even though Tor Browser comes with a regular Tor, it will only run

+    as long as you keep 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>

@@ -67,7 +67,7 @@

     you will need to tell Windows the full path to the GnuPG program. If

     you installed GnuPG with the default values, the path should be

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

-    <p>The Tor Browser team signs the Tor Browsers. Import its key

+    <p>The Tor Browser team signs Tor Browser releases. Import its key

     (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p>

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

@@ -116,7 +116,7 @@

     </p>

     <p>The next step is to use GnuPG to import the key that signed

-    your package. The Tor Browser team signs the Tor Browsers. Import its

+    your package. The Tor Browser team signs Tor Browser releases. Import its

     key (0x4E2C6E8793298290) by starting the terminal (under "Applications"

     in Mac OS X) and typing:</p>

@@ -189,7 +189,7 @@

        property</a> of Tor Browser 3.0 and later. Anyone can build

        Tor Browser on their own machine and produce a binary that is

        bit-for-bit identical to the binary we offer on the download page.

-       Fortunately, it is not necessary for everyone to build the Tor Browser

+       Fortunately, it is not necessary for everyone to build Tor Browser

        locally to get this security. Verifying and comparing the signed list

        of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a>

        will confirm that multiple people have built Tor Browsers

@@ -19,7 +19,7 @@

             anonymity and privacy technologies, supporting their

             unrestricted availability and use, and furthering their

             scientific and popular understanding. The main product of

-            the Tor Project is the Tor Browser, which enables people

+            the Tor Project is Tor Browser, which enables people

             to browse the internet anonymously.  The Tor Project is a

             501(c)3 tax-exempt non-profit organization based in Boston,

             Massachusetts. It was founded in 2006.</p>

@@ -215,14 +215,14 @@ exactly as you are used to.</p>

 <ol>

-<li><b>Use the Tor Browser</b>

+<li><b>Use Tor Browser</b>

 <p>Tor does not protect all of your computer's Internet traffic when you

 run it. Tor only protects your applications that are properly configured

 to send their Internet traffic through Tor. To avoid problems with

 Tor configuration, we strongly recommend you use the <a href="<page

 projects/torbrowser>">Tor Browser</a>. It is pre-configured to

 protect your privacy and anonymity on the web as long as you're browsing

-with the Tor Browser itself. Almost any other web browser configuration

+with Tor Browser itself. Almost any other web browser configuration

 is likely to be unsafe to use with Tor.</p>

 </li>

 <li><b>Don't torrent over Tor</b>

@@ -238,10 +238,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els

 </p>

 </li>

 <li><b>Don't enable or install browser plugins</b>

-<p>The Tor Browser will block browser plugins such as Flash, RealPlayer,

+<p>Tor Browser will block browser plugins such as Flash, RealPlayer,

 Quicktime, and others: they can be manipulated into revealing your IP

 address.  Similarly, we do not recommend installing additional addons or

-plugins into the Tor Browser, as these may bypass Tor or otherwise harm

+plugins into Tor Browser, as these may bypass Tor or otherwise harm

 your anonymity and privacy.</p>

 </li>

@@ -250,7 +250,7 @@ your anonymity and privacy.</p>

 href="<page about/overview>#thesolution">to

 and within the Tor network</a>, but the encryption of your traffic to

 the final destination website depends upon on that website. To help

-ensure private encryption to websites, the Tor Browser includes

+ensure private encryption to websites, Tor Browser includes

 <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>

 to force the use of HTTPS encryption with major websites that

 support it. However, you should still watch the browser URL bar to

@@ -265,7 +265,7 @@ and HTTPS relate</a>.

 </li>

 <li><b>Don't open documents downloaded through Tor while online</b>

-<p>The Tor Browser will warn you before automatically opening

+<p>Tor Browser will warn you before automatically opening

 documents that are handled by external applications. <b>DO NOT

 IGNORE THIS WARNING</b>.  You should be very careful when downloading

 documents via Tor (especially DOC and PDF files, unless you use the PDF

@@ -215,7 +215,7 @@ custom configurations. All an apt-get or yum install away.</p>

 you are used to.</p>

 <ol>

-<li><b>Use the Tor Browser</b>

+<li><b>Use Tor Browser</b>

 <p>

@@ -224,7 +224,7 @@ run it. Tor only protects your applications that are properly configured to

 send their Internet traffic through Tor. To avoid problems with Tor

 configuration, we strongly recommend you use the

 <a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect

-your privacy and anonymity on the web as long as you're browsing with the Tor

+your privacy and anonymity on the web as long as you're browsing with Tor

 Browser itself. Almost any other web browser configuration is likely to be

 unsafe to use with Tor.

@@ -249,10 +249,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els

 <p>

-The Tor Browser will block browser plugins such as Flash, RealPlayer,

+Tor Browser will block browser plugins such as Flash, RealPlayer,

 Quicktime, and others: they can be manipulated into revealing your IP address.

 Similarly, we do not recommend installing additional addons or plugins into

-the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and

+Tor Browser, as these may bypass Tor or otherwise harm your anonymity and

 privacy.

 </p>

@@ -267,7 +267,7 @@ Tor will encrypt your traffic

 <a href="<page about/overview>#thesolution">to and

 within the Tor network</a>, but the encryption of your traffic to the final

 destination website depends upon on that website. To help ensure private

-encryption to websites, the Tor Browser includes <a

+encryption to websites, Tor Browser includes <a

 href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the

 use of HTTPS encryption with major websites that support it. However, you

 should still watch the browser URL bar to ensure that websites you provide

@@ -286,7 +286,7 @@ and HTTPS relate</a>.

 <p>

-The Tor Browser will warn you before automatically opening documents that are

+Tor Browser will warn you before automatically opening documents that are

 handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You

 should be very careful when downloading documents via Tor (especially DOC and

 PDF files, unless you use the PDF viewer that's built into Tor Browser) as

@@ -14,7 +14,7 @@

    <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <meta name="viewport" content="width=device-width, initial-scale=1">

    <meta name="author" content="The Tor Project, Inc.">

-   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get the Tor Browser.">

+   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get Tor Browser.">

    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">

    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">

@@ -18,7 +18,7 @@ experience safer and better.</p>

 src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75"

 height="75"></a>

 <div class="projectdesc"><div class="name"><a href="<page

-projects/torbrowser>">Tor Browser</a></div> <p>The Tor Browser

+projects/torbrowser>">Tor Browser</a></div> <p>Tor Browser

 contains everything you need to safely browse the Internet. This

 package requires no installation. Just extract it and run.</p>

 </div></div>

@@ -17,7 +17,7 @@

       <div class="tbb box">

 #include "side.wmi"

   <!-- END SIDECOL -->

-    <div class="pjtitle"><h2>What is the Tor Browser?</h2></div>

+    <div class="pjtitle"><h2>What is Tor Browser?</h2></div>

     <div class="pjtext">

       <p>The <strong>Tor</strong> software protects

       you by bouncing your communications around a distributed network of

@@ -25,7 +25,7 @@

       watching your Internet connection from learning what sites you visit,

       it prevents the sites you visit from learning your physical location,

       and it lets you access sites which are blocked.</p>

-      <p>The <strong>Tor Browser</strong> lets you use Tor on

+      <p><strong>Tor Browser</strong> lets you use Tor on

       Windows, Mac OS X, or Linux without needing to install any software.

       It can run off a USB flash drive, comes with a pre-configured web

       browser to protect your anonymity, and is self-contained

@@ -42,7 +42,7 @@

     </div>

     <!-- Commenting out the videos until support updates them to use TB 4.0

     <div class="pjvids">

-      <h3>Quick Videos on how to use the Tor Browser</h3>

+      <h3>Quick Videos on how to use Tor Browser</h3>

     </div>

     <div class="vidtable">

       <table>

@@ -624,7 +624,7 @@

       of web pages you visited and any cookies will be deleted.</p>

       <p><a href="$(IMGROOT)/tbb-screenshot3.jpg"><img src="$(IMGROOT)/tbb-screenshot3.jpg" alt="Screenshot of

       Firefox" width="860" height="645"></a></p>

-      <p>To use the Tor Browser again, double click on the "Start Tor Browser" application.</p>

+      <p>To use Tor Browser again, double click on the "Start Tor Browser" application.</p>

       <p>Remember that Tor anonymizes the origin of your traffic,

       and it encrypts everything inside the Tor network, but <a

       href="<wikifaq>#ExitEavesdroppers">it can't encrypt your traffic

@@ -643,7 +643,7 @@

       email the <a href="<page about/contact>">help desk</a>.</p>

       <br><br>

       <h3>Comments and suggestions</h3>

-      <p>The Tor Browser is under development.

+      <p>Tor Browser is under development.

       To discuss improvements and submit comments, please use the <a

       href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>

       mailing list.</p>

@@ -651,7 +651,7 @@

       <h3>More information</h3>

       <p><strong><em>What is Tor and why do I need it?</em></strong> 

       <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p>

-      <p><strong><em>What is in the Tor Browser?</em></strong>

+      <p><strong><em>What is in Tor Browser?</em></strong>

       <br>It contains Tor, a modified <a

       href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox

       ESR</a>, Torbutton, TorLauncher,