[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r23546: {website} We decided to go with HTML in favor of XHTML. (in website/trunk: about/en docs/en donate/en download/en eff/en en getinvolved/en press/en projects/en torbutton/en)



Author: sebastian
Date: 2010-10-10 01:34:47 +0000 (Sun, 10 Oct 2010)
New Revision: 23546

Modified:
   website/trunk/about/en/corepeople.wml
   website/trunk/about/en/gsoc.wml
   website/trunk/about/en/overview.wml
   website/trunk/about/en/torusers.wml
   website/trunk/docs/en/N900.wml
   website/trunk/docs/en/android.wml
   website/trunk/docs/en/bridges.wml
   website/trunk/docs/en/debian-vidalia.wml
   website/trunk/docs/en/debian.wml
   website/trunk/docs/en/faq-abuse.wml
   website/trunk/docs/en/faq.wml
   website/trunk/docs/en/hidden-services.wml
   website/trunk/docs/en/installguide.wml
   website/trunk/docs/en/rpms.wml
   website/trunk/docs/en/running-a-mirror.wml
   website/trunk/docs/en/tor-doc-osx.wml
   website/trunk/docs/en/tor-doc-relay.wml
   website/trunk/docs/en/tor-doc-unix.wml
   website/trunk/docs/en/tor-doc-web.wml
   website/trunk/docs/en/tor-doc-windows.wml
   website/trunk/docs/en/tor-hidden-service.wml
   website/trunk/docs/en/trademark-faq.wml
   website/trunk/docs/en/verifying-signatures.wml
   website/trunk/donate/en/donate.wml
   website/trunk/download/en/download-unix.wml
   website/trunk/download/en/download.wml
   website/trunk/download/en/easy-download.wml
   website/trunk/download/en/thankyou.wml
   website/trunk/eff/en/tor-dmca-response.wml
   website/trunk/eff/en/tor-legal-faq.wml
   website/trunk/en/index.wml
   website/trunk/getinvolved/en/mirrors.wml
   website/trunk/getinvolved/en/open-positions.wml
   website/trunk/getinvolved/en/translation-overview.wml
   website/trunk/getinvolved/en/translation.wml
   website/trunk/getinvolved/en/tshirt.wml
   website/trunk/getinvolved/en/volunteer.wml
   website/trunk/press/en/press.wml
   website/trunk/projects/en/projects.wml
   website/trunk/projects/en/torbrowser-split.wml
   website/trunk/projects/en/torbrowser.wml
   website/trunk/projects/en/torvm.wml
   website/trunk/projects/en/vidalia.wml
   website/trunk/torbutton/en/index.wml
   website/trunk/torbutton/en/torbutton-faq.wml
   website/trunk/torbutton/en/torbutton-options.wml
Log:
We decided to go with HTML in favor of XHTML.

Modified: website/trunk/about/en/corepeople.wml
===================================================================
--- website/trunk/about/en/corepeople.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/about/en/corepeople.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -15,9 +15,9 @@
     </p>
 
     <address>
-    The Tor Project<br />
-    969 Main Street, Suite 206<br />
-    Walpole, MA 02081-2972 USA<br /><br />
+    The Tor Project<br>
+    969 Main Street, Suite 206<br>
+    Walpole, MA 02081-2972 USA<br><br>
     </address>
 
     <p>The organization consists of many volunteers and a few employees.

Modified: website/trunk/about/en/gsoc.wml
===================================================================
--- website/trunk/about/en/gsoc.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/about/en/gsoc.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -10,7 +10,7 @@
   </div>
   <div id="maincol"> 
     <h2>Tor: Google Summer of Code 2010</h2>
-    <hr />
+    <hr>
     
     <p>
     In the last three years, The Tor Project in collaboration with <a

Modified: website/trunk/about/en/overview.wml
===================================================================
--- website/trunk/about/en/overview.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/about/en/overview.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -25,7 +25,7 @@
     </div>
     <!-- END SIDEBAR -->
     
-    <hr />
+    <hr>
     
     <p>
     Tor is a network of virtual tunnels that allows people and groups to
@@ -134,7 +134,7 @@
     
     <a name="thesolution"></a>
     <h3><a class="anchor" href="#thesolution">The solution: a distributed, anonymous network</a></h3>
-    <img src="$(IMGROOT)/htw1.png" alt="How Tor works" />
+    <img src="$(IMGROOT)/htw1.png" alt="How Tor works">
     
     <p>
     Tor helps to reduce the risks of both simple and sophisticated traffic
@@ -148,7 +148,7 @@
     single point can tell where the data came from or where it's going.
     </p>
     
-    <p><img alt="Tor circuit step one" src="$(IMGROOT)/htw1.png" /></p>
+    <p><img alt="Tor circuit step one" src="$(IMGROOT)/htw1.png"></p>
     
     <p>
     To create a private network pathway with Tor, the user's software or
@@ -161,7 +161,7 @@
     that each hop can't trace these connections as they pass through.
     </p>
     
-    <p><img alt="Tor circuit step two"  src="$(IMGROOT)/htw2.png" /></p>
+    <p><img alt="Tor circuit step two"  src="$(IMGROOT)/htw2.png"></p>
     
     <p>
     Once a circuit has been established, many kinds of data can be exchanged
@@ -180,7 +180,7 @@
     ones.
     </p>
     
-    <p><img alt="Tor circuit step three" src="$(IMGROOT)/htw3.png" /></p>
+    <p><img alt="Tor circuit step three" src="$(IMGROOT)/htw3.png"></p>
     
     
     <a name="hiddenservices"></a>

Modified: website/trunk/about/en/torusers.wml
===================================================================
--- website/trunk/about/en/torusers.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/about/en/torusers.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
   <div id="maincol">
 
     <h1>Inception</h1>
-    <hr />
+    <hr>
     <p>
     Tor was originally designed, implemented, and deployed as a
     third-generation <a href="http://www.onion-router.net/";>onion routing
@@ -26,9 +26,9 @@
     </p>
     
     <a name="normalusers"></a>
-    <img src="$(IMGROOT)/family.jpg" alt="Normal People" />
+    <img src="$(IMGROOT)/family.jpg" alt="Normal People">
     <h2><a class="anchor" href="#normalusers">Normal people use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li><strong>They protect their privacy from unscrupulous marketers and identity thieves.</strong>
     Internet Service Providers (ISPs) <a href="http://seekingalpha.com/article/29449-compete-ceo-isps-sell-clickstreams-for-5-a-month";>
@@ -58,9 +58,9 @@
     </ul>
     
     <a name="military"></a>
-    <img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement" />
+    <img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement">
     <h2><a class="anchor" href="#military">Militaries use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     
     <li>
@@ -86,9 +86,9 @@
     </ul>
     
     <a name="journalist"></a>
-    <img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media" />
+    <img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media">
     <h2><a class="anchor" href="#journalist">Journalists and their audience use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li><strong><a href="http://www.rsf.org/";>Reporters without Borders</a></strong>
     tracks Internet prisoners of conscience and jailed or harmed journalists all over the world. They advise
@@ -113,7 +113,7 @@
     
     <a name="lawenforcement"></a>
     <h2><a class="anchor" href="#lawenforcement">Law enforcement officers use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li><strong>Online surveillance:</strong>
     Tor allows officials to surf questionable web sites and services
@@ -138,9 +138,9 @@
     </ul>
     
     <a name="activists"></a>
-    <img src="$(IMGROOT)/activists.jpg" alt="Activists &amp; Whistleblowers" />
+    <img src="$(IMGROOT)/activists.jpg" alt="Activists &amp; Whistleblowers">
     <h2><a class="anchor" href="#activists">Activists &amp; Whistleblowers use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li><strong>Human rights activists use Tor to anonymously report abuses from
     danger zones.</strong>  Internationally, labor rights workers use Tor and other
@@ -207,7 +207,7 @@
     
     <a name="spotlight"></a>
     <h2><a class="anchor" href="#spotlight">High &amp; low profile people use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li>Does being in the public spotlight shut you off from having a private
     life, forever, online?  A rural lawyer in a New England state keeps
@@ -237,9 +237,9 @@
     </ul>
     
     <a name="executives"></a>
-    <img src="$(IMGROOT)/consumers.jpg" alt="Businesses" />
+    <img src="$(IMGROOT)/consumers.jpg" alt="Businesses">
     <h2><a class="anchor" href="#executives">Business executives use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li><strong>Security breach information clearinghouses:</strong>
     Say a financial institution participates in a security clearinghouse
@@ -276,7 +276,7 @@
     
     <a name="bloggers"></a>
     <h2><a class="anchor" href="#bloggers">Bloggers use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li>Frequently we hear about bloggers who are
     <a href="http://online.wsj.com/public/article/SB112541909221726743-Kl4kLxv0wSbjqrkXg_DieY3c8lg_20050930.html";>sued</a> or
@@ -288,7 +288,7 @@
     
     <a name="itprofessionals"></a>
     <h2><a class="anchor" href="#itprofessionals">IT Professionals use Tor</a></h2>
-    <hr />
+    <hr>
     <ul>
     <li>To verify IP based firewall rules: A firewall may have some policies that only allow certain IP addresses or ranges. Tor can be used to verify those configurations by using an IP number outside of the company's alloted IP block.</li>
     <li>To bypass their own security systems for sensitive professional activities: For instance, a company may have a strict policy regarding the material employees can view on the internet. A log review reveals a possible violation. Tor can be used to verify the information without an exception being put into corporate security systems.</li>

Modified: website/trunk/docs/en/N900.wml
===================================================================
--- website/trunk/docs/en/N900.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/N900.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
   <div id="maincol"> 
     <a id="Maemo"></a>
     <h2><a class="anchor" href="#Maemo">Installing Tor on Maemo</a></h2>
-    <br />
+    <br>
     <p>
     If you have a Maemo device that is not the <a href="#N900">N900</a>, we
     suggest you install the Tor package from the
@@ -23,7 +23,7 @@
     
     <a id="N900"></a>
     <h2><a class="anchor" href="#N900">Installing Tor on the N900</a></h2>
-    <br />
+    <br>
     <p>
     The following instructions should help install an
     <a href="https://garage.maemo.org/projects/tor-status";>experimental
@@ -34,7 +34,7 @@
     </p>
     
     <p>
-    Open the Application manager: <br />
+    Open the Application manager: <br>
     <a href="$(IMGROOT)/N900/1_app_menu.png">
     <img border="0" alt="N900 application menu"
     src="$(IMGROOT)/N900/1_app_menu-small.png"/>
@@ -42,7 +42,7 @@
     </p>
     
     <p>
-    Click on the Application manager menu at the top of the screen: <br />
+    Click on the Application manager menu at the top of the screen: <br>
     <a href="$(IMGROOT)/N900/2_app_manager.png">
     <img border="0" alt="N900 application manager"
     src="$(IMGROOT)/N900/2_app_manager-small.png"/>
@@ -50,7 +50,7 @@
     </p>
     
     <p>
-    Select 'Application catalogs': <br />
+    Select 'Application catalogs': <br>
     <a href="$(IMGROOT)/N900/3_app_managermenu.png">
     <img border="0" alt="N900 application catalogs"
     src="$(IMGROOT)/N900/3_app_managermenu-small.png"/>
@@ -58,13 +58,13 @@
     </p>
     
     <p>
-    Press 'New' to enable the maemo extras-devel repository. <br />
+    Press 'New' to enable the maemo extras-devel repository. <br>
     <small>Note: This repository contains untested packages that might harm your
-    device. <br />
+    device. <br>
     See <a href="http://wiki.maemo.org/Extras-devel";>Extras-devel</a> for
     details. You should probably disable extras-devel after installing Tor, or
     proceed at your own risk.</small>
-    <br />
+    <br>
     <a href="$(IMGROOT)/N900/4_catalog_list.png">
     <img border="0" alt="N900 catalog list"
     src="$(IMGROOT)/N900/4_catalog_list-small.png"/>
@@ -81,9 +81,9 @@
     Components:    free non-free
     </pre>
     </p>
-    <br />
+    <br>
     Make sure 'Disabled' is unchecked, hit 'Save', and wait for the package list
-    to update.<br />
+    to update.<br>
     <a href="$(IMGROOT)/N900/5_new_catalog.png">
     <img border="0" alt="N900 new catalog"
     src="$(IMGROOT)/N900/5_new_catalog-small.png"/>
@@ -91,7 +91,7 @@
     </p>
     
     <p>
-    Press 'Download' in the App manager: <br />
+    Press 'Download' in the App manager: <br>
     <a href="$(IMGROOT)/N900/6_app_manager.png">
     <img border="0" alt="N900 app manager"
     src="$(IMGROOT)/N900/6_app_manager-small.png"/>
@@ -99,7 +99,7 @@
     </p>
     
     <p>
-    Select the Network category (or search for Tor): <br />
+    Select the Network category (or search for Tor): <br>
     <a href="$(IMGROOT)/N900/7_app_categories.png">
     <img border="0" alt="N900 application categories"
     src="$(IMGROOT)/N900/7_app_categories-small.png"/>
@@ -107,7 +107,7 @@
     </p>
     
     <p>
-    Scroll down and select 'Tor Status Area Applet': <br />
+    Scroll down and select 'Tor Status Area Applet': <br>
     <a href="$(IMGROOT)/N900/8_app_list.png">
     <img border="0" alt="N900 application list"
     src="$(IMGROOT)/N900/8_app_list-small.png"/>
@@ -115,7 +115,7 @@
     </p>
     
     <p>
-    Agree to the disclaimer and press 'Continue': <br />
+    Agree to the disclaimer and press 'Continue': <br>
     <a href="$(IMGROOT)/N900/9_disclaimer.png">
     <img border="0" alt="N900 disclaimer"
     src="$(IMGROOT)/N900/9_disclaimer-small.png"/>
@@ -124,7 +124,7 @@
     
     <p>
     When the install is done, disable the extras-devel repository, and reboot
-    the device: <br />
+    the device: <br>
     <a href="$(IMGROOT)/N900/10_success.png">
     <img border="0" alt="N900 success"
     src="$(IMGROOT)/N900/10_success-small.png"/>
@@ -132,7 +132,7 @@
     </p>
     
     <p>
-    After rebooting the N900, open the status menu: <br />
+    After rebooting the N900, open the status menu: <br>
     <a href="$(IMGROOT)/N900/11_after_rebooting.png">
     <img border="0" alt="N900 status menu post-reboot" 
     src="$(IMGROOT)/N900/11_after_rebooting-small.png"/>
@@ -140,7 +140,7 @@
     </p>
     
     <p>
-    Select 'The Onion Router' from the list: <br />
+    Select 'The Onion Router' from the list: <br>
     <a href="$(IMGROOT)/N900/12_status_menu.png">
     <img border="0" alt="N900 status menu selection"
     src="$(IMGROOT)/N900/12_status_menu-small.png"/>
@@ -148,7 +148,7 @@
     </p>
     
     <p>
-    Enable onion routing, and press 'Save': <br />
+    Enable onion routing, and press 'Save': <br>
     <a href="$(IMGROOT)/N900/13_enable_tor.png">
     <img border="0" alt="N900 enabling Tor"
     src="$(IMGROOT)/N900/13_enable_tor-small.png"/>
@@ -157,7 +157,7 @@
     
     <p>
     Visit <a href="https://check.torproject.org/";>TorCheck</a> to confirm that
-    you are routing browser traffic through Tor: <br />
+    you are routing browser traffic through Tor: <br>
     <a href="$(IMGROOT)/N900/14_check_tor.png">
     <img border="0" alt="N900 check Tor"
     src="$(IMGROOT)/N900/14_check_tor-small.png"/>
@@ -171,7 +171,7 @@
     web browser anonymity requirements.
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/android.wml
===================================================================
--- website/trunk/docs/en/android.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/android.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol">
     <h2><a class="anchor" href="#Android">Tor on Android</a></h2>
-    <br />
+    <br>
     <p>
     Tor is available for Android by installing our package named Orbot.
     </p>
@@ -30,7 +30,7 @@
     
     <a id="QrCode"></a>
     <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2>
-    <br />
+    <br>
     <p>
     Orbot is easy to install by simply scanning the following QR code with your
     Android Barcode scanner.
@@ -45,7 +45,7 @@
     
     <a id="Market"></a>
     <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>
-    <br />
+    <br>
     <p>
     Orbot is not currently in the Android Market. It will be available in the
     market in the very near future.
@@ -53,14 +53,14 @@
     
     <a id="Manual"></a>
     <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>
-    <br />
+    <br>
     <p>
     You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha-sig>">the gpg signature</a> from our server.
     </p>
     
     <a id="Screenshots"></a>
     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>
-    <br />
+    <br>
     <p>
     <a href="$(IMGROOT)/android/android-off.jpg">
     <img border="0" alt="Android Tor off"
@@ -83,7 +83,7 @@
     <a id="ProxySettings"></a>
     <h2><a class="anchor" href="#ProxySettings">Proxy settings and configuration
     </a></h2>
-    <br />
+    <br>
     <p>
     Orbot offers three interfaces into the Tor network:
     <ul>
@@ -95,12 +95,12 @@
     
     <a id="Notes"></a>
     <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>
-    <br />
+    <br>
     <p>
     The current version of Orbot ships with the following components:
     <b><version-android-components></b>
     </p>
-    <br />
+    <br>
     <p>
     For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):
     <ul>
