update repositories with a command using /etc/lsb-release

[i3/i3.github.io] / docs / repositories.html

diff --git a/docs/repositories.html b/docs/repositories.html
index 5dcdd0d753efd90d75c6e8c2d7364afdcabee49e..58004eec1b35ba82e5572513323603155421d4ad 100644 (file)
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -31,7 +31,7 @@ window.onload = function(){asciidoc.footnotes();}
 <h1>Debian and Ubuntu repositories</h1>\r
 <span id="author">Michael Stapelberg</span><br />\r
 <span id="email"><tt>&lt;<a href="mailto:michael+i3@stapelberg.de">michael+i3@stapelberg.de</a>&gt;</tt></span><br />\r
-<span id="revdate">July 2011</span>\r
+<span id="revdate">November 2011</span>\r
 </div>\r
 <div class="sect1">\r
 <h2 id="_when_should_you_use_our_repositories">1. When should you use our repositories?</h2>\r
@@ -67,8 +67,9 @@ You want the latest i3 development version
 </dt>\r
 <dd>\r
 <p>\r
-    If you are using Debian (Debian-derived systems might work, too) and want\r
-    the latest development version of i3, you should use our Debian repository.\r
+    If you are using Debian (Debian-derived systems might work, too) or Ubuntu\r
+    and want the latest development version of i3, you should use our Debian\r
+    repository.\r
 </p>\r
 </dd>\r
 </dl></div>\r
@@ -77,16 +78,37 @@ You want the latest i3 development version
 <div class="sect1">\r
 <h2 id="_ubuntu_repository">2. Ubuntu repository</h2>\r
 <div class="sectionbody">\r
-<div class="paragraph"><p>The Ubuntu repository is provided by sur5r and contains the latest stable release\r
-of i3. To use it, run the following commands:</p></div>\r
+<div class="sect2">\r
+<h3 id="_stable_releases">2.1. Stable releases</h3>\r
+<div class="paragraph"><p>This Ubuntu repository is provided by sur5r and contains the latest stable\r
+release of i3. To use it, run the following commands:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt># echo 'deb http://debian.sur5r.net/i3/ natty universe' &gt;&gt; /etc/apt/sources.list\r
+<pre><tt># . /etc/lsb-release\r
+# echo "deb http://debian.sur5r.net/i3/ $DISTRIB_CODENAME universe" &gt;&gt; /etc/apt/sources.list\r
 # apt-get update\r
 # apt-get --allow-unauthenticated install sur5r-keyring\r
+# apt-get update\r
+# apt-get install i3</tt></pre>\r
+</div></div>\r
+<div class="paragraph"><p>The following Ubuntu versions are currently available: maverick, natty, oneiric,\r
+precise.</p></div>\r
+</div>\r
+<div class="sect2">\r
+<h3 id="_development_releases">2.2. Development releases</h3>\r
+<div class="paragraph"><p>This Ubuntu repository contains packages which are automatically built a few\r
+minutes after every commit. To use it, run the following commands:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt># echo 'deb http://build.i3wm.org/ubuntu/oneiric oneiric main' &gt;&gt; /etc/apt/sources.list\r
+# apt-get update\r
+# apt-get --allow-unauthenticated install i3-autobuild-keyring\r
+# apt-get update\r
 # apt-get install i3</tt></pre>\r
 </div></div>\r
-<div class="paragraph"><p>The following Ubuntu versions are currently available: maverick, natty.</p></div>\r
+<div class="paragraph"><p>Development versions are only available for the latest version of Ubuntu, which\r
+is oneiric at the moment.</p></div>\r
+</div>\r
 </div>\r
 </div>\r
 <div class="sect1">\r
@@ -96,10 +118,20 @@ of i3. To use it, run the following commands:</p></div>
 minutes after every commit. To use it, run the following commands:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt># echo 'deb http://build.i3wm.org/debian/i3-wm sid main' &gt;&gt; /etc/apt/sources.list\r
+<pre><tt># echo 'deb http://build.i3wm.org/debian/sid sid main' &gt;&gt; /etc/apt/sources.list\r
 # apt-get update\r
-# apt-get install i3-wm</tt></pre>\r
+# apt-get --allow-unauthenticated install i3-autobuild-keyring\r
+# apt-get update\r
+# apt-get install i3</tt></pre>\r
 </div></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
+<h2 id="_preferring_the_autobuilder_version_of_i3">4. Preferring the autobuilder version of i3</h2>\r
+<div class="sectionbody">\r
+<div class="paragraph"><p>On installations where you have multiple sources (stable and testing, or\r
+testing and unstable for example), <tt>apt-get install i3</tt> might not get you the\r
+autobuilder version.</p></div>\r
 <div class="paragraph"><p>To ensure that the autobuilt i3 packages will be preferred to the packages of\r
 your distribution, put the following entry <strong>at the beginning</strong> of your\r
 <tt>/etc/apt/preferences</tt>:</p></div>\r
@@ -109,7 +141,7 @@ your distribution, put the following entry <strong>at the beginning</strong> of
 Pin: origin "build.i3wm.org"\r
 Pin-Priority: 1001</tt></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Then, install <tt>i3-wm</tt>.</p></div>\r
+<div class="paragraph"><p>Then, install <tt>i3</tt>.</p></div>\r
 </div>\r
 </div>\r
 </div>\r