Update ubuntu repository instructions as well

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

diff --git a/docs/repositories.html b/docs/repositories.html
index 4fb5dd22f585492bd7375152b1691c6a78d6298e..92795b3bc81240340a7536477c8a274d8afbffb8 100644 (file)
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -22,7 +22,7 @@ document.addEventListener("DOMContentLoaded", function(){asciidoc.footnotes();},
                         <ul id="nav">\r
                                 <li><a style="border-bottom: 2px solid #fff" href="/docs">Docs</a></li>\r
                                 <li><a href="/screenshots">Screens</a></li>\r
-                                <li><a href="https://faq.i3wm.org/">FAQ</a></li>\r
+                                <li><a href="https://www.reddit.com/r/i3wm/">FAQ</a></li>\r
                                 <li><a href="/contact">Contact</a></li>\r
                                 <li><a href="https://github.com/i3/i3/issues">Bugs</a></li>\r
                         </ul>\r
@@ -32,18 +32,17 @@ document.addEventListener("DOMContentLoaded", 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@i3wm.org">michael@i3wm.org</a>&gt;</tt></span><br />\r
-<span id="revdate">July 2013</span>\r
+<span id="revdate">September 2016</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
 <div class="sectionbody">\r
 <div class="paragraph"><p>In general, you should use the repositories of your distribution. Adding\r
 third-party repositories to your <tt>/etc/sources.list</tt> has security implications\r
-and makes your <tt>apt-get update</tt> take longer. However, in some cases, using our\r
-repositories makes sense:</p></div>\r
+and makes your <tt>apt-get update</tt> take longer.</p></div>\r
 <div class="dlist"><dl>\r
 <dt class="hdlist1">\r
-You are using Debian stable\r
+If you are using Debian stable\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -57,7 +56,7 @@ You are using Debian stable
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
-You are using Ubuntu\r
+If you are using Ubuntu\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -67,7 +66,7 @@ You are using Ubuntu
 </p>\r
 </dd>\r
 <dt class="hdlist1">\r
-You want the latest i3 development version\r
+If you want the latest i3 development version\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -104,14 +103,14 @@ this repository. See <a href="https://wiki.ubuntu.com/Releases">Ubuntu releases<
 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/trusty trusty 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
+<pre><tt>$ /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\r
+# apt install ./keyring.deb\r
+# echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' &gt; /etc/apt/sources.list.d/i3-autobuild.list\r
+# apt update\r
+# apt 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 trusty at the moment.</p></div>\r
+is xenial at the moment.</p></div>\r
 </div>\r
 </div>\r
 </div>\r
@@ -122,11 +121,11 @@ is trusty at the moment.</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/sid sid main' &gt; /etc/apt/sources.list.d/i3-autobuild.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
+<pre><tt>$ /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\r
+# apt install ./keyring.deb\r
+# echo 'deb http://dl.bintray.com/i3/i3-autobuild sid main' &gt; /etc/apt/sources.list.d/i3-autobuild.list\r
+# apt update\r
+# apt install i3</tt></pre>\r
 </div></div>\r
 </div>\r
 </div>\r
@@ -142,7 +141,7 @@ your distribution, create the file
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>Package: i3*\r
-Pin: origin "build.i3wm.org"\r
+Pin: origin "dl.bintray.com"\r
 Pin-Priority: 1001</tt></pre>\r
 </div></div>\r
 <div class="paragraph"><p>Then, run <tt>apt-get update</tt> and install <tt>i3</tt>.</p></div>\r