port the changes to the debian-vidalia page as well.
Andrew Lewman

Andrew Lewman commited on 2010-10-21 00:49:57
Zeige 1 geänderte Dateien mit 19 Einfügungen und 9 Löschungen.

... ...
@@ -13,7 +13,7 @@
13 13
 <a id="debian"></a>
14 14
 <a id="packages"></a>
15 15
 <h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
16
-    <br>
16
+<br />
17 17
 
18 18
 <p>
19 19
 <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
... ...
@@ -23,12 +23,22 @@
23 23
 
24 24
 <p>
25 25
 You'll need to set up our package repository before you can fetch
26
-    Vidalia. First, you need to figure out the name of your distribution. If
27
-    you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",
28
-    8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
29
-    Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
26
+Tor. First, you need to figure out the name of your distribution. Here's
27
+a quick mapping:
28
+<ul>
29
+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages</li>
30
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
31
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
32
+<li> Ubuntu 9.04 is "jaunty"</li>
33
+<li> Ubuntu 8.10 is "intrepid"</li>
34
+<li> Ubuntu 8.04 is "hardy"</li> 
35
+<li> Debian Etch is "etch"</li>
36
+<li> Debian Lenny is "lenny"</li>
37
+</ul>
38
+
39
+Then add this line to your
30 40
 <tt>/etc/apt/sources.list</tt>
31
-    file:<br>
41
+file:<br />
32 42
 <pre>
33 43
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
34 44
 </pre>
... ...
@@ -66,11 +76,11 @@
66 76
 <code>vidalia.mirror.youam.de</code>.
67 77
 </p>
68 78
 
69
-    <hr>
79
+<hr />
70 80
 
71 81
 <a id="source"></a>
72 82
 <h2><a class="anchor" href="#source">Building from source</a></h2>
73
-    <br>
83
+<br />
74 84
 
75 85
 <p>
76 86
 If you want to build your own debs from source you must first add an
... ...
@@ -104,7 +114,7 @@
104 114
 instructions.
105 115
 </p>
106 116
 
107
-    <hr>
117
+<hr />
108 118
 
109 119
 <p>If you have suggestions for improving this document, please <a
110 120
 href="<page about/contact>">send them to us</a>. Thanks!</p>
111 121