From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 7 Jun 2008 23:39:59 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.1-1~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=241be7ab4a86d3d578de9b5499824a6e34bfd64c;p=monkeysphere.git

Merge commit 'dkg/master'
---

241be7ab4a86d3d578de9b5499824a6e34bfd64c
diff --cc doc/MonkeySpec
index 9ed0724,6ee278f..fe5a0bf
--- a/doc/MonkeySpec
+++ b/doc/MonkeySpec
@@@ -41,10 -41,10 +41,10 @@@ server-side component
  * "howler": server gpg maintainer
    - generates gpg keys for the server
    - publishes server gpg keys
 -  - used to specify userids to trust for user authentication
 +  - used to specify keys to trust for user authentication
  
- * "tamarin": script to trigger rhesus during attempt to initiate
-   connection from client
+ * "tamarin": concept - how to trigger or schedule rhesus at admin defined 
+ 	points (e.g. via cron or during ssh connections).
  
  client-side components
  ----------------------