@@ -126,7 +126,7 @@
     
     <a id="Source"></a>
     <h2><a class="anchor" href="#Source">Source code access</a></h2>
-    <br />
+    <br>
     <p>
     All of the source code is available in the
     <a href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/";>Orbot
@@ -140,7 +140,7 @@
     web browser anonymity requirements.
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/bridges.wml
===================================================================
--- website/trunk/docs/en/bridges.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/bridges.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
   <div id="maincol"> 
     <a id="BridgeIntroduction"></a>
     <h2><a class="anchor" href="#BridgeIntroduction">Tor: Bridges</a></h2>
-    <hr />
+    <hr>
     
     <p>
     Bridge relays (or "bridges" for short) are Tor relays that aren't listed in
@@ -76,7 +76,7 @@
     
     <a id="Understanding"></a>
     <h2><a class="anchor" href="#Understanding">Understanding bridges</a></h2>
-    <hr />
+    <hr>
     
     <p>
     As an example, you'll get a bridge entry that looks like the
@@ -89,17 +89,17 @@
     
     <p>
     Understanding the components of a bridge line isn't strictly required
-    but may prove useful. You can skip this section if you'd like.<br />
-    The first element is the IP address: <tt>'141.201.27.48'</tt><br />
-    The second element is the port: <tt>'443'</tt><br />
+    but may prove useful. You can skip this section if you'd like.<br>
+    The first element is the IP address: <tt>'141.201.27.48'</tt><br>
+    The second element is the port: <tt>'443'</tt><br>
     The third element, the fingerprint, is optional:
-    <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />
+    <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br>
     </p>
     
     <a id="UsingBridges"></a>
     <h2><a class="anchor" href="#UsingBridges">Using bridges with Tor and
     Vidalia</a></h2>
-    <hr />
+    <hr>
     
     <p>
     To use the example bridge address above, go to Vidalia's Network settings
@@ -109,9 +109,9 @@
     sign. Adding a bridge is pictured below:
     </p>
     
-    <br /><br />
-    <img src="$(IMGROOT)/vidalia-bridges.png" alt="Vidalia's Network settings page" />
-    <br /><br />
+    <br><br>
+    <img src="$(IMGROOT)/vidalia-bridges.png" alt="Vidalia's Network settings page">
+    <br><br>
     
     <p>
     You'll want to add as many bridge addresses as you know about, since
@@ -122,7 +122,7 @@
     
     <a id="FindingMore"></a>
     <h2><a class="anchor" href="#FindingMore">Finding more bridges for Tor</a></h2>
-    <hr />
+    <hr>
     
     <p>
     Another way to find public bridge addresses is to send mail to
@@ -146,7 +146,7 @@
     
     <a id="RunningABridge"></a>
     <h2><a class="anchor" href="#RunningABridge">Running a Tor Bridge</a></h2>
-    <hr />
+    <hr>
     
     <p>
     If you want to help out and you can't run a <a href="<page
@@ -155,16 +155,16 @@
     <ul>
     <li> manually <a
     href="<wikifaq>#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit
-    your torrc file</a> to be just these four lines:<br />
+    your torrc file</a> to be just these four lines:<br>
     <pre><code>
     SocksPort 0
     ORPort 443
     BridgeRelay 1
     Exitpolicy reject *:*
     </code></pre></li>
-    <li><a href="<page docs/tor-doc-relay>">or using Vidalia</a>:<br />
+    <li><a href="<page docs/tor-doc-relay>">or using Vidalia</a>:<br>
     <img src="$(IMGROOT)/vidalia-bridges-setup.png" alt="Vidalia's Sharing
-    settings page" /></li>
+    settings page"></li>
     </ul>
     </p>
     

Modified: website/trunk/docs/en/debian-vidalia.wml
===================================================================
--- website/trunk/docs/en/debian-vidalia.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/debian-vidalia.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
     <a id="debian"></a>
     <a id="packages"></a>
     <h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
-    <br />
+    <br>
     
     <p>
     <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
@@ -28,7 +28,7 @@
     8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
     Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
     <tt>/etc/apt/sources.list</tt>
-    file:<br />
+    file:<br>
     <pre>
     deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
     </pre>
@@ -66,11 +66,11 @@
     <code>vidalia.mirror.youam.de</code>.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="source"></a>
     <h2><a class="anchor" href="#source">Building from source</a></h2>
-    <br />
+    <br>
     
     <p>
     If you want to build your own debs from source you must first add an
@@ -104,7 +104,7 @@
     instructions.
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/debian.wml
===================================================================
--- website/trunk/docs/en/debian.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/debian.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,11 +13,11 @@
     <a id="debian"></a>
     <h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny,
     Debian sid, or Debian testing</a></h2>
-    <br />
+    <br>
     
     <p>
     If you're using Debian stable (lenny), unstable (sid), or testing
-    (squeeze), just run<br />
+    (squeeze), just run<br>
     <tt>apt-get install tor tor-geoipdb</tt>
     as root.
     </p>
@@ -34,13 +34,13 @@
     instructions.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="ubuntu"></a>
     <a id="packages"></a>
     <h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
     Debian</a></h2>
-    <br />
+    <br>
     
     <p>
     <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
@@ -55,7 +55,7 @@
     8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
     Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
     <tt>/etc/apt/sources.list</tt>
-    file:<br />
+    file:<br>
     <pre>
     deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
     </pre>
@@ -93,17 +93,17 @@
     <code>tor.mirror.youam.de</code>.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="development"></a>
     <h2><a class="anchor" href="#development">Option three: Using the
     development branch of Tor on Debian or Ubuntu</a></h2>
-    <br />
+    <br>
     
     <p>If you want to use the <a href="<page
     download/download>#packagediff">development branch</a> of Tor instead (more
     features and more bugs), you need to add a different set of lines to
-    your <tt>/etc/apt/sources.list</tt> file:<br />
+    your <tt>/etc/apt/sources.list</tt> file:<br>
     <pre>
     deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
     deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
@@ -128,11 +128,11 @@
     instructions.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="source"></a>
     <h2><a class="anchor" href="#source">Building from source</a></h2>
-    <br />
+    <br>
     
     <p>
     If you want to build your own debs from source you must first add an
@@ -171,7 +171,7 @@
     instructions.
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/faq-abuse.wml
===================================================================
--- website/trunk/docs/en/faq-abuse.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/faq-abuse.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -30,7 +30,7 @@
     #</ul>
     #</div>
     #<!-- END SIDEBAR -->
-    #<hr />
+    #<hr>
     
     <a id="WhatAboutCriminals"></a>
     <h3><a class="anchor" href="#WhatAboutCriminals">Doesn't Tor enable criminals to do bad things?</a></h3>

Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/faq.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
   <div id="maincol">
     <!-- PUT CONTENT AFTER THIS TAG -->
     <h1>Tor FAQ</h1>
-    <hr />
+    <hr>
     
     <p>General questions:</p>
     <ul>
@@ -83,7 +83,7 @@
     <p>For other questions not yet on this version of the FAQ, see the <a
     href="<wikifaq>">wiki FAQ</a> for now.</p>
     
-    <hr />
+    <hr>
     
     <a id="General"></a>
     
@@ -110,7 +110,7 @@
     and develops the Tor software.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="Torisdifferent"></a>
     <h3><a class="anchor" href="#Torisdifferent">How is Tor different from other proxies?</a></h3>
@@ -129,7 +129,7 @@
     </dl>
     </p>
     
-    <hr />
+    <hr>
     
     <a id="CompatibleApplications"></a>
     <h3><a class="anchor" href="#CompatibleApplications">What programs can
@@ -170,7 +170,7 @@
     Please add to these lists and help us keep them accurate!
     </p>
     
-    <hr />
+    <hr>
     
     <a id="WhyCalledTor"></a>
     <h3><a class="anchor" href="#WhyCalledTor">Why is it called Tor?</a></h3>
@@ -197,7 +197,7 @@
     spell it wrong.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="Backdoor"></a>
     <h3><a class="anchor" href="#Backdoor">Is there a backdoor in Tor?</a></h3>
@@ -235,7 +235,7 @@
     sure you keep your Tor versions up-to-date.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="DistributingTor"></a>
     <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor on
@@ -289,7 +289,7 @@
     is a fact of life for all security software under heavy development.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="SupportMail"></a>
     <h3><a class="anchor" href="#SupportMail">How can I get an answer to my
@@ -334,7 +334,7 @@
     mailing list and answer questions from others.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="WhySlow"></a>
     <h3><a class="anchor" href="#WhySlow">Why is Tor so slow?</a></h3>
@@ -431,7 +431,7 @@
     
     </ul>
     
-    <hr />
+    <hr>
     
     <a id="Funding"></a>
     <h3><a class="anchor" href="#Funding">What would The Tor Project do with
