revisit the debian instructions to include ubuntu distros to stop confusing users with their crazy animals.
Andrew Lewman

Andrew Lewman commited on 2010-10-21 00:45:09
Zeige 1 geänderte Dateien mit 32 Einfügungen und 22 Löschungen.

... ...
@@ -13,11 +13,11 @@
13 13
 <a id="debian"></a>
14 14
 <h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny,
15 15
 Debian sid, or Debian testing</a></h2>
16
-    <br>
16
+<br />
17 17
 
18 18
 <p>
19 19
 If you're using Debian stable (lenny), unstable (sid), or testing
20
-    (squeeze), just run<br>
20
+(squeeze), just run<br />
21 21
 <tt>apt-get install tor tor-geoipdb</tt>
22 22
 as root.
23 23
 </p>
... ...
@@ -34,13 +34,13 @@
34 34
 instructions.
35 35
 </p>
36 36
 
37
-    <hr>
37
+<hr />
38 38
 
39 39
 <a id="ubuntu"></a>
40 40
 <a id="packages"></a>
41 41
 <h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
42 42
 Debian</a></h2>
43
-    <br>
43
+<br />
44 44
 
45 45
 <p>
46 46
 <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
... ...
@@ -50,17 +50,26 @@
50 50
 
51 51
 <p>
52 52
 You'll need to set up our package repository before you can fetch
53
-    Tor. First, you need to figure out the name of your distribution. If
54
-    you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",
55
-    8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
56
-    Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
53
+Tor. First, you need to figure out the name of your distribution. Here's
54
+a quick mapping:
55
+<ul>
56
+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages for now</li>
57
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
58
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
59
+<li> Ubuntu 9.04 is "jaunty"</li>
60
+<li> Ubuntu 8.10 is "intrepid"</li>
61
+<li> Ubuntu 8.04 is "hardy"</li> 
62
+<li> Debian Etch is "etch"</li>
63
+<li> Debian Lenny is "lenny"</li>
64
+</ul>
65
+
66
+Then add this line to your
57 67
 <tt>/etc/apt/sources.list</tt>
58
-    file:<br>
68
+file:<br />
59 69
 <pre>
60 70
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
61 71
 </pre>
62
-    where you put the codename of your distribution (i.e. etch, lenny, sid, karmic,
63
-    jaunty, intrepid, hardy or whatever it is) in place of &lt;DISTRIBUTION&gt;.
72
+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;.
64 73
 </p>
65 74
 
66 75
 <p>
... ...
@@ -71,7 +80,7 @@
71 80
 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
72 81
 </pre>
73 82
 Now refresh your sources and install Tor by running the following
74
-    commands at your command prompt:
83
+commands (as root) at your command prompt:
75 84
 <pre>
76 85
 apt-get update
77 86
 apt-get install tor tor-geoipdb
... ...
@@ -93,22 +102,22 @@
93 102
 <code>tor.mirror.youam.de</code>.
94 103
 </p>
95 104
 
96
-    <hr>
105
+<hr />
97 106
 
98 107
 <a id="development"></a>
99 108
 <h2><a class="anchor" href="#development">Option three: Using the
100 109
 development branch of Tor on Debian or Ubuntu</a></h2>
101
-    <br>
110
+<br />
102 111
 
103
-    <p>If you want to use the <a href="<page
104
-    download/download>#packagediff">development branch</a> of Tor instead (more
112
+<p>If you want to use the <a href="<page download/download>#packagediff">development branch</a> of Tor instead (more
105 113
 features and more bugs), you need to add a different set of lines to
106
-    your <tt>/etc/apt/sources.list</tt> file:<br>
114
+your <tt>/etc/apt/sources.list</tt> file:<br />
107 115
 <pre>
108 116
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
109 117
 deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
110 118
 </pre>
111
-    where you again substitute the name of your distro (etch, lenny, sid, karmic,
119
+where you again substitute the name of your distro (etch, lenny, sid,
120
+lucid, karmic,
112 121
 jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
113 122
 </p>
114 123
 
... ...
@@ -128,11 +137,11 @@
128 137
 instructions.
129 138
 </p>
130 139
 
131
-    <hr>
140
+<hr />
132 141
 
133 142
 <a id="source"></a>
134 143
 <h2><a class="anchor" href="#source">Building from source</a></h2>
135
-    <br>
144
+<br />
136 145
 
137 146
 <p>
138 147
 If you want to build your own debs from source you must first add an
... ...
@@ -171,12 +180,13 @@
171 180
 instructions.
172 181
 </p>
173 182
 
174
-    <hr>
183
+<hr />
175 184
 
176 185
 <p>If you have suggestions for improving this document, please <a
177 186
 href="<page about/contact>">send them to us</a>. Thanks!</p>
178
-  </div>
187
+
179 188
 <!-- END MAIN COL -->
189
+  </div>
180 190
   <div id = "sidecol">
181 191
 #include "side.wmi"
182 192
 #include "info.wmi"
183 193