Merge commit 'jamie/master'

[monkeysphere.git] / doc / README

diff --git a/doc/README b/doc/README
index 544465f27aed9f144c21f52681fa07235acebe09..3be3c72c133c4c57ecd58d33b7484bafbfbbcd23 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -99,32 +99,6 @@ to /etc/apt/sources.list.d/monkeysphere.list:
                deb http://monkeysphere.info/debian experimental gnutls
                deb-src http://monkeysphere.info/debian experimental gnutls
 
-And then adding the following to /etc/apt/preferences:
-
-               Package: libgnutls26
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
-               Package: libgnutls26-dbg
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
-               Package: gnutls-bin
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
-               Package: gnutls-doc
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
-               Package: guile-gnutls
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
-               Package: gnutls-dev
-               Pin: release o=The MonkeySphere Project
-               Pin-Priority: 990
-
 Next, run `aptitude update; aptitude install libgnuttls26`.
 
 With the patched gnutls installed, you can feed your authentication sub
@@ -132,9 +106,6 @@ key to your ssh agent by running:
 
                monkeysphere subkey-to-ssh-agent
 
-You may want to add this command to your ~/.xsession file so it is run
-automatically everytime you login.
-
 FIXME: using the key with a single session?