From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Mar 2009 21:25:56 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~3^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=81ae2c7e4367f14c46ef8c3a4d7c551d850fc666;hp=e8cc9816d9b4e0b9398d8e1fec1061dfd5dc360f;p=monkeysphere.git

Merge commit 'jrollins/master'
---

diff --git a/website/download.mdwn b/website/download.mdwn
index db25be6..1d42f19 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -11,17 +11,15 @@ administrator](/getting-started-admin).
 
 Monkeysphere relies on:
 
- * [GnuTLS](http://gnutls.org/)
-  * version 2.4 or later for general use
-  * [version 2.6 or later](/news/gnutls-2.6-enables-monkeysphere) to use the `monkeysphere subkey-to-ssh-agent` subcommand.
  * [OpenSSH](http://openssh.com/)
  * [GnuPG](http://gnupg.org/)
+ * [Perl](http://www.perl.org/) (including the [libcrypt-openssl-rsa](http://perl-openssl.sourceforge.net/) and libdigest-sha1 libraries)
 
 ## Debian ##
 
 If you are running a [Debian](http://www.debian.org/) system, the
-[monkeysphere is now available in the unstable
-("sid") distribution](http://packages.debian.org/sid/monkeysphere).
+[monkeysphere is now available in the Debian unstable ("sid")
+distribution](http://packages.debian.org/sid/monkeysphere).
 
 You can also install the Monkeysphere directly from the Monkeysphere
 Debian archive.  You can add this archive to your system by putting
@@ -36,11 +34,6 @@ signing key](/archive-key), key id EB8AF314 (fingerprint: `2E8D D26C
 verify the packages, you'll want to [add this key to your apt
 configuration after verifying its integrity](/archive-key).
 
-To use the `monkeysphere subkey-to-ssh-agent` subcommand, you will
-also need [version 2.6 of
-GnuTLS](/news/gnutls-2.6-enables-monkeysphere), which is available in
-Debian experimental.
-
 ## FreeBSD ##
 
 There is [now a FreeBSD port available](/news/FreeBSD-port-available)
@@ -65,12 +58,6 @@ port with:
     cd /usr/ports/security/monkeysphere
     make && make install
 
-To use the `monkeysphere subkey-to-ssh-agent` subcommand, you will
-also need [version 2.6 of
-GnuTLS](/news/gnutls-2.6-enables-monkeysphere), which is [slated to be
-available after the 7.1 ports slush is
-over](http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/127330).
-
 ## Source ##
 
 For those that would like to download the source directly, [the source