@@ -527,7 +527,7 @@
     director for information on making grants or major donations.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="HowUninstallTor"></a>
     <h3><a class="anchor" href="#HowUninstallTor">How do I uninstall Tor?</a></h3>
@@ -568,7 +568,7 @@
     be pretty easy to notice things there.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="PGPSigs"></a>
     <h3><a class="anchor" href="#PGPSigs">What are these "sig" files on the
@@ -584,7 +584,7 @@
     href="<page docs/verifying-signatures>">verifying signatures</a> page for details.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="CompileTorWindows"></a>
     <h3><a class="anchor" href="#CompileTorWindows">How do I compile Tor under
@@ -601,7 +601,7 @@
     download/download>">download page</a>.)
     </p>
     
-    <hr />
+    <hr>
     
     <a id="VirusFalsePositives"></a>
     <h3><a class="anchor" href="#VirusFalsePositives">Why does my Tor
@@ -621,7 +621,7 @@
     href="#CompileTorWindows">recompile it yourself</a>.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="LiveCD"></a>
     <h3><a class="anchor" href="#LiveCD">Is there a LiveCD or other bundle that
@@ -713,7 +713,7 @@
     Please contact us if you know any others.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="ChooseEntryExit"></a>
     <h3><a class="anchor" href="#ChooseEntryExit">Can I control which nodes (or country) are used for entry/exit?</a></h3>
@@ -770,7 +770,7 @@
     See the manual page for details.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="RelayFlexible"></a>
     <h3><a class="anchor" href="#RelayFlexible">How stable does my relay
@@ -814,7 +814,7 @@
     </li>
     </ul>
     
-    <hr />
+    <hr>
     
     <a id="RunARelayBut"></a>
     <a id="ExitPolicies"></a>
@@ -862,7 +862,7 @@
     will be impacted too.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="RelayOrBridge"></a>
     <h3><a class="anchor" href="#RelayOrBridge">Should I be a normal relay
@@ -896,7 +896,7 @@
     a little bit of bandwidth, then flip a coin. Thanks for volunteering!
     </p>
     
-    <hr />
+    <hr>
     
     <a id="RelayMemory"></a>
     <h3><a class="anchor" href="#RelayMemory">Why is my Tor relay using so
@@ -942,13 +942,13 @@
     for a fast exit relay to use 500-1000 MB of memory.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="WhyNotNamed"></a>
     <h3><a class="anchor" href="#WhyNotNamed">Why is my Tor relay not named?</a></h3>
     
     <p>
-    We currently use these metrics to determine if your relay should be named:<br />
+    We currently use these metrics to determine if your relay should be named:<br>
     </p>
     <ul>
     <li>The name is not currently mapped to a different key. Existing mappings
@@ -957,7 +957,7 @@
     <li>No other router may have wanted the same name in the past month.</li>
     </ul>
     
-    <hr />
+    <hr>
     
     <a id="KeyManagement"></a>
     <h3><a class="anchor" href="#KeyManagement">Tell me about all the keys
@@ -1028,7 +1028,7 @@
     and start meeting people.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="EverybodyARelay"></a>
     <h3><a class="anchor" href="#EverybodyARelay">You should make every Tor
@@ -1115,7 +1115,7 @@
     Please help on all of these!
     </p>
     
-    <hr />
+    <hr>
     
     <a id="Criminals"></a>
     <h3><a class="anchor" href="#Criminals">Doesn't Tor enable criminals to do bad
@@ -1126,7 +1126,7 @@
     href="<page docs/faq-abuse>">Tor Abuse FAQ</a>.
     </p>
     
-    <hr />
+    <hr>
     
     <a id="RespondISP"></a>
     <h3><a class="anchor" href="#RespondISP">How do I respond to my ISP about my
@@ -1138,7 +1138,7 @@
     here</a>.
     </p>
     
-    <hr />
+    <hr>
   </div>
   <!-- END MAINCOL -->
   <div id = "sidecol">

Modified: website/trunk/docs/en/hidden-services.wml
===================================================================
--- website/trunk/docs/en/hidden-services.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/hidden-services.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol"> 
     <h2>Tor: Hidden Service Protocol</h2>
-    <hr />
+    <hr>
     
     <p>
     Tor makes it possible for users to hide their locations while offering
@@ -37,7 +37,7 @@
     hidden server's location (IP address).
     </p>
     
-    <img alt="Tor hidden service step one" src="$(IMGROOT)/THS-1.png" />
+    <img alt="Tor hidden service step one" src="$(IMGROOT)/THS-1.png">
     # maybe add a speech bubble containing "PK" to Bob, because that's what
     # Bob tells to his introduction points
     
@@ -63,7 +63,7 @@
     design for hidden service names?
     </p>
     
-    <img alt="Tor hidden service step two" src="$(IMGROOT)/THS-2.png" />
+    <img alt="Tor hidden service step two" src="$(IMGROOT)/THS-2.png">
     # maybe replace "database" with "DHT"; further: how incorrect
     # is it to *not* add DB to the Tor cloud, now that begin dir cells are in
     # use?
@@ -82,7 +82,7 @@
     <em>rendezvous point</em> by telling it a one-time secret.
     </p>
     
-    <img alt="Tor hidden service step three" src="$(IMGROOT)/THS-3.png" />
+    <img alt="Tor hidden service step three" src="$(IMGROOT)/THS-3.png">
     # maybe add "cookie" to speech bubble, separated from the surrounded
     # "IP1-3" and "PK"
     
@@ -97,7 +97,7 @@
     address, so the client remains anonymous.
     </p>
     
-    <img alt="Tor hidden service step four" src="$(IMGROOT)/THS-4.png" />
+    <img alt="Tor hidden service step four" src="$(IMGROOT)/THS-4.png">
     
     <p>
     Step five: The hidden service decrypts the client's introduce message
@@ -120,7 +120,7 @@
     Servers</a>.
     </p>
     
-    <img alt="Tor hidden service step five" src="$(IMGROOT)/THS-5.png" />
+    <img alt="Tor hidden service step five" src="$(IMGROOT)/THS-5.png">
     # it should say "Bob connects to Alice's ..."
     
     <p>
@@ -145,7 +145,7 @@
     service.
     </p>
     
-    <img alt="Tor hidden service step six" src="$(IMGROOT)/THS-6.png" />
+    <img alt="Tor hidden service step six" src="$(IMGROOT)/THS-6.png">
     
     <p>
     There are more detailed descriptions about the hidden service protocol than

Modified: website/trunk/docs/en/installguide.wml
===================================================================
--- website/trunk/docs/en/installguide.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/installguide.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div> 
   <div id="maincol">
     <h1>Tor Installation guides</h1>
-    <br />
+    <br>
 
   </div>
   <!-- END MAINCOL -->

Modified: website/trunk/docs/en/rpms.wml
===================================================================
--- website/trunk/docs/en/rpms.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/rpms.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
     <a id="rpms"></a>
     <h2><a class="anchor" href="#rpms">Tor packages for rpm-based
     linux distributions.</a></h2>
-    <br />
+    <br>
     
     <p>Do not use the packages in the native repositories. They are
     frequently out of date. That means you'll be missing stability and
@@ -57,20 +57,20 @@
     <code>tor.mirror.youam.de</code>.
     </p>
     
-    <hr />
+    <hr>
     
-    <hr />
+    <hr>
     
     <a id="source"></a>
     <h2><a class="anchor" href="#source">Building from source</a></h2>
-    <br />
+    <br>
     
     <p>
     If you'd like to build from source, please follow the <a
     href="<gitblob>doc/tor-rpm-creation.txt">rpm creation instructions</a>.
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/running-a-mirror.wml
===================================================================
--- website/trunk/docs/en/running-a-mirror.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/running-a-mirror.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div> 
   <div id="maincol"> 
     <h1>Tor: Running a Mirror</h1>
-    <hr />
+    <hr>
     
     <p>Thank you for wanting to mirror the Tor website.  All of
     our mirrors are publicly listed on <a href="<page getinvolved/mirrors>">our mirrors
@@ -23,7 +23,7 @@
     <p>
     If you would like to run a mirror, it's as easy as this command to download
     everything a mirror should share with the world:
-    <br /> <br />
+    <br> <br>
     <tt>
     rsync -av --delete rsync://rsync.torproject.org/tor tor-mirror/
     </tt>
@@ -50,7 +50,7 @@
     assistance in setting up your mirror may be found here as well.<br/><br/>
     
     </p>
-    <br /><br />
+    <br><br>
     <p>
     An example cronjob to update a full mirror once every 6 hours may look like so:
     <tt>

Modified: website/trunk/docs/en/tor-doc-osx.wml
===================================================================
--- website/trunk/docs/en/tor-doc-osx.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-doc-osx.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div> 
   <div id="maincol">
     <h1>Running the <a href="<page index>">Tor</a> client on Mac OS X</h1>
-    <br />
+    <br>
     
     <p>
     <b>Note that these are the installation instructions for running a Tor client on
@@ -20,10 +20,10 @@
       href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>
     </p>
     
-    <hr />
+    <hr>
     <a id="installing"></a>
     <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
-    <br />
+    <br>
     
     <p>
     The install for Macintosh OS X bundles
@@ -66,10 +66,10 @@
     configuration for Tor has been installed as part of the installer package.
     </p>
     
-    <hr />
+    <hr>
     <a id="using"></a>
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
-    <br />
+    <br>
     
     <p>After installing, you need to configure your
     applications to use them. The first step is to set up web browsing.</p>
@@ -103,10 +103,10 @@
     HOWTO</a>.
     </p>
     
-    <hr />
+    <hr>
     <a id="verify"></a>
     <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>
-    <br />
+    <br>
     
     <p>
     Next, you should try using your browser with Tor and make
@@ -137,11 +137,11 @@
     <a href="<page download/download>#Warning">what Tor does and does not offer</a>.
     </p>
     
-    <hr />
+    <hr>
     <a id="server"></a>
     <a id="relay"></a>
     <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>
-    <br />
+    <br>
     
     <p>The Tor network relies on volunteers to donate bandwidth. The more
     people who run relays, the faster the Tor network will be. If you have
@@ -161,10 +161,10 @@
     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
     guide.</p>
     
-    <hr />
+    <hr>
     <a id="uninstall"></a>
     <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>
-    <br />
+    <br>
     
     <p>There are two ways to uninstall the bundle from your computer, using
     Finder or a command line or Terminal-based uninstaller.  If you want to remove Tor on OSX, here's how:</p>
@@ -194,7 +194,7 @@
     <li>~/.tor</li>
     </ul>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/en/tor-doc-relay.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-doc-relay.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
 
     <h1>Configuring a Tor relay</h1>
     
-    <hr />
+    <hr>
     
     <p>
     The Tor network relies on volunteers to donate bandwidth. The more
@@ -30,11 +30,11 @@
     or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later.
     </p>
     
-    <hr />
+    <hr>
     <a id="zero"></a>
     <a id="install"></a>
     <h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2>
-    <br />
+    <br>
     
     <p>Before you start, you need to make sure that Tor is up and running.
     </p>
@@ -46,10 +46,10 @@
     <p>If it's convenient, you might also want to use it as a client for a
     while to make sure it's actually working.</p>
     
-    <hr />
+    <hr>
     <a id="setup"></a>
     <h2><a class="anchor" href="#setup">Step Two: Set it up as a relay</a></h2>
-    <br />
+    <br>
     <ol>
     <li>Verify that your clock and timezone are set
     correctly. If possible, synchronize your clock with public <a
@@ -96,7 +96,7 @@
     that the relay is working correctly.</li>
     </ol>
     
-    <br />
+    <br>
     <strong>Manual Configuration</strong>:
     <ul>
     <li>Edit the bottom part of <a href="<wikifaq>#torrc">your torrc file</a>. If you want to be a public relay (recommended),
@@ -132,10 +132,10 @@
     
     </ol>
     
-    <hr />
+    <hr>
     <a id="check"></a>
     <h2><a class="anchor" href="#check">Step Three: Make sure it is working</a></h2>
-    <br />
+    <br>
     
     <p>As soon as your relay manages to connect to the network, it will
     try to determine whether the ports you configured are reachable from
@@ -158,10 +158,10 @@
     there. You may need to wait up to one hour to give enough time for it to
     make a fresh directory.</p>
     
-    <hr />
+    <hr>
     <a id="after"></a>
     <h2><a class="anchor" href="#after">Step Four: Once it is working</a></h2>
-    <br />
+    <br>
     
     <p>
     We recommend the following steps as well:
@@ -271,7 +271,7 @@
     for helping to make the Tor network grow!
     </p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/en/tor-doc-unix.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-doc-unix.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div> 
   <div id="maincol"> 
     <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>
-    <br />
+    <br>
     
     <p>
     <b>Note that these are the installation instructions for running a Tor
@@ -20,10 +20,10 @@
     href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>
     </p>
     
-    <hr />
+    <hr>
     <a id="installing"></a>
     <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
-    <br />
+    <br>
     
     <p>
     The latest release of Tor can be found on the <a
