Merge commit 'dkg/master'

[monkeysphere.git] / website / getting-started-user.mdwn

diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index 5241667e12a1b8b2e70df88a72d32c414d7ee948..9b04edc819612249349d6b3b5dc9184b13aa642b 100644 (file)
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -21,8 +21,20 @@ done with a simple cronjob.  An example of crontab line to do this is:
 This would refresh your keychain every day at noon.
 
 
 This would refresh your keychain every day at noon.
 
 

+Install the monkeysphere software on your system
+------------------------------------------------
+
+If you haven't installed monkeysphere yet, you will need to [download
+and install](/download) before continuing.
+
+Make sure that you have the GnuTLS library version 2.6 or later
+installed on your system. If you can't (or don't want to) upgrade to
+GnuTLS 2.6 or later, there are patches for GnuTLS 2.4 available in
+[the Monkeysphere git repo](/community).
+
+

 Keeping your `known_hosts` file in sync with your keyring
 Keeping your `known_hosts` file in sync with your keyring

------------------------------------------------------------
+---------------------------------------------------------

 
 With your keyring updated, you want to make sure that OpenSSH can
 still see the most recent trusted information about who the various
 
 With your keyring updated, you want to make sure that OpenSSH can
 still see the most recent trusted information about who the various


@@ -37,6 +49,7 @@ key for that host to the `known_hosts` file if one is found.  This
 command could be added to a crontab as well, if desired.
 
 
 command could be added to a crontab as well, if desired.
 
 

+

 Using `monkeysphere-ssh-proxycommand`(1)
 ----------------------------------------
 
 Using `monkeysphere-ssh-proxycommand`(1)
 ----------------------------------------
 


@@ -81,29 +94,22 @@ If you have more than one secret key, you'll need to specify the key
 you want to add the subkey to on the command line.
 
 
 you want to add the subkey to on the command line.
 
 

+

 Using your OpenPGP authentication key for SSH
 ---------------------------------------------
 
 Once you have created an OpenPGP authentication subkey, you will need
 to feed it to your ssh agent.
 
 Using your OpenPGP authentication key for SSH
 ---------------------------------------------
 
 Once you have created an OpenPGP authentication subkey, you will need
 to feed it to your ssh agent.
 

-Currently (2008-08-23), gnutls does not support this operation. In order
-to take this step, you will need to upgrade to a patched version of
-gnutls. You can easily upgrade a Debian system by adding the following
-to `/etc/apt/sources.list.d/monkeysphere.list`:
-
-       deb http://archive.monkeysphere.info/debian experimental gnutls
-       deb-src http://archive.monkeysphere.info/debian experimental gnutls
-
-Next, run `aptitude update; aptitude install libgnutls26`.
-
-With the patched gnutls installed, you can feed your authentication
-subkey to your ssh agent by running:
+The GnuTLS library supports this operation as of version 2.6, but
+earlier versions do not.  With a recent version of GnuTLS installed,
+you can feed your authentication subkey to your ssh agent by running:

 
        $ monkeysphere subkey-to-ssh-agent
 
 FIXME: using the key with a single ssh connection?
 
 
        $ monkeysphere subkey-to-ssh-agent
 
 FIXME: using the key with a single ssh connection?
 

+

 Establish trust
 ---------------
 
 Establish trust
 ---------------