Merge commit 'dkg/master'

Conflicts:

	website/doc.mdwn
	website/templates/nav.mdwn

4 files changed, 22 insertions, 5 deletions

diff --git a/doc/TODO b/doc/TODO
index 733986e..b41d2be 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -95,3 +95,7 @@ Fix behavior when add-identity-certifier fails to fetch a key from the
 
 Allow server administrators to add-identity-certifier from a key in
    the filesystem (or on stdin, etc)
+
+Think about packaging monkeysphere for other (non-apt-based) operating
+   systems.  RPM-based linux systems, FreeBSD ports, and Mac OS X seem
+   like the most likely candidates.
diff --git a/doc/announcement.html b/doc/announcement.html
index 1787142..68607ac 100644
--- a/doc/announcement.html
+++ b/doc/announcement.html
@@ -30,8 +30,8 @@ key) across a group of machines by disabling authentication for that
 user?</p>
 
 <p>A group of us have been working on a public key infrastructure for
-SSH. <a href="http://monkeysphere.info">Monkeysphere</a> makes use of
-the existing OpenPGP web-of-trust to fetch and cryptographically
+SSH. <a href="http://web.monkeysphere.info">Monkeysphere</a> makes use
+of the existing OpenPGP web-of-trust to fetch and cryptographically
 validate (and revoke!) keys.  This works in either directions: both
 <code>authorized_keys</code> <em>and</em> <code>known_hosts</code> are
 handled.  Monkeysphere gives users and admins tools to deal with SSH
@@ -39,14 +39,17 @@ keys by thinking about the people and machines to whom the keys
 belong, instead of requiring humans to do tedious (and error-prone)
 manual key verification.</p>
 
-<p>We have <a href="http://monkeysphere.info/download">debian packages
+<p>We have <a href="http://web.monkeysphere.info/download">debian packages
 available</a> which should install against lenny, <a
 href="https://lists.riseup.net/www/info/monkeysphere">a mailing
 list</a>, and open ears for good questions, suggestions and
 criticism.</p>
 
-<p>If you have a chance to give it a try (<a href="???">as a user</a>
-or <a href="???">as an admin</a>), it would be great to <a
+<p>If you have a chance to give it a try (<a
+href="http://web.monkeysphere.info/getting-started-user/">as a
+user</a> or <a
+href="http://web.monkeysphere.info/getting-started-admin/">as an
+admin</a>), it would be great to <a
 href="https://lists.riseup.net/www/info/monkeysphere">get
 feedback</a>.</p>
 
diff --git a/doc/artwork/Makefile b/doc/artwork/Makefile
new file mode 100644
index 0000000..b0cb37a
--- /dev/null
+++ b/doc/artwork/Makefile
@@ -0,0 +1,2 @@
+logo.png: logo.svg
+	inkscape -e logo.png logo.svg
diff --git a/doc/george/changelog b/doc/george/changelog
index fcd5a12..8b03a7f 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,14 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2008-09-01 - dkg
+	* set up http://dkg.monkeysphere.info so that i could play around
+	  with ikiwiki updates
+	* moved apt repository over to http://archive.monkeysphere.info/
+	* aptitude update && aptitude dist-upgrade
+	* canonicalizing hostname for normal web access to
+	  http://web.monkeysphere.info
+	
 2008-08-26 - dkg
 	* aptitude update && aptitude full-upgrade
 	* added account 'daniel' for Dan Scott, and set him up with a way