Update ubuntu repository instructions as well

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

diff --git a/_docs/repositories b/_docs/repositories
index 77bac3e33304e310c2e48e70dd9455ed5dc9f732..d70c7d2461ed23a8a2655d537cc42a8ea0c3b730 100644 (file)
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -1,16 +1,15 @@
 Debian and Ubuntu repositories
 ==============================
 Michael Stapelberg <michael@i3wm.org>
-July 2013
+September 2016
 
 == When should you use our repositories?
 
 In general, you should use the repositories of your distribution. Adding
 third-party repositories to your +/etc/sources.list+ has security implications
-and makes your +apt-get update+ take longer. However, in some cases, using our
-repositories makes sense:
+and makes your +apt-get update+ take longer.
 
-You are using Debian stable::
+If you are using Debian stable::
     The latest version of i3 will be in Debian testing quite soon. The version
     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
@@ -18,11 +17,11 @@ You are using Debian stable::
     Alternatively, you can also use
     link:http://backports.debian.org/[stable-backports (e.g. wheezy-backports for
     Debian wheezy)].
-You are using Ubuntu::
+If 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
     often includes old versions of i3. You should use our Ubuntu repository.
-You want the latest i3 development version::
+If you want the latest i3 development version::
     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.
@@ -53,15 +52,15 @@ 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/trusty trusty main' >> /etc/apt/sources.list
-# apt-get update
-# apt-get --allow-unauthenticated install i3-autobuild-keyring
-# apt-get update
-# apt-get install i3
+$ /usr/lib/apt/apt-helper download-file http://dl.bintray.com/i3/i3-autobuild-ubuntu/pool/main/i/i3-autobuild-keyring/i3-autobuild-keyring_2016.10.01_all.deb keyring.deb SHA256:460e8c7f67a6ae7c3996cc8a5915548fe2fee9637b1653353ec62b954978d844
+# apt install ./keyring.deb
+# echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list
+# apt update
+# apt install i3
 ---------------------------------------------------------------------------------
 
 Development versions are only available for the latest version of Ubuntu, which
-is trusty at the moment.
+is xenial at the moment.
 
 == Debian repository
 
@@ -69,11 +68,11 @@ 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.d/i3-autobuild.list
-# apt-get update
-# apt-get --allow-unauthenticated install i3-autobuild-keyring
-# apt-get update
-# apt-get install i3
+$ /usr/lib/apt/apt-helper download-file http://dl.bintray.com/i3/i3-autobuild/pool/main/i/i3-autobuild-keyring/i3-autobuild-keyring_2016.10.01_all.deb keyring.deb SHA256:460e8c7f67a6ae7c3996cc8a5915548fe2fee9637b1653353ec62b954978d844
+# apt install ./keyring.deb
+# echo 'deb http://dl.bintray.com/i3/i3-autobuild sid main' > /etc/apt/sources.list.d/i3-autobuild.list
+# apt update
+# apt install i3
 ---------------------------------------------------------------------------------
 
 == Preferring the autobuilder version of i3
@@ -88,7 +87,7 @@ your distribution, create the file
 
 ----------------------------
 Package: i3*
-Pin: origin "build.i3wm.org"
+Pin: origin "dl.bintray.com"
 Pin-Priority: 1001
 ----------------------------