@@ -36,9 +36,9 @@
     <p>If you're building from source, first install <a
     href="http://www.monkey.org/~provos/libevent/";>libevent</a>, and
     make sure you have openssl and zlib (including the -devel packages if
-    applicable). Then run:<br />
-    <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br />
-    <tt>./configure &amp;&amp; make</tt><br />
+    applicable). Then run:<br>
+    <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br>
+    <tt>./configure &amp;&amp; make</tt><br>
     Now you can run tor as <tt>src/or/tor</tt>, or you can run <tt>make install</tt>
     (as root if necessary) to install it into /usr/local/, and then you can
     start it just by running <tt>tor</tt>.
@@ -49,11 +49,11 @@
     the settings. Tor is now installed.
     </p>
     
-    <hr />
+    <hr>
     <a id="privoxy"></a>
     <a id="polipo"></a>
     <h2><a class="anchor" href="#polipo">Step Two: Install Polipo for Web Browsing</a></h2>
-    <br />
+    <br>
     
     <p>After installing Tor, you need to configure your applications to use it.
     </p>
@@ -75,7 +75,7 @@
     configuration for Tor</a> and put it in place of your current polipo
     config file (e.g. /etc/polipo/config or ~/.polipo).
     You'll need to restart Polipo for the changes to take effect. For
-    example:<br />
+    example:<br>
     <tt>/etc/init.d/polipo restart</tt>
     </p>
     
@@ -84,10 +84,10 @@
     sample Privoxy configuration</a>. But since the config files both use
     port 8118, you shouldn't run both Polipo and Privoxy at the same time.</p>
     
-    <hr />
+    <hr>
     <a id="using"></a>
     <h2><a class="anchor" href="#using">Step Three: Configure your applications to use Tor</a></h2>
-    <br />
+    <br>
     
     <p>After installing Tor and Polipo, you need to configure your
     applications to use them. The first step is to set up web browsing.</p>
@@ -102,7 +102,7 @@
     src="$(IMGROOT)/screenshot-torbutton.png"
     border="1">
     
-    <br />
+    <br>
     
     <p>
     If you plan to run Firefox on a different computer than Tor, see the <a
@@ -127,10 +127,10 @@
     HOWTO</a>.
     </p>
     
-    <hr />
+    <hr>
     <a id="verify"></a>
     <h2><a class="anchor" href="#verify">Step Four: Make sure it's working</a></h2>
-    <br />
+    <br>
     
     <p>
     Next, you should try using your browser with Tor and make
@@ -164,11 +164,11 @@
     href="<wikifaq>#ItDoesntWork">this
     FAQ entry</a> for hints.</p>
     
-    <hr />
+    <hr>
     <a id="server"></a>
     <a id="relay"></a>
     <h2><a class="anchor" href="#relay">Step Five: Configure it as a relay</a></h2>
-    <br />
+    <br>
     
     <p>The Tor network relies on volunteers to donate bandwidth. The more
     people who run relays, the faster the Tor network will be. If you have
@@ -188,7 +188,7 @@
     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
     guide.</p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/tor-doc-web.wml
===================================================================
--- website/trunk/docs/en/tor-doc-web.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-doc-web.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol">
     <h1>Configuring your browser to use <a href="<page index>">Tor</a></h1>
-    <br />
+    <br>
     
     <p>If you're using Firefox (we recommend it), you don't need this page.
     Simply install the <a
@@ -23,7 +23,7 @@
     src="$(IMGROOT)/screenshot-torbutton.png"
     border="1"/>
     
-    <br />
+    <br>
     
     <p>Otherwise, you need to manually configure your browser's proxy
     settings.
@@ -38,7 +38,7 @@
     Server - Advanced.</p>
     
     <img alt="Proxy settings in Firefox"
-    src="$(IMGROOT)/screenshot-win32-firefox-proxies.jpg" />
+    src="$(IMGROOT)/screenshot-win32-firefox-proxies.jpg">
     
     <p>
     You should fill in "localhost"
@@ -48,7 +48,7 @@
     should set them up anyway</a>.) You should also fill out the socks proxy entry to point directly to Tor ("localhost", "9050", and socks5)
     to cover protocols besides the first four. Then click "OK".</p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/en/tor-doc-windows.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-doc-windows.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div> 
   <div id="maincol"> 
     <h1>Running the <a href="<page index>">Tor</a> client on Microsoft Windows</h1>
-    <br />
+    <br>
     
     <p>
     <b>Note that these are the installation instructions for running a Tor
@@ -30,10 +30,10 @@
     <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor.ogv"; autobuffer="true" controls="controls"></video></p>
     </div>
     
-    <hr />
+    <hr>
     <a id="installing"></a>
     <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>
-    <br />
+    <br>
     
     <p>
     Microsoft Windows bundles contain <a href="<page index>">Tor</a>, <a
@@ -48,14 +48,14 @@
     download/download>">download page</a>.
     </p>
     
-    <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png" />
+    <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">
     
     <p>If you have previously installed Tor, Vidalia, or Polipo
     you can deselect whichever components you do not need to install
     in the dialog shown below.
     </p>
     
-    <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png" />
+    <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png">
     
     <p>After you have completed the installer, the components
     you selected will automatically be started for you.
@@ -66,10 +66,10 @@
     the settings. Tor is now installed.
     </p>
     
-    <hr />
+    <hr>
     <a id="using"></a>
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
-    <br />
+    <br>
     
     <p>After installing Tor and Polipo, you need to configure your
     applications to use them. The first step is to set up web browsing.</p>
@@ -82,7 +82,7 @@
     
     <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png" border="1"/>
     
-    <br />
+    <br>
     
     <p>
     If you plan to run Firefox on a different computer than Tor, see the <a
@@ -105,10 +105,10 @@
     HOWTO</a>.
     </p>
     
-    <hr />
+    <hr>
     <a id="verify"></a>
     <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>
-    <br />
+    <br>
     
     <p>
     Check to see that Vidalia is running.  Vidalia uses a small green onion
@@ -147,11 +147,11 @@
     <a href="<page download/download>#Warning">what Tor does and does not offer</a>.
     </p>
     
-    <hr />
+    <hr>
     <a id="server"></a>
     <a id="relay"></a>
     <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>
-    <br />
+    <br>
     
     <p>The Tor network relies on volunteers to donate bandwidth. The more
     people who run relays, the faster the Tor network will be. If you have
@@ -171,7 +171,7 @@
     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
     guide.</p>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/tor-hidden-service.wml
===================================================================
--- website/trunk/docs/en/tor-hidden-service.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/tor-hidden-service.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol">
     <h1>Configuring Hidden Services for <a href="<page index>">Tor</a></h1>
-    <hr />
+    <hr>
     
     <p>Tor allows clients and relays to offer hidden services. That is,
     you can offer a web server, SSH server, etc., without revealing your
@@ -29,10 +29,10 @@
     works, see our <a href="<page docs/hidden-services>">hidden service protocol</a> page.
     </p>
     
-    <hr />
+    <hr>
     <a id="zero"></a>
     <h2><a class="anchor" href="#zero">Step Zero: Get Tor working</a></h2>
-    <br />
+    <br>
     
     <p>Before you start, you need to make sure:</p>
     <ol>
@@ -63,10 +63,10 @@
     it-doesn't-work FAQ entry</a> for some help.
     </p>
     
-    <hr />
+    <hr>
     <a id="one"></a>
     <h2><a class="anchor" href="#one">Step One: Install a web server locally</a></h2>
-    <br />
+    <br>
     
     <p>First, you need to set up a web server locally. Setting up a web
     server can be tricky,
@@ -108,10 +108,10 @@
     directory, and make sure it shows up when you access the site.
     </p>
     
-    <hr />
+    <hr>
     <a id="two"></a>
     <h2><a class="anchor" href="#two">Step Two: Configure your hidden service</a></h2>
-    <br />
+    <br>
     
     <p>Next, you need to configure your hidden service to point to your
     local web server.
@@ -210,10 +210,10 @@
     with it until it works.
     </p>
     
-    <hr />
+    <hr>
     <a id="three"></a>
     <h2><a class="anchor" href="#three">Step Three: More advanced tips</a></h2>
-    <br />
+    <br>
     
     <p>If you plan to keep your service available for a long time, you might
     want to make a backup copy of the <var>private_key</var> file somewhere.
@@ -258,7 +258,7 @@
     <!-- increased risks over time -->
     </ul>
     
-    <hr />
+    <hr>
     
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>

Modified: website/trunk/docs/en/trademark-faq.wml
===================================================================
--- website/trunk/docs/en/trademark-faq.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/trademark-faq.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
   <div id="maincol">
     <!-- PUT CONTENT AFTER THIS TAG -->
     <h1>Tor Trademark Frequently Asked Questions</h1>
-    <hr />
+    <hr>
     
     <a id="usage"></a>
     <h2>How can I use the name "Tor"?</h2>

Modified: website/trunk/docs/en/verifying-signatures.wml
===================================================================
--- website/trunk/docs/en/verifying-signatures.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/docs/en/verifying-signatures.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -10,7 +10,7 @@
   </div>
   <div id="maincol"> 
     <h1>How to verify signatures for packages</h1>
-    <hr />
+    <hr>
     
     <p>Each file on <a href="<page download/download>">our download page</a> is accompanied
     by a file with the same name as the package and the extension
@@ -34,7 +34,7 @@
     </ul>
     
     <h3>Step Zero: Install GnuPG</h3>
-    <hr />
+    <hr>
     <p>You need to have GnuPG installed before you can verify
     signatures.</p>
     
@@ -50,7 +50,7 @@
     </ul>
     
     <h3>Step One:  Import the keys</h3>
-    <hr />
+    <hr>
     <p>The next step is to import the key. This can be done directly from
     GnuPG. Make sure you import the correct key. For example, if you
     downloaded a Windows package, you will need to import Andrew's key.</p>
@@ -77,7 +77,7 @@
     <pre>gpg --recv-keys 0x28988BF5</pre>
     
     <h3>Step Two:  Verify the fingerprints</h3>
-    <hr />
+    <hr>
     <p>After importing the key, you will want to verify that the fingerprint is correct.</p>
     
     <p><b>Windows:</b></p>
@@ -145,7 +145,7 @@
     </pre>
     
     <h3>Step Three:  Verify the downloaded package</h3>
-    <hr />
+    <hr>
     <p> To verify the signature of the package you downloaded, you will need
     to download the ".asc" file as well.</p>
     

Modified: website/trunk/donate/en/donate.wml
===================================================================
--- website/trunk/donate/en/donate.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/donate/en/donate.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -39,29 +39,29 @@
 		      </td>
 		  </tr>
 		  <tr>
-		     <input type="hidden" name="p3" value="1" />
-		     <input type="hidden" name="t3" value="M" />
-		     <input type="hidden" name="sra" value="1" />
-		     <input type="hidden" name="src" value="1" />
-		     <input type="hidden" name="no_shipping" value="1" />
-		     <input type="hidden" name="no_note" value="1" />
+		     <input type="hidden" name="p3" value="1">
+		     <input type="hidden" name="t3" value="M">
+		     <input type="hidden" name="sra" value="1">
+		     <input type="hidden" name="src" value="1">
+		     <input type="hidden" name="no_shipping" value="1">
+		     <input type="hidden" name="no_note" value="1">
 		     <input type="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"/>
-		     <input type="hidden" name="cmd" value="_xclick-subscriptions" />
-		     <input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx" />
-		     <input type="hidden" name="item_name" value="Tor Project Membership" />
+		     <input type="hidden" name="cmd" value="_xclick-subscriptions">
+		     <input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
+		     <input type="hidden" name="item_name" value="Tor Project Membership">
 		     <input type="hidden" name="return" value="https://www.torproject.org/donate"/>
 		     <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>
-		    <input class="donate-btn" type="submit" name="donate" value="Donate" />
+		    <input class="donate-btn" type="submit" name="donate" value="Donate">
 		  </tr>
 		  <tr>
-		    <td><input type="radio" name="a3" value="5.00" />5/mo</td>
-		    <td><input type="radio" name="a3" value="10.00" />10/mo</td>
-		    <td><input type="radio" name="a3" value="20.00" checked="checked" />20/mo</td>
+		    <td><input type="radio" name="a3" value="5.00">5/mo</td>
+		    <td><input type="radio" name="a3" value="10.00">10/mo</td>
+		    <td><input type="radio" name="a3" value="20.00" checked="checked">20/mo</td>
 		  </tr>
 		  <tr>
-		    <td><input type="radio" name="a3" value="50.00" />50/mo</td>
-		    <td><input type="radio" name="a3" value="100.00" />100/mo</td>
-		    <td><input type="radio" name="a3" value="250.00" />250/mo</td>
+		    <td><input type="radio" name="a3" value="50.00">50/mo</td>
+		    <td><input type="radio" name="a3" value="100.00">100/mo</td>
+		    <td><input type="radio" name="a3" value="250.00">250/mo</td>
 		  </tr>
 		  </div>
 		</table>
