Merge commit 'dkg/master'

diff --git a/doc/george/changelog b/doc/george/changelog
index a4e0289abcd8c8769b9f51e3b6bf05e88cd54300..7895f7d163a9e644b47e795f5ff1abdacb2dd044 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -6,6 +6,14 @@
 *  Please add new entries in reverse chronological order whenever you make   *
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
+
+2009-04-12 - dkg
+       * aptitude update && aptitude full-upgrade
+       * (checked and found that monkeysphere version 0.24-1 is already
+       installed; don't know how that happened, coulda been me, just
+       sloppy about not noting it in the changelog)
+       * extended host key by 4 months
+       
 2009-02-22 - jrollins
        * fixed /etc/crontab line for update-users (was trying to run
        monkeysphere-server instead of monkeysphere-authentication).

diff --git a/website/download.mdwn b/website/download.mdwn
index 3cf9d62063d6a5c5fadf51c83181f11fc0958675..75decc3bdaad1d35a78a17b7b317b5b00897e82b 100644 (file)
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -28,8 +28,10 @@ version as follows:
 If you are running Debian stable, you can get the monkeysphere package
 from [backports.org](http://backports.org/dokuwiki/doku.php?id=instructions)
 
+## Debian derivatives (including Ubuntu) ##
+
 You can also install the Monkeysphere directly from the Monkeysphere
-Debian archive.  You can add this archive to your system by putting
+APT repository.  You can add this archive to your system by putting
 the following lines in `/etc/apt/sources.list.d/monkeysphere.list`:
 
     deb http://archive.monkeysphere.info/debian experimental monkeysphere
@@ -41,6 +43,14 @@ signing key](/archive-key), key id EB8AF314 (fingerprint: `2E8D D26C
 verify the packages, you'll want to [add this key to your apt
 configuration after verifying its integrity](/archive-key).
 
+Note: Ubuntu appears to be planning to ship Monkeysphere 0.22 in their
+"Jaunty Jackalope" release (9.04).  The Monkeysphere developers think
+that [Ubuntu shipping Monkeysphere 0.22-1 is a bad
+idea](https://bugs.launchpad.net/ubuntu/+source/monkeysphere/+bug/345054).
+If you are an Ubuntu user, we would prefer that you install from the
+APT archive above rather than run 0.22, which we no longer consider
+supported.
+
 ## FreeBSD ##
 
 There is [a FreeBSD port

diff --git a/website/vision.mdwn b/website/vision.mdwn
index 281bc7281b0a78b3ae75af3f1214d19142e52447..35261be3642d0a1c50c04c1b27e2cc1795768e9c 100644 (file)
--- a/website/vision.mdwn
+++ b/website/vision.mdwn
@@ -29,3 +29,5 @@ at:
 
 * [Wandering Thoughts blog discussion about Web of Trust flaws](http://utcc.utoronto.ca/~cks/space/blog/tech/WebOfTrustFlaws?showcomments)
 * [Wandering Thoughts blog discussion about certificate authorities](http://utcc.utoronto.ca/~cks/space/blog/web/SSLCANeed?showcomments)
+* [Zooko's Conjecture: Decentralized, Secure, Human-Meaningful: Choose two](https://zooko.com/distnames.html)
+* [Mark Stiegler's Introduction to Petnames](http://www.skyhunter.com/marcs/petnames/IntroPetNames.html)