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 e0a2dabcfbd4566948a9808215e9bad5970836b9..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,6 +94,7 @@ 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
 ---------------------------------------------
 
 Using your OpenPGP authentication key for SSH
 ---------------------------------------------
 


@@ -93,12 +107,9 @@ you can feed your authentication subkey to your ssh agent by running:
 
        $ monkeysphere subkey-to-ssh-agent
 
 
        $ monkeysphere subkey-to-ssh-agent
 

-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).
-

 FIXME: using the key with a single ssh connection?
 
 FIXME: using the key with a single ssh connection?
 

+

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