create a mapping of distro to DISTRIBUTION for confused users. Specifically add in Trisquel.
Andrew Lewman

Andrew Lewman commited on 2010-09-21 22:39:38
Zeige 2 geänderte Dateien mit 27 Einfügungen und 11 Löschungen.

... ...
@@ -21,10 +21,19 @@ fixes.
21 21
 
22 22
 <p>
23 23
 You'll need to set up our package repository before you can fetch
24
-Vidalia. First, you need to figure out the name of your distribution. If
25
-you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",
26
-8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
27
-Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
24
+Tor. First, you need to figure out the name of your distribution. Here's
25
+a quick mapping:
26
+<ul>
27
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
28
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
29
+<li> Ubuntu 9.04 is "jaunty"</li>
30
+<li> Ubuntu 8.10 is "intrepid"</li>
31
+<li> Ubuntu 8.04 is "hardy"</li> 
32
+<li> Debian Etch is "etch"</li>
33
+<li> Debian Lenny is "lenny"</li>
34
+</ul>
35
+
36
+Then add this line to your
28 37
 <tt>/etc/apt/sources.list</tt>
29 38
 file:<br />
30 39
 <pre>
... ...
@@ -48,18 +48,25 @@ fixes.
48 48
 
49 49
 <p>
50 50
 You'll need to set up our package repository before you can fetch
51
-Tor. First, you need to figure out the name of your distribution. If
52
-you're using Ubuntu 10.04 it's "lucid", 9.10 is  "karmic", 9.04 is "jaunty",
53
-8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
54
-Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
51
+Tor. First, you need to figure out the name of your distribution. Here's
52
+a quick mapping:
53
+<ul>
54
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
55
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
56
+<li> Ubuntu 9.04 is "jaunty"</li>
57
+<li> Ubuntu 8.10 is "intrepid"</li>
58
+<li> Ubuntu 8.04 is "hardy"</li> 
59
+<li> Debian Etch is "etch"</li>
60
+<li> Debian Lenny is "lenny"</li>
61
+</ul>
62
+
63
+Then add this line to your
55 64
 <tt>/etc/apt/sources.list</tt>
56 65
 file:<br />
57 66
 <pre>
58 67
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
59 68
 </pre>
60
-where you put the codename of your distribution (i.e. etch, lenny, sid,
61
-lucid, karmic,
62
-jaunty, intrepid, hardy or whatever it is) in place of &lt;DISTRIBUTION&gt;.
69
+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 &lt;DISTRIBUTION&gt;.
63 70
 </p>
64 71
 
65 72
 <p>
66 73