Merge commit 'dkg/master'

diff --git a/website/screenshot.png b/website/screenshot.png
deleted file mode 100644 (file)
index 99229dd..0000000
Binary files a/website/screenshot.png and /dev/null differ

diff --git a/website/screenshots.mdwn b/website/screenshots.mdwn
index a8666d52f54f13ee4eebf11ce09fee812453db40..921d4677e80ce9cf966106708ad7dbbae5eccbe2 100644 (file)
--- a/website/screenshots.mdwn
+++ b/website/screenshots.mdwn
@@ -3,8 +3,16 @@
 # Screenshots #
 
 This is a screenshot of the "marginal UI" output of the monkeysphere
-ssh-proxycommand:
+ssh-proxycommand.  The user knows Jamie, and has assigned Marginal
+ownertrust to him, so his certification is visible but not sufficient
+on blanco's host key:
 
-![Marginal UI screenshot](/screenshot.png "Marginal UI screenshot")
+![Simple Marginal UI screenshot](blanco.png "Simple Marginal UI screenshot")
+
+Here is a more complex situation, involving multiple hostnames (a
+common misspelling, in this instance) with different calculated
+validities, and multiple certifiers:
+
+![Complex Marginal UI screenshot](zimmerman.png "Complex Marginal UI screenshot")
 
 More screenshots may be available at [screenshots.debian.net](http://screenshots.debian.net/package/monkeysphere).

diff --git a/website/screenshots/blanco.png b/website/screenshots/blanco.png
new file mode 100644 (file)
index 0000000..c1cd5a1
Binary files /dev/null and b/website/screenshots/blanco.png differ

diff --git a/website/screenshots/zimmerman.png b/website/screenshots/zimmerman.png
new file mode 100644 (file)
index 0000000..99229dd
Binary files /dev/null and b/website/screenshots/zimmerman.png differ