summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-07-23 00:48:45 -0400
committerJameson Graef Rollins <jrollins@finestructure.net>2009-07-23 00:48:45 -0400
commitc8d0dccee22d1fe4e65edebbf624915c3fc8a8af (patch)
treeb1ab5df6887b67d901daf296cd3a834f0666ad4e
parentaefed40bbe5844d4d41a301614889ea915aabe24 (diff)
parent6f59a15a6759ce26da5041669f2a3cb5a7e41fc2 (diff)
Merge commit 'dkg/master'
-rw-r--r--website/screenshots.mdwn12
-rw-r--r--website/screenshots/blanco.pngbin0 -> 83071 bytes
-rw-r--r--website/screenshots/zimmerman.png (renamed from website/screenshot.png)bin9150 -> 9150 bytes
3 files changed, 10 insertions, 2 deletions
diff --git a/website/screenshots.mdwn b/website/screenshots.mdwn
index a8666d5..921d467 100644
--- 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
index 0000000..c1cd5a1
--- /dev/null
+++ b/website/screenshots/blanco.png
Binary files differ
diff --git a/website/screenshot.png b/website/screenshots/zimmerman.png
index 99229dd..99229dd 100644
--- a/website/screenshot.png
+++ b/website/screenshots/zimmerman.png
Binary files differ