Merge commit 'dkg/master'

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index fe4fd36e8eb3530a735d470c3e34786443aabf45..db35a38f8b8d969437e867d3e89120a73141def4 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -52,12 +52,14 @@ ID, 1 if no matching keys were found at all, and 2 if matching keys
 were found but none were acceptable.  `a' may be used in place of
 `update-authorized_keys'.
 .TP
-.B gen-subkey KEYID
-Generate an authentication subkey.  For the primary key with the
-specified key ID, generate a subkey with "authentication" capability
-that can be used for monkeysphere transactions.  An expiration length
-can be specified with the `-e' or `--expire' option (prompt
-otherwise).  `g' may be used in place of `gen-subkey'.
+.B gen-subkey [KEYID]
+Generate an authentication subkey for a private key in your GnuPG
+keyring.  For the primary key with the specified key ID, generate a
+subkey with "authentication" capability that can be used for
+monkeysphere transactions.  An expiration length can be specified with
+the `-e' or `--expire' option (prompt otherwise).  If no key ID is
+specified, but only one key exists in the secret keyring, that key
+will be used.  `g' may be used in place of `gen-subkey'.
 .TP
 .B help
 Output a brief usage summary.  `h' or `?' may be used in place of

diff --git a/src/monkeysphere b/src/monkeysphere
index f959a386f56b82ef0f1e51079ff31bd0ae78a862..303dc8d758d2262bb5faf3de3e39e78893154f9b 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -39,7 +39,7 @@ MonkeySphere client tool.
 subcommands:
  update-known_hosts (k) [HOST]...    update known_hosts file
  update-authorized_keys (a)          update authorized_keys file
- gen-subkey (g) KEYID                generate an 'a' capable subkey
+ gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
    --expire (-e) EXPIRE                date to expire
  help (h,?)                          this help
@@ -288,7 +288,7 @@ case $COMMAND in
        gen_subkey "$@"
        ;;
 
-    'help'|'h'|'?')
+    '--help'|'help'|'-h'|'h'|'?')
         usage
         ;;
 

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index fcd311485342e1c38d1db9305e57950bef036608..6754b2321e9c55cea9d7d9d3bbc709a19a5ee1ad 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -493,7 +493,7 @@ EOF
 
        show_server_key
 
-       echo "NOTE: User ID revoked, but revokation not published."
+       echo "NOTE: User ID revoked, but revocation not published."
        echo "Run '$PGRM publish-key' to publish the revocation."
     else
        failure "Problem revoking user ID."

diff --git a/website/bugs/add-man-pages-to-website.mdwn b/website/bugs/add-man-pages-to-website.mdwn
new file mode 100644 (file)
index 0000000..4a8d2e2
--- /dev/null
+++ b/website/bugs/add-man-pages-to-website.mdwn
@@ -0,0 +1,12 @@
+[[meta title="Add man pages to web site"]]
+
+We should publish the various monkeysphere man pages in browsable form
+somewhere under http://monkeysphere.info/.  Ideally, this would be
+updated automatically from the sources for the official man pages
+themselves.
+
+This strikes me as an ikiwiki subproject (implementing a man2html wiki
+compilation language perhaps?).
+
+Interestingly, [ikiwiki's own man page](http://ikiwiki.info/usage/)
+appears to be written in markdown and then converted to nroff.

diff --git a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
index 5b19b133b0a6a906eaacb0e6a57c6071af4c457f..01637276035612ba403bdc07a2bfedcc085626a1 100644 (file)
--- a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
+++ b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
@@ -25,3 +25,19 @@ part about verifying you to a server. Then it could say: if you're really
 interested, you can run this hacky script but we make no guarantees.
 
 -- Sir Jam Jam
+
+---
+
+I just realized that i think i can test for the presence of [GNU-dummy
+support in
+GnuTLS](http://lists.gnu.org/archive/html/gnutls-devel/2008-08/msg00005.html),
+which means that we can cleanly test whether the proposed [handling of
+passphrase-locked secret
+keys](bugs/handle-passphrase-locked-secret-keys/) is functional.  With
+that in mind, I'd like to propose that we could resolve this bug
+simply by adding a new subcommand: `monkeysphere authkey-to-agent`,
+which would fail in the absence of a functionally-patched GnuTLS.
+
+Would this proposal be sufficient to resolve this bug?
+
+--dkg

diff --git a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
index 965f198dbfed0109d96d2813a5cd4a83c75fb4b4..028c8f9dd98a4906f3520cc84ef4b60e28418419 100644 (file)
--- a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
+++ b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
@@ -20,3 +20,15 @@ at least, would be for silent output to be the default and have a -v/--verbose
 option to get the output. Or - maybe these should be environmental variables?
 In any event - someway to suppress informational output would be a useful
 improvement.
+
+------
+
+I'd be fine with silent mode as a default, with a more verbose mode
+accessible to the user who desires it.
+
+I'd prefer an environment variable (e.g. `MONKEYSPHERE_VERBOSE` or
+`MONKEYSPHERE_DEBUG`) over a command-line (e.g. `--verbose`) option,
+personally.  It's more in keeping with the model we've used in general
+so far.
+
+--dkg

diff --git a/website/index.mdwn b/website/index.mdwn
index 495d963746fce9c177b975a9adafaa98d5581b8d..6583e186a666387ddc17371ee9ebaf202cc804aa 100644 (file)
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -9,7 +9,7 @@ yourself and the servers you administer or connect to.  OpenPGP keys
 are tracked via GnuPG, and managed in the `known_hosts` and
 `authorized_keys` files used by OpenSSH for connection authentication.
 
-[why you should be interested](/why) | [[bugs]] | [[download]] | [[news]] | [[documentation|doc]]
+[why?](/why) | [[bugs]] | [[download]] | [[news]] | [[documentation|doc]]
 
 ## Conceptual overview ##
 

diff --git a/website/why.mdwn b/website/why.mdwn
index 7f69614b27a7cd17889fac4ebd15fcf60056860b..3f6aa7ca52fd4cafa303132569c57f0e8ff22586 100644 (file)
--- a/website/why.mdwn
+++ b/website/why.mdwn
@@ -36,8 +36,8 @@ you keep them from getting the big scary warning messages?
 Have you ever wanted to allow a colleague key-based access to a
 machine, *without* needing to have a copy of their public key on hand?
 
-Have you ever wanted to be able to revoke the ability of a key to
-authenticate across the entire infrastructure you manage, without
+Have you ever wanted to be able to revoke the ability of a user's key
+to authenticate across the entire infrastructure you manage, without
 touching each host by hand?
 
 ## What's the connection? ##