From: Michael Stapelberg
Date: Sat, 30 Jun 2012 16:38:03 +0000 (+0200)
Subject: repositories: create separate files instead of using /etc/apt/{preferences,sources...
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a4f0a35530876feef68a2343c7c25b1175aeae50;p=i3%2Fi3.github.io
repositories: create separate files instead of using /etc/apt/{preferences,sources.list} (Thanks bremner)
---
diff --git a/_docs/repositories b/_docs/repositories
index 9846679..f1d9c5d 100644
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -1,7 +1,7 @@
Debian and Ubuntu repositories
==============================
-Michael Stapelberg
-November 2011
+Michael Stapelberg
+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 66bacd4..32131c9 100644
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -4,7 +4,7 @@
-
+
i3: Debian and Ubuntu repositories
@@ -30,8 +30,8 @@ window.onload = function(){asciidoc.footnotes();}
# 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
@@ -132,15 +132,15 @@ minutes after every commit. To use it, run the following commands:
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: