From: Jamie McClelland <jm@mayfirst.org>
Date: Sun, 24 Aug 2008 19:44:43 +0000 (-0400)
Subject: simplifying instructions for getting gnutls - no need to edit your
X-Git-Tag: monkeysphere_0.12-1~66^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c5f35ded58ddf5c29aff0e5d0b2162c2223ec05;p=monkeysphere.git

simplifying instructions for getting gnutls - no need to edit your
preferences after all.
---

diff --git a/doc/README b/doc/README
index cf8a8d6..13dd5af 100644
--- a/doc/README
+++ b/doc/README
@@ -96,32 +96,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
@@ -129,9 +103,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?
 
 Miscellaneous