@@ -69,10 +69,10 @@
 	     </form>
 	    </table>
 	  </div>
-    <br />
+    <br>
 	<div class="or left">OR
   	</div>
-    <br />
+    <br>
 	<div class="paypal focus">
 	  <h4>Make a one-time donation</h4>
 	    <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
@@ -89,25 +89,25 @@
 		      </td>
 	      </tr>
 	      <tr colspan="2">
-		<input type="hidden" name="no_shipping" value="1" />
+		<input type="hidden" name="no_shipping" value="1">
 		<input type="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Make a single donation with PayPal - it's fast, free and secure!"/>
-		<input type="hidden" name="cmd" value="_xclick" />
-		<input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx" />
-		<input type="hidden" name="item_name" value="Tor" />
+		<input type="hidden" name="cmd" value="_xclick">
+		<input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx">
+		<input type="hidden" name="item_name" value="Tor">
 		<input type="hidden" name="return" value="https://www.torproject.org/about/donate.html.en"/>
 		<input type="hidden" name="cancel_return" value="https://www.torproject.org/about/donate.html.en"/>
 	      </tr>
 	      <tr>
-		<td><input type="radio" value="10.00" /> 10</td>
-		<td><input type="radio" value="20.00" checked="checked" /> 20</td>
-		<td><input type="radio" value="50.00" /> 50</td>
-		<td><input type="radio" value="100.00" /> 100</td>
+		<td><input type="radio" value="10.00"> 10</td>
+		<td><input type="radio" value="20.00" checked="checked"> 20</td>
+		<td><input type="radio" value="50.00"> 50</td>
+		<td><input type="radio" value="100.00"> 100</td>
 	      </tr>
 	      <tr>
-		<td><input type="radio" value="250.00" /> 250</td>
-		<td><input type="radio" value="500.00" /> 500</td>
-		<td><input type="radio" value="1000.00" /> 1,000</td>
-		<td><input type="radio" value="5000.00" /> 5,000</td>
+		<td><input type="radio" value="250.00"> 250</td>
+		<td><input type="radio" value="500.00"> 500</td>
+		<td><input type="radio" value="1000.00"> 1,000</td>
+		<td><input type="radio" value="5000.00"> 5,000</td>
 	      </tr>
 	    </table>
           </form>
@@ -122,22 +122,22 @@
 	<form action="https://authorize.payments.amazon.com/pba/paypipeline"; method="post">
 	<table>
 	<tr>
-	    <input type="hidden" name="immediateReturn" value="1" />
-	    <input type="hidden" name="collectShippingAddress" value="0" />
-	    <input type="hidden" name="minimumDonationAmount" value="USD 10" />
-	    <input type="hidden" name="isDonationWidget" value="1" />
-	    <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy" />
-	    <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1" />
-	    <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en"; />
-	    <input type="hidden" name="processImmediate" value="1" />
-	    <input type="hidden" name="cobrandingStyle" value="logo" />
-	    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en"; />
+	    <input type="hidden" name="immediateReturn" value="1">
+	    <input type="hidden" name="collectShippingAddress" value="0">
+	    <input type="hidden" name="minimumDonationAmount" value="USD 10">
+	    <input type="hidden" name="isDonationWidget" value="1">
+	    <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy">
+	    <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1">
+	    <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en";>
+	    <input type="hidden" name="processImmediate" value="1">
+	    <input type="hidden" name="cobrandingStyle" value="logo">
+	    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en";>
       </tr>
 	  <td>&nbsp;</td>
-	  <td>$<input type="text" name="amount" size="8" value="10" /></td>
+	  <td>$<input type="text" name="amount" size="8" value="10"></td>
 	  <td>&nbsp;</td>
       <tr>
-	  <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif"; border="0" /></td>
+	  <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif"; border="0"></td>
       </tr>
       </table>
       </form>
@@ -158,8 +158,8 @@
     </div>
     	<div class="left hundred">
       	<p>You can send checks or money orders to:</p>
-	    <p>The Tor Project, Inc<br />
-        969 Main Street, Suite 206<br />
+	    <p>The Tor Project, Inc<br>
+        969 Main Street, Suite 206<br>
         Walpole, MA 02081-2972 USA</p>
       </div>
 	<!-- END CHECK -->
@@ -170,13 +170,13 @@
         <h3>US Transfers</h3>
         <p>For US donations via wire or ACH transfer, please contact us for the relevant information.</p>
         <h3>European Transfers</h3>
-        <p>Wau Holland Stiftung<br />
-        IBAN DE57 5204 0021 0277 281202<br />
+        <p>Wau Holland Stiftung<br>
+        IBAN DE57 5204 0021 0277 281202<br>
         SWIFT BIC COBADEFFXXX</p>
-        <p><strong>Classic style German account information is:</strong><br />
-        Konto: 2772812-02<br />
-        Inhaber: Wau Holland Stiftung<br />
-        Bank: Commerzbank Kassel<br />
+        <p><strong>Classic style German account information is:</strong><br>
+        Konto: 2772812-02<br>
+        Inhaber: Wau Holland Stiftung<br>
+        Bank: Commerzbank Kassel<br>
         BLZ: 52040021</p>
         <p><em>For European bank transfers, we have an arrangement with <a href="http://ccc.de";>CCC in Germany</a> to provide tax-deductible donations for Europeans:</em></p>
         <ul>

Modified: website/trunk/download/en/download-unix.wml
===================================================================
--- website/trunk/download/en/download-unix.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/download/en/download-unix.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -27,54 +27,54 @@
 </thead>
 
 <tr>
-<td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>
+<td align="center"><img src="images/distros/debian.png" alt="Debian"> <img src="images/distros/ubuntu.png" alt="Ubuntu"> <img src="images/distros/knoppix.png" alt="Knoppix"></td>
 <td>Debian, Ubuntu, Knoppix</td>
 <td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>
 <td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
 </tr>
 
 <tr class="beige">
-<td align="center"><img src="images/distros/centos.png" alt="CentOS" /> <img src="images/distros/fedora.png" alt="Fedora" /> <img src="images/distros/suse.png" alt="openSUSE 11" /></td>
+<td align="center"><img src="images/distros/centos.png" alt="CentOS"> <img src="images/distros/fedora.png" alt="Fedora"> <img src="images/distros/suse.png" alt="openSUSE 11"></td>
 <td>CentOS, Fedora, OpenSUSE</td>
 <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>
 <td> <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> </td>
 </tr>
 
 <tr>
-<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux" /></td>
+<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux"></td>
 <td>Gentoo Linux</td>
 <td colspan="2"><kbd>emerge tor</kbd></td>
 <td>
-<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br />
+<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
 </td>
 </tr>
 
 <tr class="beige">
-<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD" /></td>
+<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD"></td>
 <td>FreeBSD</td>
 <td colspan="2"><kbd>portinstall -s security/tor</kbd></td>
 <td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
 </tr>
 
 <tr>
-<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD" /></td>
+<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD"></td>
 <td>OpenBSD</td>
 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
 <td>
-<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br />
+<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br>
 <a href="<wiki>/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
 </td>
 </tr>
 
 <tr class="beige">
-<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD" /></td>
+<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD"></td>
 <td>NetBSD</td>
 <td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
 <td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td>
 </tr>
 
 <tr class="beige">
-<td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>
+<td align="center"><img src="images/distros/terminal.png" alt="Source code"></td>
 <td>Source tarballs</td>
 <td>
 <a href="<package-source-stable>"><version-stable></a>

Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/download/en/download.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -246,7 +246,7 @@
 </li>
 </ol>
 
-<br />
+<br>
 <p>
 Be smart and learn more. Understand what Tor does and does not offer.
 This list of pitfalls isn't complete, and we need your

Modified: website/trunk/download/en/easy-download.wml
===================================================================
--- website/trunk/download/en/easy-download.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/download/en/easy-download.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -7,7 +7,7 @@
 <div class="main-column">
 
 <h3>Download Now - Free &amp; Open Source Software</h3>
-<hr />
+<hr>
 <table width="99%" border="0" cellspacing="0" cellpadding="3">
 <tr>
 <th bgcolor="#e5e5e5" align="center" width="25%"><img src="$(IMGROOT)/logo.windows-header.gif"/></th>

Modified: website/trunk/download/en/thankyou.wml
===================================================================
--- website/trunk/download/en/thankyou.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/download/en/thankyou.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -39,7 +39,7 @@
           <div class="img-shadow">
             <div class="custom-infoblock">
               <h2>Is Your Installation Working?</h2>
-              <img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+              <img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
               <h4>Use TorCheck to test your Install</h4>
               <p>Visit <a href="http://check.torproject.org";>check.torproject.org</a> to see if your install is working, and youâre being protected by the Tor onion router.</p>
             </div>

Modified: website/trunk/eff/en/tor-dmca-response.wml
===================================================================
--- website/trunk/eff/en/tor-dmca-response.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/eff/en/tor-dmca-response.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -8,7 +8,7 @@
 <!-- PUT CONTENT AFTER THIS TAG -->
 
 <h2>Response template for Tor relay maintainer to ISP</h2>
-<hr />
+<hr>
 <p>Written by the Electronic Frontier
 Foundation (<a href="http://www.eff.org/";>EFF</a>). Last updated 19 Feb 2005.</p>
 
@@ -36,7 +36,7 @@
 href="https://torproject.org/eff/tor-dmca-response.html";>https://www.torproject.org/eff/tor-dmca-response.html</a>,
 it may be out of date. Follow the link to get the latest version.</p>
 
-<hr />
+<hr>
 
 <p>Dear [ISP]:</p>
 
@@ -121,7 +121,7 @@
 </p>
 
 <p>
-Very truly yours,<br />
+Very truly yours,<br>
 Your customer, [User]
 </p>
 

Modified: website/trunk/eff/en/tor-legal-faq.wml
===================================================================
--- website/trunk/eff/en/tor-legal-faq.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/eff/en/tor-legal-faq.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -8,7 +8,7 @@
 <!-- PUT CONTENT AFTER THIS TAG -->
 
 <h2>Legal FAQ for Tor Relay Operators</h2>
-<hr />
+<hr>
 <p>FAQ written by the Electronic Frontier
 Foundation (<a href="http://www.eff.org/";>EFF</a>). Last updated 25 Apr 2005.</p>
 
@@ -28,7 +28,7 @@
 href="https://www.torproject.org/eff/tor-legal-faq.html";>https://www.torproject.org/eff/tor-legal-faq.html</a>,
 it may be out of date. Follow the link to get the latest version.</p>
 
-<hr />
+<hr>
 
 <a id="Lawsuits"></a>
 <h3><a class="anchor" href="#Lawsuits">Has anyone ever been sued for running Tor?
