]> git.sur5r.net Git - i3/i3.github.io/commitdiff
projects / i3 / i3.github.io / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0469e6)
repositories: create separate files instead of using /etc/apt/{preferences,sources...
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 30 Jun 2012 16:38:03 +0000 (18:38 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 30 Jun 2012 16:38:56 +0000 (18:38 +0200)
_docs/repositories patch | blob | history
docs/repositories.html patch | blob | history

diff --git a/_docs/repositories b/_docs/repositories
index 9846679e8565b0822c9db7ccd1ebcdc8ef71eb8e..f1d9c5de54e9a7fb629337f1821ad38e8ebe6b4b 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>
+June 2012
 
 == When should you use our repositories?
 
@@ -64,7 +64,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 +78,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+.
diff --git a/docs/repositories.html b/docs/repositories.html
index 66bacd4c31e8464f9f4d847062189539f0880266..32131c9a9cae76bedcd0cb2166633da868bcf7a3 100644 (file)
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -4,7 +4,7 @@
 <head>\r
 <link rel="icon" type="image/png" href="/favicon.png">\r
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 8.6.4" />\r
+<meta name="generator" content="AsciiDoc 8.6.6" />\r
 <title>i3: Debian and Ubuntu repositories</title>\r
 <link rel="stylesheet" href="/css/style.css" type="text/css" />\r
 <link rel="stylesheet" href="/css/xhtml11.css" type="text/css" />\r
@@ -30,8 +30,8 @@ window.onload = function(){asciidoc.footnotes();}
 <div id="header">\r
 <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">November 2011</span>\r
+<span id="email"><tt>&lt;<a href="mailto:michael@i3wm.org">michael@i3wm.org</a>&gt;</tt></span><br />\r
+<span id="revdate">June 2012</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
@@ -117,7 +117,7 @@ is oneiric 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;&gt; /etc/apt/sources.list\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
@@ -132,15 +132,15 @@ minutes after every commit. To use it, run the following commands:</p></div>
 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
+your distribution, create the file\r
+<tt>/etc/apt/preferences.d/00-i3-autobuild.pref</tt> with the following contents:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>Package: *\r
+<pre><tt>Package: i3*\r
 Pin: origin "build.i3wm.org"\r
 Pin-Priority: 1001</tt></pre>\r
 </div></div>\r
-<div class="paragraph"><p>Then, install <tt>i3</tt>.</p></div>\r
+<div class="paragraph"><p>Then, run <tt>apt-get update</tt> and install <tt>i3</tt>.</p></div>\r
 </div>\r
 </div>\r
 </div>\r
i3wm.org