notes about daniel@george.

[monkeysphere.git] / doc / README

diff --git a/doc/README b/doc/README
index cf8a8d6ee1756c879bc3f269a0bb2705cfd6eddf..3be3c72c133c4c57ecd58d33b7484bafbfbbcd23 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -2,15 +2,16 @@ Monkeysphere User README
 ========================
 
 You don't have to be an OpenSSH or OpenPGP expert to use the
-Monkeysphere. However, you should be comfortable using secure shell and
-you should already have GnuPG installed and an OpenPGP key pair before
-you begin.
+Monkeysphere.  However, you should be comfortable using secure shell
+(ssh), and you should already have GnuPG installed and an OpenPGP key
+pair before you begin.
 
 As a regular user on a system where the monkeysphere package is
 installed, you probably want to do a few things:
 
-Keeping your keyring up-to-date
--------------------------------
+
+Keep your keyring up-to-date
+----------------------------
 
 Regularly refresh your GnuPG keyring from the keyservers.  This can be
 done with a simple cronjob.  An example of crontab line to do this is:
@@ -66,6 +67,7 @@ can establish that they are setup correctly.
 The remaining steps will complete the second half: allow servers to
 verify you based on your OpenPGP key.
 
+
 Setting up an OpenPGP authentication key
 ----------------------------------------
 
@@ -82,6 +84,7 @@ gpg --list-secret-keys
 The first line (starting with sec) will include your key length followed
 by the type of key (e.g. 1024D) followed by a slash and then your keyid.
 
+
 Using your OpenPGP authentication key for SSH
 ---------------------------------------------
 
@@ -96,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
@@ -129,11 +106,9 @@ 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
 -------------