@@ -192,8 +192,8 @@
  for use in the OpenSSL Toolkit (http://www.openssl.org/)"</p>
 
 <p>The Tor software license is the Modified BSD, which is as follows:</p>
-<p>Copyright &copy 2001-2004, Roger Dingledine<br />
-Copyright &copy; 2004-2007, Roger Dingledine, Nick Mathewson<br />
+<p>Copyright &copy 2001-2004, Roger Dingledine<br>
+Copyright &copy; 2004-2007, Roger Dingledine, Nick Mathewson<br>
 Copyright &copy; 2007-2008 The Tor Project, Inc.</p>
 
 <p>Redistribution and use in source and binary forms, with or without

Modified: website/trunk/en/index.wml
===================================================================
--- website/trunk/en/index.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/en/index.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -28,7 +28,7 @@
             you defend against a form of network surveillance that
             threatens personal freedom and privacy, confidential business
             activities and relationships, and state security known as <a
-            href="<page about/overview>">traffic analysis</a><br /><span
+            href="<page about/overview>">traffic analysis</a><br><span
             class="continue"><a href="<page about/overview>">Learn more
             about Tor &raquo;</a></span></p>
           </div>
@@ -42,7 +42,7 @@
           the sites you visit from learning your physical location.
           Tor works with many of your existing applications, including
           web browsers, instant messaging clients, remote login, and
-          other applications based on the TCP protocol.<br /><span
+          other applications based on the TCP protocol.<br><span
           class="continue"><a href="<page getinvolved/volunteer>">Get involved
           with Tor &raquo;</a></span></p> </div>
         </div>
@@ -53,13 +53,13 @@
           <table>
             <tr>
               <td>
-                <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+                <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
                 <h3><a href="<page torbutton/index>">Torbutton</a></h3>
                 <p>Torbutton is a 1-click way for Firefox users to enable
                 or disable Tor in Firefox.</p>
               </td>
               <td>
-                <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+                <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
                 <h3><a href="https://check.torproject.org";>Check</a></h3>
                 <p>Check will tell you if you are using browsing with
                 Tor successfully.</p>
@@ -67,14 +67,14 @@
             </tr>
             <tr>
               <td>
-              <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+              <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
               <h3><a href="<page projects/vidalia>">Vidalia</a></h3>
               <p>Vidalia is a graphical tool to allow you to see where
               your connections are in the world and configure Tor without
               getting into configuration files and code.</p>
               </td>
               <td>
-              <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+              <img src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
               <h3><a href="<page projects/torbrowser>">Tor
               Browser</a></h3>
               <p>Tor Browser contains everything you need to safely
@@ -91,27 +91,27 @@
       	<div id="torusers">
           <h2>Who Uses Tor?</h2>
           <div class="user">
-            <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" alt="Normal People" />
+            <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" alt="Normal People">
             <h3>Family &amp; Friends</h3></a>
             <p>People like you and your family use Tor to protect themselves, their children, and their dignity while using the Internet.</p>
           </div>
           <div class="user">
-            <a href="<page about/torusers>#executives"><img src="$(IMGROOT)/consumers.jpg" alt="Businesses" />
+            <a href="<page about/torusers>#executives"><img src="$(IMGROOT)/consumers.jpg" alt="Businesses">
             <h3>Businesses</h3></a>
             <p>Businesses use Tor to research competition and keep strategies confidential, facilitating internal accountability.</p>
           </div>
           <div class="user">
-            <a href="<page about/torusers>#activists"><img src="$(IMGROOT)/activists.jpg" alt="Activists &amp; Whistleblowers" />
+            <a href="<page about/torusers>#activists"><img src="$(IMGROOT)/activists.jpg" alt="Activists &amp; Whistleblowers">
             <h3>Activists</h3></a>
             <p>Activists use Tor to anonymously report abuses from danger zones.  Whistleblowers use Tor to safely report on corruption.</p>
           </div>
           <div class="user">
-            <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media" />
+            <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media">
             <h3>Media</h3></a>
             <p>Journalists and the Media use Tor to protect their research and sources online.</p>
           </div>
           <div class="user">
-            <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement" />
+            <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement">
             <h3>Military &amp; Law Enforcement</h3></a>
             <p>Militaries and Law Enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
           </div>
@@ -122,13 +122,13 @@
           <table>
             <tr>
               <td>
-                <div class="calendar"><span class="month">Sept</span><br /><span class="day">16</span></div>
+                <div class="calendar"><span class="month">Sept</span><br><span class="day">16</span></div>
                 <p>Tor announces <a href="<page press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look for in a Circumvention Tool.</a></p>
               </td>
             </tr>
             <tr>
               <td>
-                <div class="calendar"><span class="month">May</span><br /><span class="day">02</span></div>
+                <div class="calendar"><span class="month">May</span><br><span class="day">02</span></div>
                 <p>Tor 0.2.1.26 released as stable. Fixes yet
                 more OpenSSL compatibility issues and lets relays
                 defend themselves from connection floods. <a

Modified: website/trunk/getinvolved/en/mirrors.wml
===================================================================
--- website/trunk/getinvolved/en/mirrors.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/mirrors.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -10,7 +10,7 @@
   </div>
   <div id="maincol"> 
     <h2>Tor: Mirrors</h2>
-    <hr />
+    <hr>
     
     <p>
     The canonical URL of this site is <a href="https://www.torproject.org/";>https://www.torproject.org/</a>,

Modified: website/trunk/getinvolved/en/open-positions.wml
===================================================================
--- website/trunk/getinvolved/en/open-positions.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/open-positions.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
   <div id="maincol"> 
 
 <h1>Tor: Open Positions</h1>
-<hr />
+<hr>
 
 <p>Tor is hiring!  We're looking for self-motivated individuals who are
 able to work independently and want to help make Tor better.  These are

Modified: website/trunk/getinvolved/en/translation-overview.wml
===================================================================
--- website/trunk/getinvolved/en/translation-overview.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/translation-overview.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol"> 
     <h1>Tor: Translation Overview</h1>
-    <hr />
+    <hr>
     
     <p>
     The Tor bundles include several different programs, all of which need
@@ -26,7 +26,7 @@
     <a id="TTP"></a>
     <a id="TTPVidalia"></a>
     <h2><a class="anchor" href="#TTP">Using The Tor Translation Portal</a></h2>
-    <hr />
+    <hr>
     
     <p>
     The <a href="https://translation.torproject.org/";>Tor Translation Portal</a>

Modified: website/trunk/getinvolved/en/translation.wml
===================================================================
--- website/trunk/getinvolved/en/translation.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/translation.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol"> 
     <h1>Tor Website Translation Guidelines</h1>
-    <hr />
+    <hr>
     
     <p>
     If you want to help translate the Tor website and documentation into

Modified: website/trunk/getinvolved/en/tshirt.wml
===================================================================
--- website/trunk/getinvolved/en/tshirt.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/tshirt.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -11,7 +11,7 @@
   </div>
   <div id="maincol"> 
     <h1>Tor: T-shirt for Contributing</h1>
-    <hr />
+    <hr>
     
     <p>You can get one of these fine Tor T-shirts for contributing to the
     Tor project. There are three primary ways of contributing:</p>
@@ -47,8 +47,8 @@
     </p>
     
     <div style="text-align: center">
-    <a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png" /></a>
-    <a href="tshirt/green-tor-tshirt.png"><img src="tshirt/green-tor-tshirt.png" /></a>
+    <a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"></a>
+    <a href="tshirt/green-tor-tshirt.png"><img src="tshirt/green-tor-tshirt.png"></a>
     </div>
   </div>
   <!-- END MAINCOL -->

Modified: website/trunk/getinvolved/en/volunteer.wml
===================================================================
--- website/trunk/getinvolved/en/volunteer.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/getinvolved/en/volunteer.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -83,22 +83,22 @@
     
     <li>
     <b>Tor Browser Bundle for Mac OS X</b>
-    <br />
+    <br>
     Priority: <i>High</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Steven, Erinn, Jacob, Andrew</i>
-    <br />
+    <br>
     The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia
     user interface (and optionally the <a href="http://pidgin.im/";>Pidgin</a>
     Instant Messaging client). Components are pre-configured to operate in a
     secure way, and it has very few dependencies on the installed operating
     system. It has therefore become one of the most easy to use, and popular,
     ways to use Tor on Windows.
-    <br />
+    <br>
     However, there is currently no released package for Mac OS X, so this project
     would be to implement Tor Browser Bundle for OS X. This will involve
     modifications to Vidalia (C++), possibly Firefox (C) then creating and testing
@@ -107,16 +107,16 @@
     Summer of Code 2009. Another part of this project is to identify all of the
     traces left behind by using a Tor Browser Bundle on Mac OS X or Linux.
     Developing ways to stop, counter, or remove these traces is a final step.
-    <br />
+    <br>
     Students should be familiar with application development on one or
     preferably both of Linux and Mac OS X, and be comfortable with C/C++
     and shell scripting.
-    <br />
+    <br>
     Part of this project could be usability testing of Tor Browser Bundle,
     ideally amongst our target demographic.  That would help a lot in knowing
     what needs to be done in terms of bug fixes or new features. We get this
     informally at the moment, but a more structured process would be better.
-    <br />
+    <br>
     A beta version of the Tor Browser Bundle has been released for GNU/Linux, but
     work is still required for the Tor IM Browser bundle. Work is currently being
     done on the Mac OS X version as well. If you would like to help extend or do
@@ -125,15 +125,15 @@
     
     <li>
     <b>Help track the overall Tor Network status</b>
-    <br />
+    <br>
     Priority: <i>Medium to High</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Karsten, Roger</i>
-    <br />
+    <br>
     It would be great to set up an automated system for tracking network
     health over time, graphing it, etc. Part of this project would involve
     inventing better metrics for assessing network health and growth. Is the
@@ -142,7 +142,7 @@
     in terms of new relays showing up and relays shutting off? Periodically
     people collect brief snapshots, but where it gets really interesting is
     when we start tracking data points over time.
-    <br />
+    <br>
     Data could be collected from the Tor Network Scanners in <a
     href="https://svn.torproject.org/svn/torflow/trunk/README";>TorFlow</a>, from
     the server descriptors that each relay publishes, and from other
@@ -155,15 +155,15 @@
     
     <li>
     <b>Rewrite TorDNSEL, this time with a spec!</b>
-    <br />
+    <br>
     Priority: <i>High</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Mike, Roger, Sebastian, Damian</i>
-    <br />
+    <br>
     The <a href="<page projects/tordnsel>">Tor DNS Exit List</a> is an
     unmaintained Haskell
     program that serves three purposes. First, it provides an rbl-style DNS
@@ -175,7 +175,7 @@
     href="http://exitlist.torproject.org/exitAddresses";>set of conclusions</a>
     so that <a href="https://check.torproject.org/";>check.torproject.org</a>
     can guess for you whether your browser is configured to point to Tor.
-    <br />
+    <br>
     This project would make use of <a
     href="https://svn.torproject.org/svn/torflow/trunk/README";>TorFlow</a>,
     a set of Python scripts to interact with Tor,
@@ -193,28 +193,28 @@
     and/or other IRC networks to make sure that the scripts we offer are
     actually the scripts they want, in terms of accurately identifying which
     of their users are coming from the Tor network.
-    <br />
+    <br>
     You can fetch the <a href="git://git.torproject.org/git/tordnsel">latest
     tordnsel</a> via git.
     </li>
     
     <li>
     <b>Improving Tor's ability to resist censorship</b>
-    <br />
+    <br>
     Priority: <i>Medium to High</i>
-    <br />
+    <br>
     Effort Level: <i>Medium to High</i>
-    <br />
+    <br>
     Skill Level: <i>High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Roger, Nick, Steven</i>
-    <br />
+    <br>
     The Tor 0.2.1.x series makes <a
     href="<svnprojects>design-paper/blocking.html">significant
     improvements</a> in resisting national and organizational censorship.
     But Tor still needs better mechanisms for some parts of its
     anti-censorship design.
-    <br />
+    <br>
     One huge category of work is adding features to our <a
     href="http://gitweb.torproject.org//bridgedb.git?a=tree";>bridgedb</a>
     service (Python). Tor aims to give out <a href="<page docs/bridges>">bridge
@@ -226,7 +226,7 @@
     href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html";>Roger's
     or-dev post</a> from December for more recent thoughts &mdash; lots of
     design work remains.
-    <br />
+    <br>
     If you want to get more into the guts of Tor itself (C), a more minor problem
     we should address is that current Tors can only listen on a single
     address/port combination at a time. There's
@@ -234,7 +234,7 @@
     proposal to address this limitation</a> and allow clients to connect
     to any given Tor on multiple addresses and ports, but it needs more
     work.
-    <br />
+    <br>
     This project could involve a lot of research and design. One of the big
     challenges will be identifying and crafting approaches that can still
     resist an adversary even after the adversary knows the design, and
@@ -243,15 +243,15 @@
     
     <!--<li>
     <b>Tuneup Tor!</b>
-    <br />
+    <br>
     Priority: <i>Medium to High</i>
-    <br />
+    <br>
     Effort Level: <i>Medium to High</i>
-    <br />
+    <br>
     Skill Level: <i>High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Nick, Roger, Mike, Karsten</i>
-    <br />
+    <br>
     Right now, Tor relays measure and report their own bandwidth, and Tor
     clients choose which relays to use in part based on that bandwidth.
     This approach is vulnerable to
@@ -274,15 +274,15 @@
     
     <li>
     <b>Improving Polipo on Windows</b>
-    <br />
+    <br>
     Priority: <i>Medium to High</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Chris</i>
-    <br />
+    <br>
     Help port <a
     href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> to
     Windows. Example topics to tackle include:
@@ -301,15 +301,15 @@
     
     <li>
     <b>Tor Controller Status Event Interface for Vidalia</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Low to Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Matt</i>
-    <br />
+    <br>
     There are a number of status changes inside Tor of which the user may need
     to be informed. For example, if the user is trying to set up his Tor as a
     relay and Tor decides that its ports are not reachable from outside
@@ -318,12 +318,12 @@
     likely never see since they don't receive a notification that something
     has gone wrong. Even if the user does actually look at the message log,
     most of the messages make little sense to the novice user.
-    <br />
+    <br>
     Tor has the ability to inform Vidalia of many such status changes, and
     we recently implemented support for a couple of these events. Still,
     there are many more status events the user should be informed of and we
     need a better UI for actually displaying them to the user.
-    <br />
+    <br>
     The goal of this project then is to design and implement a UI for
     displaying Tor status events to the user. For example, we might put a
     little badge on Vidalia's tray icon that alerts the user to new status
@@ -332,7 +332,7 @@
     suggests a remedy for any negative events if they can be corrected by
     the user. Of course, this is just an example and one is free to
     suggest another approach.
-    <br />
+    <br>
     A person undertaking this project should have good UI design and layout
     and some C++ development experience. Previous experience with Qt and
     Qt's Designer will be very helpful, but are not required. Some
@@ -344,21 +344,21 @@
     
     <li>
     <b>Improve our unit testing process</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Nick, Erinn</i>
-    <br />
+    <br>
     Tor needs to be far more tested. This is a multi-part effort. To start
     with, our unit test coverage should rise substantially, especially in
     the areas outside the utility functions. This will require significant
     refactoring of some parts of Tor, in order to dissociate as much logic
     as possible from globals.
-    <br />
+    <br>
     Additionally, we need to automate our performance testing. We've got
     buildbot to automate our regular integration and compile testing already
     (though we need somebody to set it up on Windows),
@@ -371,15 +371,15 @@
     
     <li>
     <b>Help with independent Tor client implementations</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>Medium to High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Bruce, Nathan</i>
-    <br />
+    <br>
     Others are currently working on Tor clients for Java, Android, and Maemo
     environments.  The first step is to get a handle on the current state of
     the project in which you are interested in helping; <a
@@ -389,7 +389,7 @@
     repository and familiarize yourself
     with the source code.  Further, support for requesting or even providing
     Tor hidden services would be neat, but not required.
-    <br />
+    <br>
     A prospective developer should be able to understand and write new Java
     code, including a Java cryptography API. Being able to read C code would be helpful,
     too. One should be willing to read the existing documentation,
@@ -400,15 +400,15 @@
     <li>
     <b>More on Orbot &amp; Android OS-specific development</b>
     <br/>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>Medium to High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Nathan</i>
-    <br />
+    <br>
     
     <b>Android Java UI work:</b> Improved home screen to show better statistics about data transferred (up/down), number of circuits connected, quality of connection and so on. The "Tether Wifi" Android application is a good model to follow in how it shows a realtime count of bytes transferred as well as notifications when wifi client connect. In addition, better display/handling of Tor system/error messages would also be very helpful. Finally, the addition of a wizard or tutorial walkthrough for novice users to explain to them exactly what or what is not anonymized or protected would greatly improve the likelihood they will use Orbot correctly.
     <br/><br/>
@@ -424,13 +424,13 @@
     
     <!--<li>
     <b>New Torbutton Features</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Mike</i>
     <br/>
     There are several <a
@@ -450,7 +450,7 @@
     href="https://bugs.torproject.org/flyspray/index.php?do=details&amp;id=462";>"tor://"
     and "tors://" urls</a> are all interesting
     features that could be added.
-    <br />
+    <br>
     This work would be independent coding in Javascript and the fun world of <a
     href="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";>XUL</a>,
     with not too much involvement in the Tor internals.
@@ -458,15 +458,15 @@
     
     <!-- <li>
     <b>New Thandy Features</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium to High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Martin</i>
-    <br />
+    <br>
     Additional capabilities are needed for assisted updates of all the Tor
     related software for Windows and other operating systems. Some of the
     features to consider include:
@@ -488,27 +488,27 @@
     
     <li>
     <b>Simulator for slow Internet connections</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Steven</i>
-    <br />
+    <br>
     Many users of Tor have poor-quality Internet connections, giving low
     bandwidth, high latency, and high packet loss/re-ordering. User
     experience is that Tor reacts badly to these conditions, but it is
     difficult to improve the situation without being able to repeat the
     problems in the lab.
-    <br />
+    <br>
     This project would be to build a simulation environment which
     replicates the poor connectivity so that the effect on Tor performance
     can be measured. Other components would be a testing utility to
     establish what are the properties of connections available, and to
     measure the effect of performance-improving modifications to Tor.
-    <br />
+    <br>
     The tools used would be up to the student, but dummynet (for FreeBSD)
     and nistnet (for Linux) are two potential components on which this
     project could be built. Students should be experienced with network
@@ -518,15 +518,15 @@
     
     <li>
     <b>An Improved and More Usable Network Map in Vidalia</b>
-    <br />
+    <br>
     Priority: <i>Low to Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Matt</i>
-    <br />
+    <br>
     One of Vidalia's existing features is a network map that shows the user
     the approximate geographic location of relays in the Tor network and
     plots the paths the user's traffic takes as it is tunneled through the
@@ -538,13 +538,13 @@
     for users to click on a particular relay or a country containing one or
     more Tor exit relays and say, "I want my connections to exit
     from here."
-    <br />
+    <br>
     This project will first involve getting familiar with Vidalia
     and the Marble widget's API. One will then integrate the widget
     into Vidalia and customize Marble to be better suited for our application,
     such as making circuits clickable, storing cached map data in Vidalia's
     own data directory, and customizing some of the widget's dialogs.
-    <br />
+    <br>
     A person undertaking this project should have good C++ development
     experience. Previous experience with Qt and CMake is helpful, but not
     required.
@@ -552,15 +552,15 @@
     
     <li>
     <b>Torbutton equivalent for Thunderbird</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Mike</i>
-    <br />
+    <br>
     We're hearing from an increasing number of users that they want to use
     Thunderbird with Tor. However, there are plenty of application-level
     concerns, for example, by default Thunderbird will put your hostname in
@@ -570,15 +570,15 @@
     
     <!--<li>
     <b>Intermediate Level Network Device Driver</b>
-    <br />
+    <br>
     Priority: <i>Low</i>
-    <br />
+    <br>
     Effort Level: <i>High</i>
-    <br />
+    <br>
     Skill Level: <i>High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Martin</i>
-    <br />
+    <br>
     The WinPCAP device driver used by Tor VM for bridged networking does
     not support a number of wireless and non-Ethernet network adapters.
     Implementation of a intermediate level network device driver for win32
@@ -590,15 +590,15 @@
     
     <li>
     <b>Improve Tor Weather</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Christian, Roger, Damian</i>
-    <br />
+    <br>
     <a href="https://weather.torproject.org/";>Tor weather</a> is a tool
     that allows signing up to receive notifications via email when the
     tracked Tor relay is down. Currently, it isn't really useful for
@@ -620,40 +620,40 @@
     
     <li>
     <b>Improvements for Tor+Vidalia interaction on Linux/Unix platforms</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Erinn, Peter</i>
-    <br />
+    <br>
     Vidalia currently doesn't play nicely with Tor on Linux and Unix platforms.
     Currently, on Debian and Ubuntu, there is a configuration mechanism which
     allows Vidalia to override Tor's ability to start on boot (by sourcing
     <code>/etc/default/tor.vidalia</code> which sets <code>RUN_DAEMON=no</code> at the user's
     request), but full implementation of <a href="<gitblob>doc/spec/control-spec.txt">ControlPort</a> 
     communication is still required.
