@@ -73,7 +73,7 @@ configure NoScript to block JavaScript by default?</a></li>

     <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle

     running but close the browser.</a></li>

-    <li><a href="#GoogleCaptcha">Google makes me solve a Captcha or

+    <li><a href="#GoogleCaptcha">Google makes me solve a CAPTCHA or

 tells

     me I have spyware installed.</a></li>

     <li><a href="#GmailWarning">Gmail warns me that my account may have

@@ -498,12 +498,7 @@ or the

     <p>Not yet, but we're working on it. Most forum software is

     a disaster to maintain and keep secure, and at the same time

     too many of the Tor developers are spread too thin to be able

-    to contribute enough to a forum. As of June 2012, we have a

-    funder who wants to help us do it right. Stay tuned! (Tickets <a

-    href="https://trac.torproject.org/projects/tor/ticket/3592">3592</a>

-    and <a

-    href="https://trac.torproject.org/projects/tor/ticket/5995">5995</a>

-    relate to forums too.)

+    to contribute enough to a forum.

     </p>

     <hr>

@@ -956,30 +951,11 @@ secure, transparent proxy to protect you from proxy bypass, however issues

 with local IP address discovery and Flash cookies still remain.  </p>

 <p>

-<a href="https://www.youtube.com/html5">YouTube offers experimental HTML5 video 

-support</a> for many of their videos. You can use their Advanced Search to 

+<a href="https://www.youtube.com/html5">YouTube offers experimental HTML5 video

+support</a> for many of their videos. You can use their Advanced Search to

 find HTML5 videos.

 </p>

-<p>

-If you are not concerned about being tracked by these sites (and sites that

-try to unmask you by pretending to be them), and are unconcerned about your

-local censors potentially noticing you visit them, you can enable plugins by

-going into the Torbutton Preferences -> Security Settings

-tab and unchecking "Disable browser plugins (such as Flash)" box. If you do this

-without The Amnesic Incognito Live System or appropriate firewall

-rules, we strongly suggest you at least use <a

-href="https://addons.mozilla.org/en-US/firefox/addon/722">NoScript</a> to <a

-href="http://noscript.net/features#contentblocking">block plugins</a>. You do

-not need to use the NoScript per-domain permissions if you check the <b>Apply

-these restrictions to trusted sites too</b> option under the NoScript Plugins

-preference tab. In fact, with this setting you can even have NoScript allow

-Javascript globally, but still block all plugins until you click on their

-placeholders in a page. We also recommend <a

-href="https://addons.mozilla.org/en-US/firefox/addon/6623">Better Privacy</a>

-in this case to help you clear your Flash cookies.

-</p>

-

 <hr>

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

@@ -989,12 +965,12 @@ Browser Bundle.</a></h3>

 <p>

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

-on port 9150. 

+on port 9150.

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

 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. 

+off to a random choice if they're already in use.

 </p>

 <hr>

@@ -1044,8 +1020,8 @@ its name).

 </p>

 <p>

-Generally, extensions that require registration, and/or provide 

-additional information about websites you are visiting, should be 

+Generally, extensions that require registration, and/or provide

+additional information about websites you are visiting, should be

 suspect.

 </p>

@@ -1058,7 +1034,7 @@ Extensions you might like include

  <a href="https://addons.mozilla.org/firefox/addon/82">Cookie Culler</a>,

  <a href="https://addons.mozilla.org/en-US/firefox/addon/9727/">Request Policy</a> and

  <a href="https://addons.mozilla.org/en-US/firefox/addon/certificate-patrol/">Certificate Patrol</a>.

-</p> 

+</p>

 <hr>

@@ -1680,7 +1656,7 @@ relay or bridge relay?</a></h3>

 short)

     are <a href="<page docs/tor-doc-relay>">Tor relays</a> that aren't

     listed in the public Tor directory.

-    That means that ISPs or governments trying to block access to the 

+    That means that ISPs or governments trying to block access to the

     Tor network can't simply block all bridges.

     </p>

@@ -1690,7 +1666,7 @@ short)

     </p>

     <p>

-    So bridges are useful a) for Tor users in oppressive regimes, 

+    So bridges are useful a) for Tor users in oppressive regimes,

     and b) for people who want an extra layer of security

     because they're worried somebody will recognize that it's a public

     Tor relay IP address they're contacting.

@@ -1698,9 +1674,9 @@ short)

     <p>

     Several countries, including China and Iran, have found ways to

-    detect and block connections to Tor bridges. 

+    detect and block connections to Tor bridges.

     <a href="<page projects/obfsproxy>">Obfsproxy</a> bridges address

-    this by adding another layer of obfuscation. 

+    this by adding another layer of obfuscation.

     </p>

     <p>So should you run a normal relay or bridge relay? If you have