[or-cvs] r20019: {website} migrate the debian directions to a real web page (in website/trunk: docs/en en fr)

arma at seul.org arma at seul.org
Tue Jul 14 23:00:00 UTC 2009


Author: arma
Date: 2009-07-14 19:00:00 -0400 (Tue, 14 Jul 2009)
New Revision: 20019

Added:
   website/trunk/docs/en/debian.wml
Modified:
   website/trunk/docs/en/tor-doc-unix.wml
   website/trunk/en/download-unix.wml
   website/trunk/en/verifying-signatures.wml
   website/trunk/fr/easy-download.wml
Log:
migrate the debian directions to a real web page


Added: website/trunk/docs/en/debian.wml
===================================================================
--- website/trunk/docs/en/debian.wml	                        (rev 0)
+++ website/trunk/docs/en/debian.wml	2009-07-14 23:00:00 UTC (rev 20019)
@@ -0,0 +1,130 @@
+## translation metadata
+# Revision: $Revision: 19802 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor: Debian/Ubuntu Instructions"
+
+<div class="center">
+
+<div class="main-column">
+
+<a id="debian"></a>
+<h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny,
+Debian sid, or Debian testing</a></h2>
+<br />
+
+<p>
+If you're using Debian stable (lenny), unstable (sid), or testing
+(squeeze), just run<br />
+<tt>apt-get install tor tor-geoipdb</tt>
+</p>
+
+<p>
+Now Tor is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix"
+instructions.
+</p>
+
+<hr />
+
+<a id="ubuntu"></a>
+<a id="packages"></a>
+<h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
+Debian etch</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. If
+you're using Ubuntu 9.04, it's "jaunty". Ubuntu 8.10 is "intrepid",
+and Ubuntu 8.04 is "hardy". If you're using Debian etch, it's "etch".
+Then add these lines to your <tt>/etc/apt/sources.list</tt> file:<br />
+<pre>
+deb     http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+</pre>
+where you substitute the above word (etch, jaunty, intrepid, hardy)
+in place of &lt;DISTRIBUTION&gt;.
+</p>
+
+<p>
+Then run
+<pre>
+gpg --keyserver keys.gnupg.net --recv 94C09C7F
+gpg --export 94C09C7F | sudo apt-key add -
+apt-get update
+apt-get install tor tor-geoipdb
+</pre>
+<p>
+
+<p>
+Now Tor is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix"
+instructions.
+</p>
+
+<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 />
+
+<p>If you want to use the <a href="<page
+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 />
+<pre>
+deb     http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+deb-src http://mirror.noreply.org/pub/tor &lt;DISTRIBUTION&gt; main
+deb http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
+deb-src http://mirror.noreply.org/pub/tor experimental-0.2.1.x-&lt;DISTRIBUTION&gt; main
+</pre>
+where you substitute the name of your distro (etch, lenny, sid, jaunty,
+intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
+</p>
+
+<p>
+Then run
+<pre>
+gpg --keyserver keys.gnupg.net --recv 94C09C7F
+gpg --export 94C09C7F | sudo apt-key add -
+apt-get update
+apt-get install tor tor-geoipdb
+</pre>
+<p>
+
+<p>
+Now Tor is installed and running. Move on to <a href="<page
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix"
+instructions.
+</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, see our <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian#BuildFromSource">guide
+for building debs</a>.
+</p>
+
+<hr />
+
+<p>If you have suggestions for improving this document, please <a
+href="<page contact>">send them to us</a>. Thanks!</p>
+
+  </div><!-- #main -->
+</div>
+
+#include <foot.wmi>
+


Property changes on: website/trunk/docs/en/debian.wml
___________________________________________________________________
Added: svn:keywords:Author Date Id Revision
   + 
Added: svn:eol-style
   + native

Modified: website/trunk/docs/en/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/en/tor-doc-unix.wml	2009-07-14 22:36:37 UTC (rev 20018)
+++ website/trunk/docs/en/tor-doc-unix.wml	2009-07-14 23:00:00 UTC (rev 20019)
@@ -28,8 +28,7 @@
 href="<page download-unix>">download</a> page. We have packages for Debian,
 Red Hat, Gentoo, *BSD, etc there too. If you're
 using Ubuntu, don't use the default packages: use <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">our
-deb repository</a> instead.
+href="<page docs/debian>#ubuntu">our deb repository</a> instead.
 </p>
 
 <p>If you're building from source, first install <a

Modified: website/trunk/en/download-unix.wml
===================================================================
--- website/trunk/en/download-unix.wml	2009-07-14 22:36:37 UTC (rev 20018)
+++ website/trunk/en/download-unix.wml	2009-07-14 23:00:00 UTC (rev 20019)
@@ -29,7 +29,7 @@
 <tr>
 <td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>
 <td>Debian, Ubuntu, Knoppix</td>
-<td colspan="2"><a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">noreply.org packages</a>
+<td colspan="2"><a href="<page docs/debian>">noreply.org packages</a>
     </td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a>

Modified: website/trunk/en/verifying-signatures.wml
===================================================================
--- website/trunk/en/verifying-signatures.wml	2009-07-14 22:36:37 UTC (rev 20018)
+++ website/trunk/en/verifying-signatures.wml	2009-07-14 23:00:00 UTC (rev 20019)
@@ -130,8 +130,7 @@
 
 <p>If you are running Tor on Debian you should read the instructions on
 <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">importing
-these keys to apt</a>.</p>
+href="<page docs/debian>#packages">importing these keys to apt</a>.</p>
 
 </div><!-- #main -->
 

Modified: website/trunk/fr/easy-download.wml
===================================================================
--- website/trunk/fr/easy-download.wml	2009-07-14 22:36:37 UTC (rev 20018)
+++ website/trunk/fr/easy-download.wml	2009-07-14 23:00:00 UTC (rev 20019)
@@ -7,7 +7,7 @@
 
 <div class="main-column">
 
-<h3>Télécharger maintenant - Gratuit & Logiciel Open Source</h3>
+<h3>Télécharger maintenant - Gratuit &amp; Logiciel Open Source</h3>
 <hr />
 <table width="99%" border="0" cellspacing="0" cellpadding="3">
 <tr>



More information about the tor-commits mailing list