update header to contain FAQ link, fix issues link (Thanks iosonofabio)

[i3/i3.github.io] / _docs / repositories

diff --git a/_docs/repositories b/_docs/repositories
index 9846679e8565b0822c9db7ccd1ebcdc8ef71eb8e..eda91f099da6f1f9e1b18966111791ea3007b0b3 100644 (file)
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -1,7 +1,7 @@
 Debian and Ubuntu repositories
 ==============================
-Michael Stapelberg <michael+i3@stapelberg.de>
-November 2011
+Michael Stapelberg <michael@i3wm.org>
+July 2013
 
 == When should you use our repositories?
 
@@ -15,6 +15,9 @@ You are using Debian stable::
     in Debian stable can be old, however (we cannot update it after stable has
     been released). The best way is to add Debian testing and tell +apt+ to
     prefer Debian stable. You should *not* use our repository.
+    Alternatively, you can also use
+    link:http://backports.debian.org/[stable-backports (e.g. wheezy-backports for
+    Debian wheezy)].
 You are using Ubuntu::
     Only a handful of packages are maintained by Ubuntu developers. The rest is
     synchronized periodically from Debian, every 6 months. Therefore, Ubuntu
@@ -39,8 +42,8 @@ release of i3. To use it, run the following commands:
 # apt-get install i3
 ---------------------------------------------------------------------------------
 
-The following Ubuntu versions are currently available: maverick, natty, oneiric,
-precise.
+The following Ubuntu versions are currently available: oneiric, precise, quantal,
+raring, saucy, trusty.
 
 === Development releases
 
@@ -48,7 +51,7 @@ 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
+# echo 'deb http://build.i3wm.org/ubuntu/trusty trusty main' >> /etc/apt/sources.list
 # apt-get update
 # apt-get --allow-unauthenticated install i3-autobuild-keyring
 # apt-get update
@@ -56,7 +59,7 @@ minutes after every commit. To use it, run the following commands:
 ---------------------------------------------------------------------------------
 
 Development versions are only available for the latest version of Ubuntu, which
-is oneiric at the moment.
+is trusty at the moment.
 
 == Debian repository
 
@@ -64,7 +67,7 @@ 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/sid sid main' >> /etc/apt/sources.list
+# echo 'deb http://build.i3wm.org/debian/sid sid main' > /etc/apt/sources.list.d/i3-autobuild.list
 # apt-get update
 # apt-get --allow-unauthenticated install i3-autobuild-keyring
 # apt-get update
@@ -78,13 +81,13 @@ 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+:
+your distribution, create the file
++/etc/apt/preferences.d/00-i3-autobuild.pref+ with the following contents:
 
 ----------------------------
-Package: *
+Package: i3*
 Pin: origin "build.i3wm.org"
 Pin-Priority: 1001
 ----------------------------
 
-Then, install +i3+.
+Then, run +apt-get update+ and install +i3+.