Merge commit 'dkg/master'

diff --git a/doc/README b/doc/README
index bed03806f32e3ee092e1e9b6442e56af7cbd9811..2fc2d5fc77ac7f8f33c7d69b6ab4c1f9cec3f216 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -10,7 +10,7 @@ Keeping your keyring up-to-date
 Regularly refresh your GnuPG keyring from the keyservers.  This can be
 done with a simple cronjob.  An example of crontab line to do this is:
 
-0 12 * * * /usr/bin/gpg --refresh-keys
+0 12 * * * /usr/bin/gpg --refresh-keys > /dev/null 2>&1
 
 This would refresh your keychain every day at noon.
 

diff --git a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
new file mode 100644 (file)
index 0000000..170fc7c
--- /dev/null
+++ b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
@@ -0,0 +1,22 @@
+I don't mind the monkeysphere-ssh-proxycommand output on regular connections.
+
+For me it looks something like this with a server not participatingin the
+monkey sphere:
+
+               ms: processing host: chavez.mayfirst.org
+               ms:   - key not found.
+       
+And like this for a server participating:
+
+               ms: processing host: george.riseup.net
+               ms:  primary key found: 7353A74E3B757F8C
+               ms:   * acceptable key found.
+               ms: known_hosts file updated.
+
+However, I have some batch scripts that run ssh that also provide output, so the monkeysphere output clutters things up.
+
+I would really like to either have a -q/--quiet option, or, preferable for me
+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.