diff options
| author | Matt Goins <mjgoins@openflows.com> | 2008-06-20 14:23:41 -0400 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2008-06-20 14:23:41 -0400 |
| commit | 3a6f611a52d56b919b8c50a6e1700af43ff49578 (patch) | |
| tree | 1bbbb9fef2438c47c5801ea822099c97fabdcf6f /doc/MonkeySpec | |
| parent | b75cb97e42dd3327942d8b32cac2d9ee97e9aa4a (diff) | |
| parent | 9efdaab59edb2ff4454082f6a36c9dc0d90b8885 (diff) | |
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Conflicts:
gpg2ssh/Makefile
Diffstat (limited to 'doc/MonkeySpec')
| -rw-r--r-- | doc/MonkeySpec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/MonkeySpec b/doc/MonkeySpec index 6ee278f..54aaa72 100644 --- a/doc/MonkeySpec +++ b/doc/MonkeySpec @@ -39,9 +39,9 @@ common components server-side components ---------------------- * "howler": server gpg maintainer - - generates gpg keys for the server - - publishes server gpg keys - - used to specify userids to trust for user authentication + - generate gpg keys for the server + - publish server gpg keys + - give owner trust to keys for user authentication * "tamarin": concept - how to trigger or schedule rhesus at admin defined points (e.g. via cron or during ssh connections). |