repositories: update instructions, add ubuntu autobuilder

diff --git a/_docs/repositories b/_docs/repositories
index 035666ec37ed28255279c0c7cd0071aaf4226b29..c51adcab82a338f7f09bb4234f3e5b921f3b7628 100644 (file)
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -20,13 +20,16 @@ You are using Ubuntu::
     synchronized periodically from Debian, every 6 months. Therefore, Ubuntu
     often includes old versions of i3. You should use our Ubuntu repository.
 You want the latest i3 development version::
-    If you are using Debian (Debian-derived systems might work, too) and want
-    the latest development version of i3, you should use our Debian repository.
+    If you are using Debian (Debian-derived systems might work, too) or Ubuntu
+    and want the latest development version of i3, you should use our Debian
+    repository.
 
 == Ubuntu repository
 
-The Ubuntu repository is provided by sur5r and contains the latest stable release
-of i3. To use it, run the following commands:
+=== Stable releases
+
+This Ubuntu repository is provided by sur5r and contains the latest stable
+release of i3. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------
 # echo 'deb http://debian.sur5r.net/i3/ natty universe' >> /etc/apt/sources.list
@@ -39,17 +42,41 @@ of i3. To use it, run the following commands:
 The following Ubuntu versions are currently available: maverick, natty, oneiric,
 precise.
 
+=== Development releases
+
+This Ubuntu repository contains packages which are automatically built a few
+minutes after every commit. To use it, run the following commands:
+
+---------------------------------------------------------------------------------
+# echo 'deb http://build.i3wm.org/ubuntu/oneiric oneiric main' >> /etc/apt/sources.list
+# apt-get update
+# apt-get --allow-unauthenticated install i3-autobuild-keyring
+# apt-get update
+# apt-get install i3
+---------------------------------------------------------------------------------
+
+Development versions are only available for the latest version of Ubuntu, which
+is oneiric at the moment.
+
 == Debian repository
 
 Our Debian repository contains packages which are automatically built a few
 minutes after every commit. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------
-# echo 'deb http://build.i3wm.org/debian/i3-wm sid main' >> /etc/apt/sources.list
+# echo 'deb http://build.i3wm.org/debian/sid sid main' >> /etc/apt/sources.list
+# apt-get update
+# apt-get --allow-unauthenticated install i3-autobuild-keyring
 # apt-get update
-# apt-get install i3-wm
+# apt-get install i3
 ---------------------------------------------------------------------------------
 
+== Preferring the autobuilder version of i3
+
+On installations where you have multiple sources (stable and testing, or
+testing and unstable for example), +apt-get install i3+ might not get you the
+autobuilder version.
+
 To ensure that the autobuilt i3 packages will be preferred to the packages of
 your distribution, put the following entry *at the beginning* of your
 +/etc/apt/preferences+:
@@ -60,4 +87,4 @@ Pin: origin "build.i3wm.org"
 Pin-Priority: 1001
 ----------------------------
 
-Then, install +i3-wm+.
+Then, install +i3+.

diff --git a/docs/repositories.html b/docs/repositories.html
index f15de1a62d5470ab35b7d4420a3ff19ef51efcb4..943165dfaea9fab0118454f6c87b3fb7d7eda4af 100644 (file)
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -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,8 +78,10 @@ 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
@@ -90,6 +93,22 @@ of i3. To use it, run the following commands:</p></div>
 <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>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
 <h2 id="_debian_repository">3. Debian repository</h2>\r
@@ -98,10 +117,20 @@ precise.</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 --allow-unauthenticated install i3-autobuild-keyring\r
 # apt-get update\r
-# apt-get install i3-wm</tt></pre>\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
@@ -111,7 +140,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