tor-webwml.git

@@ -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

@@ -50,17 +50,26 @@

 <p>

 You'll need to set up our package repository before you can fetch

-    Tor. First, you need to figure out the name of your distribution. If

-    you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",

-    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

+Tor. First, you need to figure out the name of your distribution. Here's

+a quick mapping:

+<ul>

+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages for now</li>

+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>

+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>

+<li> Ubuntu 9.04 is "jaunty"</li>

+<li> Ubuntu 8.10 is "intrepid"</li>

+<li> Ubuntu 8.04 is "hardy"</li> 

+<li> Debian Etch is "etch"</li>

+<li> Debian Lenny is "lenny"</li>

+</ul>

+

+Then add this line to your

 <tt>/etc/apt/sources.list</tt>

-    file:<br>

+file:<br />

 <pre>

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 </pre>

-    where you put the codename of your distribution (i.e. etch, lenny, sid, karmic,

-    jaunty, intrepid, hardy or whatever it is) in place of <DISTRIBUTION>.

+where you put the codename of your distribution (i.e. etch, lenny, sid, lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place of <DISTRIBUTION>.

 </p>

 <p>

@@ -71,7 +80,7 @@

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 </pre>

 Now refresh your sources and install Tor by running the following

-    commands at your command prompt:

+commands (as root) at your command prompt:

 <pre>

 apt-get update

 apt-get install tor tor-geoipdb

@@ -93,22 +102,22 @@

 <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

+<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 <DISTRIBUTION> main

 deb     http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main

 </pre>

-    where you again substitute the name of your distro (etch, lenny, sid, karmic,

+where you again substitute the name of your distro (etch, lenny, sid,

+lucid, karmic,

 jaunty, intrepid, hardy) in place of <DISTRIBUTION>.

 </p>

@@ -128,11 +137,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,12 +180,13 @@

 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>

-  </div>

+

 <!-- END MAIN COL -->

+  </div>

   <div id = "sidecol">

 #include "side.wmi"

 #include "info.wmi"