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

[or-cvs] r23658: {website} port the changes to the debian-vidalia page as well. (website/trunk/docs/en)



Author: phobos
Date: 2010-10-20 22:49:57 +0000 (Wed, 20 Oct 2010)
New Revision: 23658

Modified:
   website/trunk/docs/en/debian-vidalia.wml
Log:
port the changes to the debian-vidalia page as well.


Modified: website/trunk/docs/en/debian-vidalia.wml
===================================================================
--- website/trunk/docs/en/debian-vidalia.wml	2010-10-20 22:45:09 UTC (rev 23657)
+++ website/trunk/docs/en/debian-vidalia.wml	2010-10-20 22:49:57 UTC (rev 23658)
@@ -10,104 +10,115 @@
     <a href="<page docs/debian-vidalia>">Vidalia Debian/Ubuntu Instructions</a>
   </div>
   <div id="maincol"> 
-    <a id="debian"></a>
-    <a id="packages"></a>
-    <h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
-    <br>
-    
-    <p>
-    <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
-    and out of date. That means you'll be missing stability and security
-    fixes.
-    </p>
-    
-    <p>
-    You'll need to set up our package repository before you can fetch
-    Vidalia. 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
-    <tt>/etc/apt/sources.list</tt>
-    file:<br>
-    <pre>
-    deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
-    </pre>
-    where you substitute the above word (etch, lenny, sid, karmic, jaunty,
-    intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
-    </p>
-    
-    <p>
-    Then add the gpg key used to sign the packages by running the following
-    commands at your command prompt:
-    <pre>
-    gpg --keyserver keys.gnupg.net --recv 886DDD89
-    gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
-    </pre>
-    Now refresh your sources and install Vidalia by running the following
-    commands at your command prompt:
-    <pre>
-    apt-get update
-    apt-get install vidalia 
-    </pre>
-    </p>
-    
-    <p>
-    Now Vidalia is installed and running. Move on to <a href="<page
-    docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
-    instructions.
-    </p>
-    
-    <p style="font-size: small">
-    The DNS name <code>deb.torproject.org</code> is actually a set of independent
-    servers in a DNS round robin configuration.  If you for some reason cannot
-    access it you might try to use the name of one of its part instead.  Try
-    <code>deb-master.torproject.org</code>,
-    <code>mirror.netcologne.de</code> or
-    <code>vidalia.mirror.youam.de</code>.
-    </p>
-    
-    <hr>
-    
-    <a id="source"></a>
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
-    <br>
-    
-    <p>
-    If you want to build your own debs from source you must first add an
-    appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
-    <pre>
-    deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
-    </pre>
-    You also need to install the necessary packages to build your own debs and the
-    packages needed to build Vidalia:
-    <pre>
-    apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake
-    apt-get build-dep vidalia
-    </pre>
-    Then you can build Vidalia in ~/debian-packages:
-    <pre>
-    mkdir ~/debian-packages; cd ~/debian-packages
-    apt-get source vidalia
-    cd vidalia-*
-    debuild -rfakeroot -uc -us
-    cd ..
-    </pre>
-    Now you can install the new package:
-    <pre>
-    sudo dpkg -i vidalia_*.deb
-    </pre>
-    </p>
-    
-    <p>
-    Now Vidalia is installed and running. Move on to <a href="<page
-    docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
-    instructions.
-    </p>
-    
-    <hr>
-    
-    <p>If you have suggestions for improving this document, please <a
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
+<a id="debian"></a>
+<a id="packages"></a>
+<h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
+<br />
+
+<p>
+<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
+and out of date. That means you'll be missing stability and security
+fixes.
+</p>
+
+<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. Here's
+a quick mapping:
+<ul>
+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages</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 />
+<pre>
+deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
+</pre>
+where you substitute the above word (etch, lenny, sid, karmic, jaunty,
+intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
+</p>
+
+<p>
+Then add the gpg key used to sign the packages by running the following
+commands at your command prompt:
+<pre>
+gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+</pre>
+Now refresh your sources and install Vidalia by running the following
+commands at your command prompt:
+<pre>
+apt-get update
+apt-get install vidalia 
+</pre>
+</p>
+
+<p>
+Now Vidalia is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
+instructions.
+</p>
+
+<p style="font-size: small">
+The DNS name <code>deb.torproject.org</code> is actually a set of independent
+servers in a DNS round robin configuration.  If you for some reason cannot
+access it you might try to use the name of one of its part instead.  Try
+<code>deb-master.torproject.org</code>,
+<code>mirror.netcologne.de</code> or
+<code>vidalia.mirror.youam.de</code>.
+</p>
+
+<hr />
+
+<a id="source"></a>
+<h2><a class="anchor" href="#source">Building from source</a></h2>
+<br />
+
+<p>
+If you want to build your own debs from source you must first add an
+appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
+<pre>
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
+</pre>
+You also need to install the necessary packages to build your own debs and the
+packages needed to build Vidalia:
+<pre>
+apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake
+apt-get build-dep vidalia
+</pre>
+Then you can build Vidalia in ~/debian-packages:
+<pre>
+mkdir ~/debian-packages; cd ~/debian-packages
+apt-get source vidalia
+cd vidalia-*
+debuild -rfakeroot -uc -us
+cd ..
+</pre>
+Now you can install the new package:
+<pre>
+sudo dpkg -i vidalia_*.deb
+</pre>
+</p>
+
+<p>
+Now Vidalia is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
+instructions.
+</p>
+
+<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 MAINCOL -->
   <div id = "sidecol">