Merge commit 'dkg/master'

[monkeysphere.git] / doc / MonkeySpec

diff --git a/doc/MonkeySpec b/doc/MonkeySpec
index 9ed072422811bba2738c515cee99f25ae25c8228..fe5a0bf37318e181470be8d59043469c8f112e49 100644 (file)
--- a/doc/MonkeySpec
+++ b/doc/MonkeySpec
@@ -43,12 +43,12 @@ server-side components
   - publishes server gpg keys
   - 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
 ----------------------
-* "marmoset": script to trigger rhesus during attempt to initiate
+* "marmoset": concept - how to trigger rhesus during attempt to initiate
   connection to server
   - runs on connection to a certain host
   - triggers update to known_hosts file then makes connection