From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sun, 24 Aug 2008 20:54:02 +0000 (-0700)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.12-1~66
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3faf01e5d89ae1eb3802d55aef51daa660257417;hp=655253c594a8b184fcf1bd250651c76ebadf105c;p=monkeysphere.git

Merge commit 'jamie/master'
---

diff --git a/doc/README b/doc/README
index 544465f..3be3c72 100644
--- 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?