-    <br />
+    <br>
     A better solution on Linux and Unix platforms would be to use Tor's
     ControlSocket, which allows Vidalia to talk to Tor via a Unix domain socket,
     and could possibly be enabled by default in Tor's distribution packages.
     Vidalia can then authenticate to Tor using filesystem-based (cookie)
     authentication if the user running Vidalia is also in the distribution-specific
     tor group.
-    <br />
+    <br>
     This project will first involve adding support for Tor's ControlSocket to
     Vidalia. The student will then develop and test this support on various
     distributions to make sure it behaves in a predictable and consistent manner on
     all of them.
-    <br />
+    <br>
     The next challenge would be to find an intuitive and usable way for Vidalia to be
     able to change Tor's configuration (torrc) even though it is located in
     <code>/etc/tor/torrc</code> and thus immutable. In Debian and Ubuntu we handle
     this with the aforementioned <code>/etc/default/tor.vidalia</code> but this
     functionality could (or should) be less distribution-specific. 
-    <br />
+    <br>
     The best idea we've come up with so far is to feed Tor a new configuration via
     the ControlSocket when Vidalia starts, but that's bad because if the user is not
     using the latest Debian/Ubuntu packages, they may not have disabled Tor's
@@ -662,7 +662,7 @@
     write out a temporary torrc file and ask the user to manually move it to
     <code>/etc/tor/torrc</code>, but that's bad because users shouldn't have to
     mess with files directly.
-    <br />
+    <br>
     A person undertaking this project should have prior knowledge of various Linux
     distributions and their packaging mechanisms as well as some C++ development
     experience. Previous experience with Qt is helpful, but not required.
@@ -670,7 +670,7 @@
     
     <!--<li>
     <b>Tor/Polipo/Vidalia Auto-Update Framework</b>
-    <br />
+    <br>
     We're in need of a good authenticated-update framework.
     Vidalia already has the ability to notice when the user is running an
     outdated or unrecommended version of Tor, using signed statements inside
@@ -683,7 +683,7 @@
     to be able to update other
     applications included in the bundled installers, such as Polipo and
     Vidalia itself.
-    <br />
+    <br>
     To complete this project, the student will first need to first investigate
     the existing auto-update frameworks (e.g., Sparkle on OS X) to evaluate
     their strengths, weaknesses, security properties, and ability to be
@@ -692,7 +692,7 @@
     then discuss the design with other developers to assess any security
     issues. The student will then implement their framework (or integrate
     an existing one) and test it.
-    <br />
+    <br>
     A person undertaking this project should have good C++ development
     experience. Previous experience with Qt is helpful, but not required. One
     should also have a good understanding of common security
@@ -704,23 +704,23 @@
     
     <li>
     <b>Improving the Tor QA process: Continuous Integration for builds</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Erinn</i>
-    <br />
+    <br>
     It would be useful to have automated build processes for Windows and
     probably other platforms. The purpose of having a continuous integration
     build environment is to ensure that Windows isn't left behind for any of
-    the software projects used in the Tor project or its accompanying.<br />
+    the software projects used in the Tor project or its accompanying.<br>
     Buildbot may be a good choice for this as it appears to support all of
     the platforms Tor does. See the
     <a href="http://en.wikipedia.org/wiki/BuildBot";>wikipedia entry for
-    buildbot</a>.<br />
+    buildbot</a>.<br>
     There may be better options and the person undertaking this task should
     evaluate other options. Any person working on this automatic build
     process should have experience or be willing to learn how to build all
@@ -728,7 +728,7 @@
     person should have some experience building software in Windows
     environments as this is the target audience we want to ensure we do not
     leave behind. It would require close work with the Tor source code but
-    probably only in the form of building, not authoring.<br />
+    probably only in the form of building, not authoring.<br>
     Additionally, we need to automate our performance testing for all platforms.
     We've got buildbot (except on Windows &mdash; as noted above) to automate
     our regular integration and compile testing already,
@@ -740,15 +740,15 @@
     
     <!--<li>
     <b>Usability testing of Tor</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Low to Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>Andrew</i>
-    <br />
+    <br>
     Especially the browser bundle, ideally amongst our target demographic.
     That would help a lot in knowing what needs to be done in terms of bug
     fixes or new features. We get this informally at the moment, but a more
@@ -757,15 +757,15 @@
     
     <li>
     <b>An authenticating IRC proxy</b>
-    <br />
+    <br>
     Priority: <i>Low</i>
-    <br />
+    <br>
     Effort Level: <i>Medium to High</i>
-    <br />
+    <br>
     Skill Level: <i>Medium to High</i>
-    <br />
+    <br>
     Likely Mentors: <i>Sebastian, Weasel, Roger</i>
-    <br />
+    <br>
     The world needs an authenticating irc proxy. As we're periodically
     reminded from the Penny Arcade web comic, "Internet user + anonymity =
     jerk". With respect to websites we're actually doing ok, since websites
@@ -793,15 +793,15 @@
     
     <li>
     <b>Make torsocks/dsocks work on OS X</b>
-    <br />
+    <br>
     Priority: <i>Medium</i>
-    <br />
+    <br>
     Effort Level: <i>Medium</i>
-    <br />
+    <br>
     Skill Level: <i>Medium</i>
-    <br />
+    <br>
     Likely Mentors: <i>?</i>
-    <br />
+    <br>
     <a href="http://code.google.com/p/torsocks/";>Torsocks</a> and <a
     href="http://code.google.com/p/dsocks/";>dsocks</a> are wrappers that will
     run applications, intercept their outgoing network connections, and push
@@ -822,7 +822,7 @@
     
     <li>
     <b>Bring up new ideas!</b>
-    <br />
+    <br>
     Don't like any of these? Look at the <a
     href="<gitblob>doc/roadmaps/2008-12-19-roadmap-full.pdf">Tor development
     roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton,

Modified: website/trunk/press/en/press.wml
===================================================================
--- website/trunk/press/en/press.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/press/en/press.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -21,7 +21,7 @@
 <li>19 December 2008.  Tor announces 3-year <a href="<page
 press/2008-12-19-roadmap-press-release>">development roadmap</a>.</li>
 </ul>
-<br />
+<br>
 <div class="nb">
 <h3>Quick links to better understand Tor</h3>
 <ol>

Modified: website/trunk/projects/en/projects.wml
===================================================================
--- website/trunk/projects/en/projects.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/projects/en/projects.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
     <p>The Tor Project maintains a growing set of software and services
 in order to make your experience safer, better, and more anonymous.</p>
     <div class="featured-project focus left first">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
       <div class="name">Torbutton</div>
       <p>Torbutton is a 1-click way for Firefox users to enable or
 disable Tor in Firefox.  To keep you safe, Torbutton disables many types
@@ -21,7 +21,7 @@
 &raquo;</a></p>
     </div>
     <div class="featured-project focus left">
-			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
+			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon">
       <div class="name">Tor Browser Bundle</div>
       <p>The Tor Browser Bundle contains everything you need to safely
 browse the Internet. This package requires no installation. Just extract

