diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-10-03 00:18:24 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-10-03 00:18:24 -0400 |
| commit | a429c2192f42544c23d4a9fec14c13f9f40e30d8 (patch) | |
| tree | c4c7c2253d7713c7163c80a6bd54bba4cd8e3ce6 /man | |
| parent | e7df0bd6e46482b268017de102cbeea30665bd64 (diff) | |
| parent | 2557eca7a3de0f3fef33260187cba824d5dd04b7 (diff) | |
Merge remote branch 'jrollins/master'
Diffstat (limited to 'man')
| -rw-r--r-- | man/man8/monkeysphere-authentication.8 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index 5dfa92a..e2886d6 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -197,7 +197,9 @@ Monkeysphere-generated user authorized_keys files. A list of OpenPGP user IDs, one per line. OpenPGP keys with an exactly-matching User ID (calculated valid by the designated identity certifiers), will have any valid authorization-capable keys or subkeys -added to the given user's authorized_keys file. +added to the given user's authorized_keys file. Any line with initial +whitespace will be interpreted as ssh authorized_keys options +applicable to the preceding User ID. .SH AUTHOR |