Merge commit 'dkg/master'

2 files changed, 1 insertions, 21 deletions

diff --git a/doc/TODO b/doc/TODO
index b41d2be..6cc086a 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -14,35 +14,14 @@ Work out the details (and describe a full use case) for assigning a
    do we export it so it's available when a second-party revocation is
    needed?
 
-Ensure that authorized_user_ids are under as tight control as ssh
-   expects from authorized_keys: we don't want monkeysphere to be a
-   weak link in the filesystem.
-
-Consider the default permissions for
-   /var/lib/monkeysphere/authorized_keys/* (and indeed the whole
-   directory path leading up to that)
-
-Make sure alternate ports are handled for known_hosts.
-
-Script to import private key into ssh agent.
-
 Provide a friendly interactive UI for marginal or failing client-side
    hostkey verifications.  Handle the common cases smoothly, and
    provide good debugging info for the unusual cases.
 
-Make sure onak properly escapes user IDs with colons in them.
-
-Indicate on web site how to report trouble or concerns, and how to
-   join the project.
-
-Clean up the style for the web site (pages, icons, etc).
-
 Create ssh2openpgp or convert to full-fledged keytrans.
 
 Resolve the bugs listed in openpgp2ssh(1):BUGS.
 
-Document alternate trustdb models.
-
 Understand and document the output of gpg --check-trustdb:
  gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
  gpg: depth: 0  valid:   2  signed:  20  trust: 0-, 0q, 0n, 0m, 0f, 2u
diff --git a/doc/george/changelog b/doc/george/changelog
index e570270..cd9aa90 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -18,6 +18,7 @@
 	  make sure they're well-connected to george's web of trust, and
 	  then add their User ID to
 	  ~monkey/.monkeysphere/authorized_user_ids
+	* more mime types for mathopd: image/png image/x-icon
 	
 2008-09-03 - micah
 	* migrated /home/*/.config/monkeysphere/authorized_user_ids to new