Modified: website/trunk/projects/en/torbrowser-split.wml
===================================================================
--- website/trunk/projects/en/torbrowser-split.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/projects/en/torbrowser-split.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -100,7 +100,7 @@
     
     <p>After you have downloaded all the files above, double click on the file with the icon of a box (1).</p>
     
-    <p><img src="$(IMGROOT)/tbb-split-screenshot1.png" alt="Screenshot of starting extraction process" /></p>
+    <p><img src="$(IMGROOT)/tbb-split-screenshot1.png" alt="Screenshot of starting extraction process"></p>
     
     <p>Click on the button labelled <strong>Browse...</strong> (2) and select where you want
     to save the bundle then click <strong>OK</strong> (3). At least 50&nbsp;MB free
@@ -112,7 +112,7 @@
     <p>Click <strong>Install</strong> (4) to begin extraction. This may take a
     few minutes to complete.</p>
     
-    <p><img src="$(IMGROOT)/tbb-split-screenshot2.png" alt="Screenshot of extraction process" /></p>
+    <p><img src="$(IMGROOT)/tbb-split-screenshot2.png" alt="Screenshot of extraction process"></p>
     
     <p>Once the extraction has completed, see the <a href="<page projects/torbrowser>#Usage">usage instructions</a> for how to start Tor.</p>
   </div>

Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/projects/en/torbrowser.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -163,7 +163,7 @@
     <a id="Linux"></a>
     <h3><a class="anchor" href="#Linux">Linux instructions</a></h3>
     <p>Download the architecture-appropriate file above, save it somewhere, then
-    run:<br /> tar -xvzf
+    run:<br> tar -xvzf
     tor-browser-gnu-linux-<version-torbrowserbundlelinux>-dev-LANG.tar.gz (where
     LANG is the language listed in the filename), and either double click on the
     directory or cd into it, then execute the <strong>start-tor-browser</strong>
@@ -184,7 +184,7 @@
     <p>Click <strong>Extract</strong> (3) to begin extraction. This may take a
     few minutes to complete.</p>
     
-    <p><img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of extraction process" /></p>
+    <p><img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of extraction process"></p>
     
     <a id="Usage"></a>
     <h3><a class="anchor" href="#Usage">Usage</a></h3>
@@ -196,7 +196,7 @@
     
     <p>The Vidalia window will shortly appear.</p>
     
-    <p><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of bundle startup" /></p>
+    <p><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of bundle startup"></p>
     
     <p>Once Tor is ready, Firefox will automatically be opened. Only web pages
     visited through the included Firefox browser will be sent via Tor. Other web
@@ -208,15 +208,15 @@
     <p>If you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened.</p>
     
     <p>Once you are finished browsing, close any open Firefox windows by clicking
-    on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close button (&times;)" /> (6).
+    on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close button (&times;)"> (6).
     For privacy reasons, the list of
     webpages you visited and any cookies will be deleted.</p>
     
-    <p><img src="$(IMGROOT)/tbb-screenshot3a.png" alt="Screenshot of Firefox" /></p>
+    <p><img src="$(IMGROOT)/tbb-screenshot3a.png" alt="Screenshot of Firefox"></p>
     
     <p>With the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8).</p>
     
-    <p><img src="$(IMGROOT)/tbb-screenshot3b.png" alt="Screenshot of Pidgin" /></p>
+    <p><img src="$(IMGROOT)/tbb-screenshot3b.png" alt="Screenshot of Pidgin"></p>
     
     <p>To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in <a href="#Usage">"Usage"</a>.</p>
     

Modified: website/trunk/projects/en/torvm.wml
===================================================================
--- website/trunk/projects/en/torvm.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/projects/en/torvm.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -40,7 +40,7 @@
     <p>The <a href="https://svn.torproject.org/svn/torvm/trunk/doc/design.html";>Tor
     VM design document</a> contains additional detail about this work in progress.</p>
     
-    <hr />
+    <hr>
     <a id="Download"></a>
     <h2><a class="anchor" href="#Download">Step One: Download Tor VM Software</a></h2>
     
@@ -52,56 +52,56 @@
     (<a href="dist/TorVM-0.0.2-NetInstaller.exe.asc" style="font-size: 90%;">sig</a>)</li>
     </ul>
     
-    <hr />
+    <hr>
     <a id="Install"></a>
     <h2><a class="anchor" href="#Install">Step Two: Install Tor VM</a></h2>
     
     <p>Double click on the Bundle or Network Installer EXE to begin installation to the
     current system.</p>
     
-    <p><img src="img/bundle02.png" alt="Click to Run Bundle Installer" /></p>
+    <p><img src="img/bundle02.png" alt="Click to Run Bundle Installer"></p>
     
     <p>The network installer contains the secure Tor updater software that is used
     to reliably download all of the latest bundle application packages on demand.</p>
     
-    <p><img src="img/netinst02.png" alt="Network Installer downloads bundle software on demand" /></p>
+    <p><img src="img/netinst02.png" alt="Network Installer downloads bundle software on demand"></p>
     
     
-    <hr />
+    <hr>
     <a id="Run"></a>
     <h2><a class="anchor" href="#Run">Step Three: Run Tor VM</a></h2>
     
     <p>When installation is complete a Tor VM controller is started in
     the background. The installer program has finished and can be closed.</p>
     
-    <p><img src="img/run01.png" alt="Tor VM controller will start at end of install" /></p>
+    <p><img src="img/run01.png" alt="Tor VM controller will start at end of install"></p>
     
     <p>After preparing network devices a Qemu virtual machine running the
     Tor VM kernel is launched with the Vidalia controller. It may take a
     few minutes to bootstrap into the Tor network. Please be patient.</p>
     
-    <p><img src="img/run02.png" alt="Bootstrap not complete until circuit created" /></p>
+    <p><img src="img/run02.png" alt="Bootstrap not complete until circuit created"></p>
     
-    <hr />
+    <hr>
     <a id="RecommendedUse"></a>
     <h2><a class="anchor" href="#RecommendedUse">Step Four: Using Firefox and Torbutton</a></h2>
     
     <p>Once Tor has successfully built a circuit the Switch User menu is presented.
     Firefox and other Tor applications must be run with the "Tor" restricted user account.</p>
     
-    <p><img src="img/tor-user-switch.png" alt="Switch to Tor restricted user account" /></p>
+    <p><img src="img/tor-user-switch.png" alt="Switch to Tor restricted user account"></p>
     
     <p>Start Firefox and click on the Torbutton status icon in the lower right to enable Tor.</p>
     
-    <p><img src="img/torbutton04.png" alt="Click on Torbutton status icon to toggle ON" /></p>
+    <p><img src="img/torbutton04.png" alt="Click on Torbutton status icon to toggle ON"></p>
     
     <p>Verify that you are using Tor via
     <a href="https://check.torproject.org/";>https://check.torproject.org/</a></p>
     
-    <p><img src="img/torbutton05.png" alt="Verify Tor use at check.torproject.org" /></p>
+    <p><img src="img/torbutton05.png" alt="Verify Tor use at check.torproject.org"></p>
     
     
-    <hr />
+    <hr>
     <a id="ExperimentalUse"></a> 
     <h2><a class="anchor" href="#ExperimentalUse">Experimental: Using Flash</a></h2>
     
@@ -110,48 +110,48 @@
     <p>Right click on Torbutton icon at lower right for menu. Select "Preferences..."
     option.</p>
     
-    <p><img src="img/tbprefs.png" alt="Select Torbutton Preferences menu option" /></p>
+    <p><img src="img/tbprefs.png" alt="Select Torbutton Preferences menu option"></p>
     
     <p>Toggle the "Disable plugins..." dynamic content security setting.</p>
     
-    <p><img src="img/tbcontent.png" alt="Toggle disable plugins dynamic content security setting" /></p>
+    <p><img src="img/tbcontent.png" alt="Toggle disable plugins dynamic content security setting"></p>
     
     <p>Connections made from the Browser and Flash Player plugin will now
     be transparently proxied through the Tor network when viewing content.</p>
     
-    <p><img src="img/flash02.png" alt="Flash player and other software now using Tor" /></p>
+    <p><img src="img/flash02.png" alt="Flash player and other software now using Tor"></p>
     
-    <hr />
+    <hr>
     <a id="Shutdown"></a>
     <h2><a class="anchor" href="#Shutdown">Step Five: Shutdown Tor VM</a></h2>
     
     <p>Press The Windows Key + L to switch back to administrator User.</p>
     
-    <p><img src="img/win-el.png" alt="Windows Key + L to switch user" /></p>
+    <p><img src="img/win-el.png" alt="Windows Key + L to switch user"></p>
     
-    <p><img src="img/admin-user-switchback.png" alt="Switch back to admin user account" /></p>
+    <p><img src="img/admin-user-switchback.png" alt="Switch back to admin user account"></p>
     
     <p>Select the Vidalia "Exit" option to shutdown the VM and restore network settings.
     The restricted Tor user will be logged off automatically.</p>
     
-    <p><img src="img/exit-vidalia.png" alt="Select Vidalia Exit option to close VM" /></p>
+    <p><img src="img/exit-vidalia.png" alt="Select Vidalia Exit option to close VM"></p>
     
     <p>Do not close the Tor VM controller window while restoring network settings.</p>
     
-    <p><img src="img/vm-shutdown.png" alt="Do not close the Tor VM window while restoring network settings" /></p>
+    <p><img src="img/vm-shutdown.png" alt="Do not close the Tor VM window while restoring network settings"></p>
     
     
-    <hr />
+    <hr>
     <a id="Remove"></a>
     <h2><a class="anchor" href="#Remove">Uninstall Tor Bundle Software</a></h2>
     
     <p>A script to uninstall all of the Tor bundle applications is placed
     on the desktop. Run this utility to remove all of the Tor software and files.</p>
     
-    <p><img src="img/uninstall.png" alt="The Uninstall_Tor script will remove all Tor packages and files" /></p>
+    <p><img src="img/uninstall.png" alt="The Uninstall_Tor script will remove all Tor packages and files"></p>
     
     
-    <hr />
+    <hr>
     <a id="Debug"></a>
     <h2><a class="anchor" href="#Debug">Troubleshoot Problems and Report Bugs</a></h2>
     

Modified: website/trunk/projects/en/vidalia.wml
===================================================================
--- website/trunk/projects/en/vidalia.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/projects/en/vidalia.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -17,7 +17,7 @@
     
     <!-- BEGIN SIDEBAR -->
     <div class="sidebar-left">
-    <img src="images/Screenshot-Vidalia-Control-Panel.png" width="261" height="255" alt="Vidalia Control Panel Screenshot" />
+    <img src="images/Screenshot-Vidalia-Control-Panel.png" width="261" height="255" alt="Vidalia Control Panel Screenshot">
     </div>
     <!-- END SIDEBAR -->
     

Modified: website/trunk/torbutton/en/index.wml
===================================================================
--- website/trunk/torbutton/en/index.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/torbutton/en/index.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -12,7 +12,7 @@
     <!-- PUT CONTENT AFTER THIS TAG -->
     
     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />
+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml">
     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
     <script type="text/javascript">
     
@@ -84,7 +84,7 @@
     </script>
     
     <h2>Torbutton</h2>
-    <hr />
+    <hr>
     
     <strong>Current version:</strong><version-torbutton><br/>
     <br/>

Modified: website/trunk/torbutton/en/torbutton-faq.wml
===================================================================
--- website/trunk/torbutton/en/torbutton-faq.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/torbutton/en/torbutton-faq.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,10 +13,10 @@
     <!-- PUT CONTENT AFTER THIS TAG -->
     
     <h2>Torbutton FAQ</h2>
-    <hr />
+    <hr>
     
     <h3>Questions</h3>
-    <br />
+    <br>
     <ul>
     <li><a href="<page torbutton/torbutton-faq>#nojavascript">When I toggle Tor, my sites that use javascript stop working. Why?</a></li>
     <li><a href="<page torbutton/torbutton-faq>#noreloads">I can't click on links or hit reload after I toggle Tor! Why?</a></li>
@@ -29,7 +29,7 @@
     <li><a href="<page torbutton/torbutton-faq>#recommendedextensions">Which Firefox extensions do you recommend?</a></li>
     <li><a href="<page torbutton/torbutton-faq>#securityissues">Are there any other issues I should be concerned about?</a></li>
     </ul>
-    <br />
+    <br>
     
     <a id="nojavascript"></a>
     <strong><a class="anchor" href="#nojavascript">When I toggle Tor, my sites that use javascript stop working. Why?</a></strong>

Modified: website/trunk/torbutton/en/torbutton-options.wml
===================================================================
--- website/trunk/torbutton/en/torbutton-options.wml	2010-10-10 01:26:59 UTC (rev 23545)
+++ website/trunk/torbutton/en/torbutton-options.wml	2010-10-10 01:34:47 UTC (rev 23546)
@@ -13,7 +13,7 @@
     <!-- PUT CONTENT AFTER THIS TAG -->
     
     <h2>Torbutton Options</h2>
-    <hr />
+    <hr>
     
     <p>Torbutton 1.2.0 adds several new security features to protect your
     anonymity from all the major threats we know about. The defaults should be