Recent changes to this wiki:

remove openid hack
diff --git a/index.mdwn b/index.mdwn
index 821fc1a..0ad2155 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,5 +25,3 @@ Proudly flying for 20 years!
 
 [[!inline pages="news/* and !*/Discussion" 
 show="4" rootpage="news"]]
-
-[[!meta openid="http://kitenet.net/" server="http://openid.kitenet.net:8081/simpleid/"]]

post
diff --git a/news/new_server.mdwn b/news/new_server.mdwn
new file mode 100644
index 0000000..74ab0d3
--- /dev/null
+++ b/news/new_server.mdwn
@@ -0,0 +1,3 @@
+Kite has moved to a new server. Please let Joey know if anything is broken.
+
+Note that kite is no longer serving FTP.

clean up stuff not on new server
diff --git a/index.mdwn b/index.mdwn
index 0f4821f..821fc1a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -18,12 +18,8 @@ Proudly flying for 20 years!
 ### Other services
 
 * <a href="https://shell.kitenet.net/">web login to kite</a>
-* <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="http://kitenet.net/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * openid provider (ask Joey for an account)
-* server use statistics: 
-  <a href="http://kitenet.net/doc/analog/anlgform.html">web</a>,
-  <a href="http://kitenet.net/collectd/bin/">other</a>
 
 ## Kite server news
 

new web login
diff --git a/index.mdwn b/index.mdwn
index abdbc9a..0f4821f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -17,7 +17,7 @@ Proudly flying for 20 years!
 
 ### Other services
 
-* <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
+* <a href="https://shell.kitenet.net/">web login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="http://kitenet.net/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * openid provider (ask Joey for an account)

fix urls and cleanup
diff --git a/index.mdwn b/index.mdwn
index 7853ede..abdbc9a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,27 +2,27 @@
 
 Proudly flying for 20 years!
 
-* [Kite: a server's tale](http://joeyh.name/blog/entry/kite/)
+* [Kite: a server's tale](https://joeyh.name/blog/entry/kite/)
 * [This page in 199x](http://ancient.kitenet.net:1994/)
 
 ### Homepages of kite users
 
-* <a href="~joey/">Joey Hess</a>
-* <a href="~anna/">Anna Hess</a>
-* <a href="~maggie/">Maggie Hess</a>
-* <a href="~errol/">Errol Hess</a>
+* <a href="http://kitenet.net/~joey/">Joey Hess</a>
+* <a href="http://kitenet.net/~anna/">Anna Hess</a>
+* <a href="http://kitenet.net/~maggie/">Maggie Hess</a>
+* <a href="http://kitenet.net/~errol/">Errol Hess</a>
 * <a href="http://family.kitenet.net/">family website</a>
-* <a href="~kyle/">Kyle Scott MacLea</a>
+* <a href="http://kitenet.net/~kyle/">Kyle Scott MacLea</a>
 * <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
 
 ### Other services
 
 * <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
-* <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
+* <a href="http://kitenet.net/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * openid provider (ask Joey for an account)
 * server use statistics: 
-  <a href="/doc/analog/anlgform.html">web</a>,
+  <a href="http://kitenet.net/doc/analog/anlgform.html">web</a>,
   <a href="http://kitenet.net/collectd/bin/">other</a>
 
 ## Kite server news
diff --git a/joey.mdwn b/joey.mdwn
index 7b03e48..be55d1a 100644
--- a/joey.mdwn
+++ b/joey.mdwn
@@ -1,3 +1,3 @@
 See Joey. See Joey run kite. Run kite run. 
 
-(Run away to Joey's [web site](/~joey/).)
\ No newline at end of file
+(Run away to Joey's [web site](https://joeyh.name/).)
diff --git a/robots.txt b/robots.txt
deleted file mode 100644
index 918632a..0000000
--- a/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-User-agent: *
-Disallow: /cgi-bin/
-Disallow: /doc/
diff --git a/sandbox.mdwn b/sandbox.mdwn
deleted file mode 100644
index 25bdc90..0000000
--- a/sandbox.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-This is the SandBox, a page anyone can edit to learn how to use the wiki.
-
-----
-
-Go kite.. still flying strong after 13+ years!
-
-----
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-# Header
-
-## Subheader
-
-> This is a blockquote.
->
-> This is the first level of quoting.
->
-> > This is nested blockquote.
->
-> Back to the first level.
-
-Numbered list 
-
-1. First item.
-1. Another.
-1. And another..
-
-Bulleted list
-
-* *item*
-* item
-
-[[WikiLink]]
diff --git a/wifi.mdwn b/wifi.mdwn
index b18d7c4..a624d6f 100644
--- a/wifi.mdwn
+++ b/wifi.mdwn
@@ -1,5 +1,5 @@
 If you're visiting this page because you saw an open wireless network
 pointing at this URL, then you've stumbled over one of 
-[Joey Hess](http://kitenet.net/~joey/)'s open wireless networks.
+[Joey Hess](https://joeyh.name/)'s open wireless networks.
 
 Feel free to use it; don't abuse it.

remove old news
diff --git a/index.mdwn b/index.mdwn
index 359ae23..7853ede 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,7 +27,7 @@ Proudly flying for 20 years!
 
 ## Kite server news
 
-[[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
+[[!inline pages="news/* and !*/Discussion" 
 show="4" rootpage="news"]]
 
 [[!meta openid="http://kitenet.net/" server="http://openid.kitenet.net:8081/simpleid/"]]
diff --git a/news/downtime.mdwn b/news/downtime.mdwn
deleted file mode 100644
index 83321c7..0000000
--- a/news/downtime.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Kite went off the net and I had to fix its networking. All seems to be back
-to working order, if not normal, now. --[[Joey]]
diff --git a/news/full_disk.mdwn b/news/full_disk.mdwn
deleted file mode 100644
index f7f6398..0000000
--- a/news/full_disk.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Kite suffered a full disk today. I've freed up a lot of space to fix this. It's possible that some mail or other data may have been lost due to this, though I don't currently know of any.
\ No newline at end of file
diff --git a/news/full_disk_cleanup.mdwn b/news/full_disk_cleanup.mdwn
deleted file mode 100644
index b6794ea..0000000
--- a/news/full_disk_cleanup.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-An old account on kite received ten gigabytes of spam in the past week,
-filling up its disk. I have taken the opportunity to do some spring
-housecleaning of user accounts who have not used kite in ten years or so.
-If you're such a user, I still have your data archived away.
diff --git a/news/ipv6.mdwn b/news/ipv6.mdwn
deleted file mode 100644
index 18c051d..0000000
--- a/news/ipv6.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Kite is now available via ipv6, using the special hostname "<a href="http://ipv6.kitenet.net">ipv6.kitenet.net</a>". Many other servers, such as bluebird, also have IPV6 addresses now.
\ No newline at end of file
diff --git a/news/jabber_server.mdwn b/news/jabber_server.mdwn
deleted file mode 100644
index f610b19..0000000
--- a/news/jabber_server.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I've installed a jabber server on kite, so kite users can use your kite email address for chatting with jabber, if you want to.
\ No newline at end of file
diff --git a/news/kite_move_in_progress.mdwn b/news/kite_move_in_progress.mdwn
deleted file mode 100644
index 78c9c04..0000000
--- a/news/kite_move_in_progress.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-A move of kitenet.net to a new server is in progress. The new server, wren.kitenet.net, is already up and available for login. Most user-visible services have not moved to wren yet; an announcement will be made when they move.
\ No newline at end of file
diff --git a/news/mail_blockage_and_dns.mdwn b/news/mail_blockage_and_dns.mdwn
deleted file mode 100644
index ccc68ac..0000000
--- a/news/mail_blockage_and_dns.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-I goofed up and mail sent in the past two days did not go out until today.
-As far as I know, no mail was lost.
-
-Also, kite no longer has an open DNS server. --[[Joey]] 
diff --git a/news/mail_issues.mdwn b/news/mail_issues.mdwn
deleted file mode 100644
index 8deed18..0000000
--- a/news/mail_issues.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Kite was not accepting incoming mail since early Feb 23rd. After 35 hours
-this got fixed. It's possible that mail senders timed out and mail was
-lost, although I'd expect most of it gets through.
diff --git a/news/migration.mdwn b/news/migration.mdwn
deleted file mode 100644
index 74d6f98..0000000
--- a/news/migration.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Kite's just migrated to a new machine. About an hour of downtime this
-morning for that.
-
-We now have twice the disk space, and a bit faster CPU too. Enjoy..
diff --git a/news/move.mdwn b/news/move.mdwn
deleted file mode 100644
index 1ad8337..0000000
--- a/news/move.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Kite will be down for approximatly 1.5 hours to move to a new
-host on December 8th, starting around noon Eastern.
-
-Update: Move is complete. Additionally, kite has 50 GB of disk space now.
diff --git a/news/network_issues.mdwn b/news/network_issues.mdwn
deleted file mode 100644
index cf5c959..0000000
--- a/news/network_issues.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Bytemark's entire network [fell over](http://forum.bytemark.co.uk/viewtopic.php?id=1402),
-knocking kite off the net for about four hours. Things seem to be back to normal now.
---[[Joey]] 
diff --git a/news/new_server.mdwn b/news/new_server.mdwn
deleted file mode 100644
index 6118dc0..0000000
--- a/news/new_server.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Kite has switched over to the new server now. A few things are still being set up; but let Joey know if you see anything wrong.
\ No newline at end of file
diff --git a/news/ssh_changes.mdwn b/news/ssh_changes.mdwn
deleted file mode 100644
index 05d3c02..0000000
--- a/news/ssh_changes.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-Kite will now reject authentication attempts using ssh keys that are known to be weak[1].
-
-If you have trouble logging in to kite, I can help you sort it out -- I hope this change won't affect many users. --[[Joey]]
-
-
-[1] Specifically, keys generated by the broken version of openssl.
diff --git a/news/ssh_flood_protection.mdwn b/news/ssh_flood_protection.mdwn
deleted file mode 100644
index 0b7b9c5..0000000
--- a/news/ssh_flood_protection.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I've made some changes to kite to protect against ssh connection floods and dictionary attacks. If you experience problems logging in, please let me know (and retry after 10 minutes).
\ No newline at end of file
diff --git a/news/wiki.mdwn b/news/wiki.mdwn
deleted file mode 100644
index f059697..0000000
--- a/news/wiki.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Kite's website has now been switched over to a wiki, using [ikiwiki](http://ikiwiki.kitenet.net/) in the backend.
\ No newline at end of file

initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eecda60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki

anniversary
diff --git a/index.mdwn b/index.mdwn
index da6c606..359ae23 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,10 @@
 ## Welcome to kite
 
+Proudly flying for 20 years!
+
+* [Kite: a server's tale](http://joeyh.name/blog/entry/kite/)
+* [This page in 199x](http://ancient.kitenet.net:1994/)
+
 ### Homepages of kite users
 
 * <a href="~joey/">Joey Hess</a>

openid provider update
diff --git a/index.mdwn b/index.mdwn
index 21438c6..da6c606 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]
+[[!meta openid="http://kitenet.net/" server="http://openid.kitenet.net:8081/simpleid/"]]

foo
diff --git a/index.mdwn b/index.mdwn
index 7ef86c3..21438c6 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="https://kitenet.net/" server="http://kitenet.net/simpleid/"]]
+[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]

foo
diff --git a/index.mdwn b/index.mdwn
index aa972d9..7ef86c3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="https://kitenet.net/" server="https://kitenet.net/simpleid/"]]
+[[!meta openid="https://kitenet.net/" server="http://kitenet.net/simpleid/"]]

foo
diff --git a/index.mdwn b/index.mdwn
index 161d0b8..aa972d9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="http://kitenet.net/" server="https://kitenet.net/simpleid/"]]
+[[!meta openid="https://kitenet.net/" server="https://kitenet.net/simpleid/"]]

foo
diff --git a/index.mdwn b/index.mdwn
index 21438c6..161d0b8 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]
+[[!meta openid="http://kitenet.net/" server="https://kitenet.net/simpleid/"]]

foo
diff --git a/index.mdwn b/index.mdwn
index aa972d9..21438c6 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="https://kitenet.net/" server="https://kitenet.net/simpleid/"]]
+[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]

https
diff --git a/index.mdwn b/index.mdwn
index 21438c6..aa972d9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,4 +25,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]
+[[!meta openid="https://kitenet.net/" server="https://kitenet.net/simpleid/"]]

update
diff --git a/index.mdwn b/index.mdwn
index ccce3f2..21438c6 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,6 +15,7 @@
 * <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
+* openid provider (ask Joey for an account)
 * server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>,
   <a href="http://kitenet.net/collectd/bin/">other</a>

fix
diff --git a/index.mdwn b/index.mdwn
index c53d6a7..ccce3f2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -24,4 +24,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta openid="http://kitenet.net/simpleid/" server="http://kitenet.net/simpleid/"]]
+[[!meta openid="http://kitenet.net/" server="http://kitenet.net/simpleid/"]]

fix
diff --git a/index.mdwn b/index.mdwn
index 421cf78..c53d6a7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -24,5 +24,4 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta link="http://kitenet.net/simpleid/" rel="openid.server"]]
-[[!meta link="http://kitenet.net/simpleid/" rel="openid2.provider"]]
+[[!meta openid="http://kitenet.net/simpleid/" server="http://kitenet.net/simpleid/"]]

new openid server on kite
diff --git a/index.mdwn b/index.mdwn
index 6846319..421cf78 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -24,5 +24,5 @@
 [[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
 show="4" rootpage="news"]]
 
-[[!meta link="http://www.myopenid.com/server" rel="openid.server"]]
-[[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]
+[[!meta link="http://kitenet.net/simpleid/" rel="openid.server"]]
+[[!meta link="http://kitenet.net/simpleid/" rel="openid2.provider"]]

foo
diff --git a/index.mdwn b/index.mdwn
index 3de80ad..6846319 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,8 +21,8 @@
 
 ## Kite server news
 
-[[!inline pages="news/* and !*/Discussion" 
-feedpages="created_after(news/mail_issues)" show="4" rootpage="news"]]
+[[!inline pages="news/* and !*/Discussion and created_after(news/mail_issues)" 
+show="4" rootpage="news"]]
 
 [[!meta link="http://www.myopenid.com/server" rel="openid.server"]]
 [[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

remove old news
diff --git a/index.mdwn b/index.mdwn
index a39e752..3de80ad 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,7 +22,7 @@
 ## Kite server news
 
 [[!inline pages="news/* and !*/Discussion" 
-feedpages="created_after(news/jabber_server)" show="4" rootpage="news"]]
+feedpages="created_after(news/mail_issues)" show="4" rootpage="news"]]
 
 [[!meta link="http://www.myopenid.com/server" rel="openid.server"]]
 [[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

update
diff --git a/index.mdwn b/index.mdwn
index e7dde77..a39e752 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,7 +6,7 @@
 * <a href="~anna/">Anna Hess</a>
 * <a href="~maggie/">Maggie Hess</a>
 * <a href="~errol/">Errol Hess</a>
-* <a href="~family/">family website</a>
+* <a href="http://family.kitenet.net/">family website</a>
 * <a href="~kyle/">Kyle Scott MacLea</a>
 * <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
 

add
diff --git a/news/full_disk_cleanup.mdwn b/news/full_disk_cleanup.mdwn
new file mode 100644
index 0000000..b6794ea
--- /dev/null
+++ b/news/full_disk_cleanup.mdwn
@@ -0,0 +1,4 @@
+An old account on kite received ten gigabytes of spam in the past week,
+filling up its disk. I have taken the opportunity to do some spring
+housecleaning of user accounts who have not used kite in ten years or so.
+If you're such a user, I still have your data archived away.

cleanup
diff --git a/index.mdwn b/index.mdwn
index 2efe866..e7dde77 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,5 @@
 ## Welcome to kite
 
-(Are you looking for the `mumble.debian.net` server?  See <http://debian-party-line.branchable.com>)
-
 ### Homepages of kite users
 
 * <a href="~joey/">Joey Hess</a>

add
diff --git a/news/mail_issues.mdwn b/news/mail_issues.mdwn
new file mode 100644
index 0000000..8deed18
--- /dev/null
+++ b/news/mail_issues.mdwn
@@ -0,0 +1,3 @@
+Kite was not accepting incoming mail since early Feb 23rd. After 35 hours
+this got fixed. It's possible that mail senders timed out and mail was
+lost, although I'd expect most of it gets through.

note
diff --git a/index.mdwn b/index.mdwn
index e7dde77..2efe866 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,7 @@
 ## Welcome to kite
 
+(Are you looking for the `mumble.debian.net` server?  See <http://debian-party-line.branchable.com>)
+
 ### Homepages of kite users
 
 * <a href="~joey/">Joey Hess</a>

update
diff --git a/news/move.mdwn b/news/move.mdwn
index 02322d4..1ad8337 100644
--- a/news/move.mdwn
+++ b/news/move.mdwn
@@ -1,2 +1,4 @@
 Kite will be down for approximatly 1.5 hours to move to a new
 host on December 8th, starting around noon Eastern.
+
+Update: Move is complete. Additionally, kite has 50 GB of disk space now.

announce downtime
diff --git a/news/move.mdwn b/news/move.mdwn
new file mode 100644
index 0000000..02322d4
--- /dev/null
+++ b/news/move.mdwn
@@ -0,0 +1,2 @@
+Kite will be down for approximatly 1.5 hours to move to a new
+host on December 8th, starting around noon Eastern.

update
diff --git a/index.mdwn b/index.mdwn
index 15d0d35..e7dde77 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,7 +22,7 @@
 ## Kite server news
 
 [[!inline pages="news/* and !*/Discussion" 
-feedpages="created_after(jabber_server)" show="4" rootpage="news"]]
+feedpages="created_after(news/jabber_server)" show="4" rootpage="news"]]
 
 [[!meta link="http://www.myopenid.com/server" rel="openid.server"]]
 [[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

collectd
diff --git a/index.mdwn b/index.mdwn
index 095e120..15d0d35 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -17,7 +17,7 @@
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>,
-  <a href="http://bluebird.kitenet.net/munin/">other</a>
+  <a href="http://kitenet.net/collectd/bin/">other</a>
 
 ## Kite server news
 

update
diff --git a/news/network_issues.mdwn b/news/network_issues.mdwn
index b3c1ff9..cf5c959 100644
--- a/news/network_issues.mdwn
+++ b/news/network_issues.mdwn
@@ -1,3 +1,3 @@
-A problem with the network knocked kite off the net for about four
-hours. Things seem to be back to normal now.
+Bytemark's entire network [fell over](http://forum.bytemark.co.uk/viewtopic.php?id=1402),
+knocking kite off the net for about four hours. Things seem to be back to normal now.
 --[[Joey]] 

fixed
diff --git a/news/network_issues.mdwn b/news/network_issues.mdwn
index 0361833..b3c1ff9 100644
--- a/news/network_issues.mdwn
+++ b/news/network_issues.mdwn
@@ -1,3 +1,3 @@
 A problem with the network knocked kite off the net for about four
-hours. There still seem to be some degree of issues with the network.
+hours. Things seem to be back to normal now.
 --[[Joey]] 

add
diff --git a/news/network_issues.mdwn b/news/network_issues.mdwn
new file mode 100644
index 0000000..0361833
--- /dev/null
+++ b/news/network_issues.mdwn
@@ -0,0 +1,3 @@
+A problem with the network knocked kite off the net for about four
+hours. There still seem to be some degree of issues with the network.
+--[[Joey]] 

update
diff --git a/news/mail_blockage_and_dns.mdwn b/news/mail_blockage_and_dns.mdwn
index 2cdfc88..ccc68ac 100644
--- a/news/mail_blockage_and_dns.mdwn
+++ b/news/mail_blockage_and_dns.mdwn
@@ -1,3 +1,4 @@
 I goofed up and mail sent in the past two days did not go out until today.
+As far as I know, no mail was lost.
 
 Also, kite no longer has an open DNS server. --[[Joey]] 

update
diff --git a/news/mail_blockage_and_dns.mdwn b/news/mail_blockage_and_dns.mdwn
new file mode 100644
index 0000000..2cdfc88
--- /dev/null
+++ b/news/mail_blockage_and_dns.mdwn
@@ -0,0 +1,3 @@
+I goofed up and mail sent in the past two days did not go out until today.
+
+Also, kite no longer has an open DNS server. --[[Joey]] 

update for 3.0
diff --git a/index.mdwn b/index.mdwn
index 6fb7ff3..095e120 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,8 +21,8 @@
 
 ## Kite server news
 
-[[inline pages="news/* and !*/Discussion" 
+[[!inline pages="news/* and !*/Discussion" 
 feedpages="created_after(jabber_server)" show="4" rootpage="news"]]
 
-[[meta link="http://www.myopenid.com/server" rel="openid.server"]]
-[[meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]
+[[!meta link="http://www.myopenid.com/server" rel="openid.server"]]
+[[!meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

update
diff --git a/index.mdwn b/index.mdwn
index 63a0dd2..6fb7ff3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,7 +6,6 @@
 * <a href="~anna/">Anna Hess</a>
 * <a href="~maggie/">Maggie Hess</a>
 * <a href="~errol/">Errol Hess</a>
-* <a href="~jen/">Jen Williams</a>
 * <a href="~family/">family website</a>
 * <a href="~kyle/">Kyle Scott MacLea</a>
 * <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 25cb991..25bdc90 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,7 +2,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 ----
 
-Go kite.. still flying strong after 13 years!
+Go kite.. still flying strong after 13+ years!
 
 ----
 

update
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 245df16..25cb991 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,7 +2,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 ----
 
-Go kite.. still flying strong after 12 years!
+Go kite.. still flying strong after 13 years!
 
 ----
 

simplify
diff --git a/index.mdwn b/index.mdwn
index dc22aeb..63a0dd2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,9 +22,6 @@
 
 ## Kite server news
 
-Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
-be kept up-to-date on important news about kite.
-
 [[inline pages="news/* and !*/Discussion" 
 feedpages="created_after(jabber_server)" show="4" rootpage="news"]]
 

drop svn repo
diff --git a/index.mdwn b/index.mdwn
index d823647..dc22aeb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,6 @@
 * <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
-* <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>,
   <a href="http://bluebird.kitenet.net/munin/">other</a>

diff --git a/news/ssh_changes.mdwn b/news/ssh_changes.mdwn
new file mode 100644
index 0000000..05d3c02
--- /dev/null
+++ b/news/ssh_changes.mdwn
@@ -0,0 +1,6 @@
+Kite will now reject authentication attempts using ssh keys that are known to be weak[1].
+
+If you have trouble logging in to kite, I can help you sort it out -- I hope this change won't affect many users. --[[Joey]]
+
+
+[1] Specifically, keys generated by the broken version of openssl.

diff --git a/sandbox.mdwn b/sandbox.mdwn
index 4b962f4..245df16 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,7 +2,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 ----
 
-Go kite... still flying strong after 12 years!
+Go kite.. still flying strong after 12 years!
 
 ----
 

test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 245df16..4b962f4 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,7 +2,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 ----
 
-Go kite.. still flying strong after 12 years!
+Go kite... still flying strong after 12 years!
 
 ----
 

test commit
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 3221514..245df16 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -2,7 +2,7 @@ This is the SandBox, a page anyone can edit to learn how to use the wiki.
 
 ----
 
-kite.. still flying strong after 12 years!
+Go kite.. still flying strong after 12 years!
 
 ----
 

test commit w/git
diff --git a/sandbox.mdwn b/sandbox.mdwn
new file mode 100644
index 0000000..3221514
--- /dev/null
+++ b/sandbox.mdwn
@@ -0,0 +1,36 @@
+This is the SandBox, a page anyone can edit to learn how to use the wiki.
+
+----
+
+kite.. still flying strong after 12 years!
+
+----
+
+Here's a paragraph.
+
+Here's another one with *emphasised* text.
+
+# Header
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+1. Another.
+1. And another..
+
+Bulleted list
+
+* *item*
+* item
+
+[[WikiLink]]

add
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..edd4856
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.ikiwiki

rouncube = php = suck = nonresponsive webserver = gone!
diff --git a/index.mdwn b/index.mdwn
index 47376ab..d823647 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -14,8 +14,7 @@
 ### Other services
 
 * <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
-* <a href="https://kitenet.net/roundcube/">new web-based email</a>
-* <a href="https://kitenet.net/cgi-bin/sqwebmail">old web-based email</a>
+* <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
diff --git a/news/new_webmail.mdwn b/news/new_webmail.mdwn
deleted file mode 100644
index 6ff7b58..0000000
--- a/news/new_webmail.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-I've added a new [webmail system](https://kitenet.net/roundcube/) on kite. 
-I think it's quite nice and easy to use, and as nice as gmail.
-
-The old webmail will be kept working for a while, please let me know which
-you prefer.
-
---[[Joey]]

roundcube
diff --git a/index.mdwn b/index.mdwn
index d823647..47376ab 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -14,7 +14,8 @@
 ### Other services
 
 * <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
-* <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
+* <a href="https://kitenet.net/roundcube/">new web-based email</a>
+* <a href="https://kitenet.net/cgi-bin/sqwebmail">old web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
diff --git a/news/new_webmail.mdwn b/news/new_webmail.mdwn
new file mode 100644
index 0000000..6ff7b58
--- /dev/null
+++ b/news/new_webmail.mdwn
@@ -0,0 +1,7 @@
+I've added a new [webmail system](https://kitenet.net/roundcube/) on kite. 
+I think it's quite nice and easy to use, and as nice as gmail.
+
+The old webmail will be kept working for a while, please let me know which
+you prefer.
+
+--[[Joey]]

add
diff --git a/news/migration.mdwn b/news/migration.mdwn
new file mode 100644
index 0000000..74d6f98
--- /dev/null
+++ b/news/migration.mdwn
@@ -0,0 +1,4 @@
+Kite's just migrated to a new machine. About an hour of downtime this
+morning for that.
+
+We now have twice the disk space, and a bit faster CPU too. Enjoy..

update
diff --git a/news/downtime.mdwn b/news/downtime.mdwn
new file mode 100644
index 0000000..83321c7
--- /dev/null
+++ b/news/downtime.mdwn
@@ -0,0 +1,2 @@
+Kite went off the net and I had to fix its networking. All seems to be back
+to working order, if not normal, now. --[[Joey]]

obsolete
diff --git a/news/deadbeast.mdwn b/news/deadbeast.mdwn
deleted file mode 100644
index f054b96..0000000
--- a/news/deadbeast.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-If you were expecting deadbeast and got here, it's because deadbeast is down and parts (but not the website) temporarily being hosted here. --[[Joey]]
\ No newline at end of file

diff --git a/news/deadbeast.mdwn b/news/deadbeast.mdwn
new file mode 100644
index 0000000..f054b96
--- /dev/null
+++ b/news/deadbeast.mdwn
@@ -0,0 +1 @@
+If you were expecting deadbeast and got here, it's because deadbeast is down and parts (but not the website) temporarily being hosted here. --[[Joey]]
\ No newline at end of file

use feedpages
diff --git a/index.mdwn b/index.mdwn
index 8292d4e..d823647 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -26,7 +26,8 @@
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
-[[inline pages="news/* and !*/Discussion" show="4" rootpage="news"]]
+[[inline pages="news/* and !*/Discussion" 
+feedpages="created_after(jabber_server)" show="4" rootpage="news"]]
 
 [[meta link="http://www.myopenid.com/server" rel="openid.server"]]
 [[meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

diff --git a/news/jabber_server.mdwn b/news/jabber_server.mdwn
new file mode 100644
index 0000000..f610b19
--- /dev/null
+++ b/news/jabber_server.mdwn
@@ -0,0 +1 @@
+I've installed a jabber server on kite, so kite users can use your kite email address for chatting with jabber, if you want to.
\ No newline at end of file

diff --git a/news/full_disk.mdwn b/news/full_disk.mdwn
new file mode 100644
index 0000000..f7f6398
--- /dev/null
+++ b/news/full_disk.mdwn
@@ -0,0 +1 @@
+Kite suffered a full disk today. I've freed up a lot of space to fix this. It's possible that some mail or other data may have been lost due to this, though I don't currently know of any.
\ No newline at end of file

removing mindterm
diff --git a/index.mdwn b/index.mdwn
index 24524dd..8292d4e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -13,7 +13,7 @@
 
 ### Other services
 
-* <a href="https://kitenet.net/ajaxterm/">web login to kite</a> (old <a href="ssh/">web login method</a> also available)
+* <a href="https://kitenet.net/ajaxterm/">web login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>

diff --git a/news/ipv6.mdwn b/news/ipv6.mdwn
index 8c505f4..18c051d 100644
--- a/news/ipv6.mdwn
+++ b/news/ipv6.mdwn
@@ -1 +1 @@
-Kite is now available via ipv6, using the special hostname "ipv6.kitenet.net". Many other servers, such as bluebird, also have IPV6 addresses now.
\ No newline at end of file
+Kite is now available via ipv6, using the special hostname "<a href="http://ipv6.kitenet.net">ipv6.kitenet.net</a>". Many other servers, such as bluebird, also have IPV6 addresses now.
\ No newline at end of file

diff --git a/news/ipv6.mdwn b/news/ipv6.mdwn
new file mode 100644
index 0000000..8c505f4
--- /dev/null
+++ b/news/ipv6.mdwn
@@ -0,0 +1 @@
+Kite is now available via ipv6, using the special hostname "ipv6.kitenet.net". Many other servers, such as bluebird, also have IPV6 addresses now.
\ No newline at end of file

stork gone
diff --git a/news/stork.kitenet.net_added.mdwn b/news/stork.kitenet.net_added.mdwn
deleted file mode 100644
index d9516ae..0000000
--- a/news/stork.kitenet.net_added.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-For a long time I've been planning to bring up a dedicated server to be a backup for kite in case something goes dreadfully wrong with kite's hardware or hosting.
-[[Stork]] is that server, it's located half a world away from kite, in Amsterdam,
-and it mostly exists to take over from kite if anything goes wrong. I'll also use it for more experimental or risky stuff to avoid causing problems with kite.
-
-You mostly don't need to worry about stork, and there's probably not much reason to use it for anything yourself, although if you want to use it for something, I will give you an account on it.
-
---[[Joey]]
\ No newline at end of file
diff --git a/stork.mdwn b/stork.mdwn
deleted file mode 100644
index a84fcac..0000000
--- a/stork.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-stork.kitenet.net is a XEN instance running inside a real machine that [[Joey]] has nothing to do with. It's located in the Netherlands.
-
-Stork doesn't have a great deal of memory or disk space, since using a virtual XEN system for a computer means renting both by the month. So the main ground rule is to avoid using disk space or memory that you don't need to, unlike on kite, which has oodles of both.
-
-Mail [[Joey]] to get an account.
\ No newline at end of file

diff --git a/news/ssh_flood_protection.mdwn b/news/ssh_flood_protection.mdwn
new file mode 100644
index 0000000..0b7b9c5
--- /dev/null
+++ b/news/ssh_flood_protection.mdwn
@@ -0,0 +1 @@
+I've made some changes to kite to protect against ssh connection floods and dictionary attacks. If you experience problems logging in, please let me know (and retry after 10 minutes).
\ No newline at end of file

munin moving to bluebird
diff --git a/index.mdwn b/index.mdwn
index 2802020..24524dd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -19,7 +19,7 @@
 * <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>,
-  <a href="/munin/">other</a>
+  <a href="http://bluebird.kitenet.net/munin/">other</a>
 
 ## Kite server news
 

new web login
diff --git a/index.mdwn b/index.mdwn
index 7843558..2802020 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -13,7 +13,7 @@
 
 ### Other services
 
-* <a href="ssh/">ssh login to kite</a>
+* <a href="https://kitenet.net/ajaxterm/">web login to kite</a> (old <a href="ssh/">web login method</a> also available)
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>

add my openid foo to this page too, useful if I'm feeling lazy..
diff --git a/index.mdwn b/index.mdwn
index 3b7ece2..7843558 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,3 +27,6 @@ Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
 [[inline pages="news/* and !*/Discussion" show="4" rootpage="news"]]
+
+[[meta link="http://www.myopenid.com/server" rel="openid.server"]]
+[[meta link="http://joeyh.myopenid.com/" rel="openid.delegate"]]

moved
diff --git a/index.mdwn b/index.mdwn
index d2de55a..3b7ece2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -19,7 +19,7 @@
 * <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>,
-  <a href="http://stork.kitenet.net/munin/">other</a>
+  <a href="/munin/">other</a>
 
 ## Kite server news
 

add
diff --git a/wifi.mdwn b/wifi.mdwn
new file mode 100644
index 0000000..b18d7c4
--- /dev/null
+++ b/wifi.mdwn
@@ -0,0 +1,5 @@
+If you're visiting this page because you saw an open wireless network
+pointing at this URL, then you've stumbled over one of 
+[Joey Hess](http://kitenet.net/~joey/)'s open wireless networks.
+
+Feel free to use it; don't abuse it.

re-add mindterm for anna
diff --git a/index.mdwn b/index.mdwn
index a357426..d2de55a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -13,6 +13,7 @@
 
 ### Other services
 
+* <a href="ssh/">ssh login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>

diff --git a/index.mdwn b/index.mdwn
index e5faa53..a357426 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -17,8 +17,8 @@
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>
 * server use statistics: 
-  <a href="/doc/analog/anlgform.html">web</a>, and
-  <a href="http://stork.kitenet.net/munin/">more</a>
+  <a href="/doc/analog/anlgform.html">web</a>,
+  <a href="http://stork.kitenet.net/munin/">other</a>
 
 ## Kite server news
 

diff --git a/index.mdwn b/index.mdwn
index bc84201..e5faa53 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,8 +16,7 @@
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>
-* server use statistics: <a href="/mrtg/load.html">load</a>,
-  <a href="/mrtg/ethernet.html">bandwidth</a>,
+* server use statistics: 
   <a href="/doc/analog/anlgform.html">web</a>, and
   <a href="http://stork.kitenet.net/munin/">more</a>
 

diff --git a/index.mdwn b/index.mdwn
index 82ffd80..bc84201 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -13,7 +13,6 @@
 
 ### Other services
 
-* <a href="ssh/">ssh login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
 * <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
 * <a href="http://svn.kitenet.net/">subversion repository</a>

diff --git a/news/new_server.mdwn b/news/new_server.mdwn
new file mode 100644
index 0000000..6118dc0
--- /dev/null
+++ b/news/new_server.mdwn
@@ -0,0 +1 @@
+Kite has switched over to the new server now. A few things are still being set up; but let Joey know if you see anything wrong.
\ No newline at end of file

rm
diff --git a/news/kite_move_in_progress. b/news/kite_move_in_progress.
deleted file mode 100644
index 78c9c04..0000000
--- a/news/kite_move_in_progress.
+++ /dev/null
@@ -1 +0,0 @@
-A move of kitenet.net to a new server is in progress. The new server, wren.kitenet.net, is already up and available for login. Most user-visible services have not moved to wren yet; an announcement will be made when they move.
\ No newline at end of file

diff --git a/news/kite_move_in_progress.mdwn b/news/kite_move_in_progress.mdwn
new file mode 100644
index 0000000..78c9c04
--- /dev/null
+++ b/news/kite_move_in_progress.mdwn
@@ -0,0 +1 @@
+A move of kitenet.net to a new server is in progress. The new server, wren.kitenet.net, is already up and available for login. Most user-visible services have not moved to wren yet; an announcement will be made when they move.
\ No newline at end of file

diff --git a/news/kite_move_in_progress. b/news/kite_move_in_progress.
new file mode 100644
index 0000000..78c9c04
--- /dev/null
+++ b/news/kite_move_in_progress.
@@ -0,0 +1 @@
+A move of kitenet.net to a new server is in progress. The new server, wren.kitenet.net, is already up and available for login. Most user-visible services have not moved to wren yet; an announcement will be made when they move.
\ No newline at end of file

use munin on stork
diff --git a/index.mdwn b/index.mdwn
index b6b80e8..82ffd80 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -20,7 +20,7 @@
 * server use statistics: <a href="/mrtg/load.html">load</a>,
   <a href="/mrtg/ethernet.html">bandwidth</a>,
   <a href="/doc/analog/anlgform.html">web</a>, and
-  <a href="/munin/">more</a>
+  <a href="http://stork.kitenet.net/munin/">more</a>
 
 ## Kite server news
 

diff --git a/index.mdwn b/index.mdwn
index 15109b8..b6b80e8 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -7,8 +7,8 @@
 * <a href="~maggie/">Maggie Hess</a>
 * <a href="~errol/">Errol Hess</a>
 * <a href="~jen/">Jen Williams</a>
+* <a href="~family/">family website</a>
 * <a href="~kyle/">Kyle Scott MacLea</a>
-* <a href="~family/">the Hess family</a>
 * <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
 
 ### Other services

new pagespec format
diff --git a/index.mdwn b/index.mdwn
index d39c61f..15109b8 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,4 +27,4 @@
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
-[[inline pages="news/* !*/Discussion" show="4" rootpage="news"]]
+[[inline pages="news/* and !*/Discussion" show="4" rootpage="news"]]

diff --git a/index.mdwn b/index.mdwn
index 13840d7..d39c61f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
-# Welcome to kite
+## Welcome to kite
 
-## Homepages of kite users
+### Homepages of kite users
 
 * <a href="~joey/">Joey Hess</a>
 * <a href="~anna/">Anna Hess</a>
@@ -11,7 +11,7 @@
 * <a href="~family/">the Hess family</a>
 * <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
 
-## Other services
+### Other services
 
 * <a href="ssh/">ssh login to kite</a>
 * <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
@@ -22,7 +22,7 @@
   <a href="/doc/analog/anlgform.html">web</a>, and
   <a href="/munin/">more</a>
 
-# Kite server news
+## Kite server news
 
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.

diff --git a/index.mdwn b/index.mdwn
index 57b5581..13840d7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,7 +22,7 @@
   <a href="/doc/analog/anlgform.html">web</a>, and
   <a href="/munin/">more</a>
 
-## Kite server news
+# Kite server news
 
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.

diff --git a/stork.mdwn b/stork.mdwn
new file mode 100644
index 0000000..a84fcac
--- /dev/null
+++ b/stork.mdwn
@@ -0,0 +1,5 @@
+stork.kitenet.net is a XEN instance running inside a real machine that [[Joey]] has nothing to do with. It's located in the Netherlands.
+
+Stork doesn't have a great deal of memory or disk space, since using a virtual XEN system for a computer means renting both by the month. So the main ground rule is to avoid using disk space or memory that you don't need to, unlike on kite, which has oodles of both.
+
+Mail [[Joey]] to get an account.
\ No newline at end of file

diff --git a/joey.mdwn b/joey.mdwn
index 11ba72e..7b03e48 100644
--- a/joey.mdwn
+++ b/joey.mdwn
@@ -1 +1,3 @@
-Joey runs kite. His web site is [here](/~joey/)
\ No newline at end of file
+See Joey. See Joey run kite. Run kite run. 
+
+(Run away to Joey's [web site](/~joey/).)
\ No newline at end of file

diff --git a/joey.mdwn b/joey.mdwn
new file mode 100644
index 0000000..11ba72e
--- /dev/null
+++ b/joey.mdwn
@@ -0,0 +1 @@
+Joey runs kite. His web site is [here](/~joey/)
\ No newline at end of file

diff --git a/news/stork.kitenet.net_added.mdwn b/news/stork.kitenet.net_added.mdwn
new file mode 100644
index 0000000..d9516ae
--- /dev/null
+++ b/news/stork.kitenet.net_added.mdwn
@@ -0,0 +1,7 @@
+For a long time I've been planning to bring up a dedicated server to be a backup for kite in case something goes dreadfully wrong with kite's hardware or hosting.
+[[Stork]] is that server, it's located half a world away from kite, in Amsterdam,
+and it mostly exists to take over from kite if anything goes wrong. I'll also use it for more experimental or risky stuff to avoid causing problems with kite.
+
+You mostly don't need to worry about stork, and there's probably not much reason to use it for anything yourself, although if you want to use it for something, I will give you an account on it.
+
+--[[Joey]]
\ No newline at end of file

diff --git a/index.mdwn b/index.mdwn
index 680e1cd..57b5581 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,4 +27,4 @@
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
-[[inline pages="news/* !*/Discussion" show="4" rootpage="news/"]]
+[[inline pages="news/* !*/Discussion" show="4" rootpage="news"]]

diff --git a/news/wiki.mdwn b/news/wiki.mdwn
new file mode 100644
index 0000000..f059697
--- /dev/null
+++ b/news/wiki.mdwn
@@ -0,0 +1 @@
+Kite's website has now been switched over to a wiki, using [ikiwiki](http://ikiwiki.kitenet.net/) in the backend.
\ No newline at end of file

diff --git a/index.mdwn b/index.mdwn
index 57b5581..680e1cd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,4 +27,4 @@
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
-[[inline pages="news/* !*/Discussion" show="4" rootpage="news"]]
+[[inline pages="news/* !*/Discussion" show="4" rootpage="news/"]]

diff --git a/index.mdwn b/index.mdwn
index 680e1cd..57b5581 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,4 +27,4 @@
 Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
-[[inline pages="news/* !*/Discussion" show="4" rootpage="news/"]]
+[[inline pages="news/* !*/Discussion" show="4" rootpage="news"]]

update
diff --git a/index.mdwn b/index.mdwn
index 0bccbdf..680e1cd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -24,7 +24,7 @@
 
 ## Kite server news
 
-Kite users are encouraged to subscribe to the [[RSS|index.rss]] feed to
+Kite users are encouraged to subscribe to the [RSS](index.rss) feed to
 be kept up-to-date on important news about kite.
 
 [[inline pages="news/* !*/Discussion" show="4" rootpage="news/"]]

update
diff --git a/index.html b/index.html
deleted file mode 100644
index 62941a0..0000000
--- a/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<title>Welcome to kite</title>
-<h1>Homepages of kite users:</h1>
-<ul>
-	<li><a href="~joey/">Joey Hess</a>
-	<li><a href="~anna/">Anna Hess</a>
-	<li><a href="~maggie/">Maggie Hess</a>
-	<li><a href="~errol/">Errol Hess</a>
-	<li><a href="~jen/">Jen Williams</a>
-	<li><a href="~kyle/">Kyle Scott MacLea</a>
-	<li><a href="~family/">the Hess family</a>
-	<li><a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
-</ul>
-<p>
-<h1>Other services:</h1>
-<ul>
-	<li><a href="ssh/">ssh login to kite</a>
-	<li><a href="https://kitenet.net/cgi-bin/sqwebmail">web-based
-		email</a>
-	<li><a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
-	<li><a href="http://svn.kitenet.net/">subversion repository</a>
-	<li>server use statistics: <a href="/mrtg/load.html">load</a>,
-	    <a href="/mrtg/ethernet.html">bandwidth</a>,
-	    <a href="/doc/analog/anlgform.html">web</a>, and
-	    <a href="/munin/">more</a>
-	</ul>
-<p>
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..0bccbdf
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,30 @@
+# Welcome to kite
+
+## Homepages of kite users
+
+* <a href="~joey/">Joey Hess</a>
+* <a href="~anna/">Anna Hess</a>
+* <a href="~maggie/">Maggie Hess</a>
+* <a href="~errol/">Errol Hess</a>
+* <a href="~jen/">Jen Williams</a>
+* <a href="~kyle/">Kyle Scott MacLea</a>
+* <a href="~family/">the Hess family</a>
+* <a href="http://sows-ear.kitenet.net/">The Sow's Ear</a>
+
+## Other services
+
+* <a href="ssh/">ssh login to kite</a>
+* <a href="https://kitenet.net/cgi-bin/sqwebmail">web-based email</a>
+* <a href="/cgi-bin/mailman/listinfo">mailman mailing list manager</a>
+* <a href="http://svn.kitenet.net/">subversion repository</a>
+* server use statistics: <a href="/mrtg/load.html">load</a>,
+  <a href="/mrtg/ethernet.html">bandwidth</a>,
+  <a href="/doc/analog/anlgform.html">web</a>, and
+  <a href="/munin/">more</a>
+
+## Kite server news
+
+Kite users are encouraged to subscribe to the [[RSS|index.rss]] feed to
+be kept up-to-date on important news about kite.
+
+[[inline pages="news/* !*/Discussion" show="4" rootpage="news/"]]

rm
diff --git a/programs/showchanges.cgi b/programs/showchanges.cgi
deleted file mode 100755
index 649c4f2..0000000
--- a/programs/showchanges.cgi
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/perl
-# Parse a debian changelog and display first entry html formatted.
-print "Content-type: text/html\n\n<ul>";
-
-my $program=$ENV{QUERY_STRING};
-if ($program != /^[-a-z]+$/) {
-	die "you lose";
-}
-
-open(IN,"$program/CHANGES");
-<IN>;
-<IN>;
-while (<IN>) {
-	last if (/^ --/);
-	s/^  \* /<li>/;
-	print $_;
-}
-close IN;
-print "</ul>";

moved a lot of stuff to my new codewiki
diff --git a/programs/Lingua::EN::Words2Nums/index.html b/programs/Lingua::EN::Words2Nums/index.html
deleted file mode 100644
index d6484d9..0000000
--- a/programs/Lingua::EN::Words2Nums/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<HTML>
-<HEAD><title>Lingua::EN::Words2Nums</title></HEAD>
-<BODY>
-
-<h1 align=center>Lingua::EN::Words2Nums</h1>
-
-<p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i></p>
-
-Lingua::EN::Words2Nums is a perl module that can parse a wide variety of
-English text and deduce the number it represents. For example, it can
-convert "five million, one thousand and sixteen" to 5001016, and
-"twenty-seventh" to 27.
-
-<p>
-
-<form method="get" action="sample.cgi">
-<input type="text" name="input" size="50">
-<input type="submit" value="convert"><br>
-Can you stump Lingua::EN::Words2Nums?
-</form>
-
-<p>
-
-<h2>Downloading Lingua::EN::Words2Nums</h2>
-<ul>
-<li><a href="Lingua::EN::Words2Nums-<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/packages/Words2Nums/?root=joey">subversion repository</a></br>
-<li><a href="CHANGES">changelog</a>
-<li>Lingua::EN::Words2Nums is in <a href="http://cpan.org/">CPAN</a> and 
-also in the Debian ditribution
-</ul>
-
-<h2>Recent Changes</h2>
-Changes in version <!--#include virtual="LATEST-VERSION-IS"-->:
-<!--#include virtual="../showchanges.cgi?Lingua::EN::Words2Nums"-->
-
-<h2>Contacting the Author</h2>
-<p>I welcome all bug reports, feature requests, and comments. Just 
-<a href="mailto:joey@kitenet.net">email me</a>.</p>
-
-</BODY>
-</HTML>
diff --git a/programs/Lingua::EN::Words2Nums/sample.cgi b/programs/Lingua::EN::Words2Nums/sample.cgi
deleted file mode 100755
index ce771ae..0000000
--- a/programs/Lingua::EN::Words2Nums/sample.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-use Lingua::EN::Words2Nums;
-use CGI qw/:standard/;
-
-print header,
-	start_html("sample convesion"),
-	start_form(-method => "get"),
-	textfield(-name => "input", -size => 50),
-	submit("convert"),
-	end_form;
-
-if (param()) {
-	my $input=param('input');
-	my $val=words2nums($input);
-	if (! defined $val) {
-		print "Lingua::EN::Words2Nums has no idea what <i>$input</i> is!";
-	}
-	else {
-		print "Lingua::EN::Words2Nums says that <i>$input</i> = <b>$val</b>.";
-	}
-}
diff --git a/programs/alien/alien.gif b/programs/alien/alien.gif
deleted file mode 100644
index 522cfee..0000000
Binary files a/programs/alien/alien.gif and /dev/null differ
diff --git a/programs/alien/alien.icon.gif b/programs/alien/alien.icon.gif
deleted file mode 100644
index 6baa3a2..0000000
Binary files a/programs/alien/alien.icon.gif and /dev/null differ
diff --git a/programs/alien/index.html b/programs/alien/index.html
deleted file mode 100644
index 5238ab1..0000000
--- a/programs/alien/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<HTML>
-<HEAD><title>Alien package converter</title></HEAD>
-<BODY>
-
-<h1 align=center>Alien package converter</h1>
-
-<p align=center>
-<i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-	<input type="hidden" name="cmd" value="_xclick">
-	<input type="hidden" name="business" value="joey@kitenet.net">
-	<input type="hidden" name="item_name" value="alien">
-	<input type="hidden" name="no_shipping" value="1">
-	<input type="hidden" name="cn" value="Comments?">
-	<input type="hidden" name="currency_code" value="USD">
-	<input type="hidden" name="tax" value="0">
-	<input type="hidden" name="bn" value="PP-DonationsBF">
-	<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" border="0" name="submit" alt="Donate">
-</form>
-</p>
-
-<p><IMG ALT="" SRC="alien.gif" align="right">
-Alien is a program that converts between the rpm, dpkg, stampede slp, and 
-slackware tgz  file formats. If you want to use a package from another
-distribution than the one you have installed on your system, you can use
-alien to convert it to your preferred package format and install it.</p>
-
-<p>Despite the large version number, alien is still (and will probably always
-be) rather experimental software. It has been used by many people for many
-years, but there are still many bugs and limitations.</p>
-
-<p>Alien should <em>not</em> be used to replace important system packages, like 
-sysvinit, shared libraries, or other things that are essential for the 
-functioning of your system. Many of these packages are set up differently by 
-Debian and Red Hat, and packages from the different distributions cannot be 
-used interchangably. In general, if you can't uninstall the package without
-breaking your system, don't try to replace it with an alien version.</p>
-
-<IMG ALT="" SRC="ufo.gif" align="left">
-<h2>Downloading Alien</h2>
-<ul>
-<li><a href="alien_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/packages/alien/?root=joey">subversion repository</a></br>
-<li><a href="CHANGES">Alien changelog</a>
-</ul>
-<h2>Other things you'll need</h2>
-<p>To use alien, you will need several other programs. Alien is a perl program,
-and requires perl version 5.004 or greater.</p>
-
-<p>To convert packages to or from rpms, you need the Red Hat Package Manager; 
-get it from <a href="http://www.rpm.org/">its web site</a>.</p>
-
-<p>If you want to convert packages into debian packages, you will need the 
-dpkg, dpkg-dev, and debhelper packages, which are available on the 
-<a href="http://packages.debian.org/">Debian packages site</a>.
-You'll also need gcc, and make.</p>
-
-<p>Attention, all linux users who don't use Debian:
-<a href="mailto:BABCOCK@MATH.PSU.EDU">Bruce S. Babcock</a> has put together a
-package of all the extra files you need to use alien on a non-Debian
-distribution. It's called "alien-extra", and you can download it from
-<a href="ftp://ykbsb2.yk.psu.edu/pub/alien/">his ftp site</a>.
-</p>
-
-<!-- gone
-<p>Solaris packages of the software you need to use alien are also 
-<a href="http://mah.everybody.org/hacks/os/solaris">available</a>, thanks to
-<a href="mailto:mah@everybody.org">Mark A. Hershberger</a>.
--->
-
-<h2>Recent Changes</h2>
-Changes in version <!--#include virtual="LATEST-VERSION-IS"-->:
-<!--#include virtual="../showchanges.cgi?alien"-->
-
-<h2>Contacting the Author</h2>
-<p>I welcome all bug reports, feature requests, and comments. Just 
-<a href="mailto:joey@kitenet.net">email me</a>. If alien has saved you some
-time, show your appreciation by making a small 
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=alien&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&bn=PP%2dDonationsBF&charset=UTF%2d8">donation</a>.
-</p>
-
-<hr>
-
-<p>Also of interest is my <a href="/~joey/pkg-comp/">comparison</a> of
-features of the package formats alien supports.</P>
-
-</BODY>
-</HTML>
diff --git a/programs/alien/ufo.gif b/programs/alien/ufo.gif
deleted file mode 100644
index 23c1ecf..0000000
Binary files a/programs/alien/ufo.gif and /dev/null differ
diff --git a/programs/debconf/debconf.gif b/programs/debconf/debconf.gif
deleted file mode 100644
index a58735a..0000000
Binary files a/programs/debconf/debconf.gif and /dev/null differ
diff --git a/programs/debconf/debconf2.gif b/programs/debconf/debconf2.gif
deleted file mode 100644
index 60cb153..0000000
Binary files a/programs/debconf/debconf2.gif and /dev/null differ
diff --git a/programs/debconf/debconf3.gif b/programs/debconf/debconf3.gif
deleted file mode 100644
index dcc13a4..0000000
Binary files a/programs/debconf/debconf3.gif and /dev/null differ
diff --git a/programs/debconf/debconf4.gif b/programs/debconf/debconf4.gif
deleted file mode 100644
index 393b2a7..0000000
Binary files a/programs/debconf/debconf4.gif and /dev/null differ
diff --git a/programs/debconf/index.html b/programs/debconf/index.html
deleted file mode 100644
index fef77c4..0000000

(Diff truncated)
moved
diff --git a/programs/Lingua::EN::Words2Nums/index.html b/programs/Lingua::EN::Words2Nums/index.html
index 4c33dd1..d6484d9 100644
--- a/programs/Lingua::EN::Words2Nums/index.html
+++ b/programs/Lingua::EN::Words2Nums/index.html
@@ -24,7 +24,7 @@ Can you stump Lingua::EN::Words2Nums?
 <h2>Downloading Lingua::EN::Words2Nums</h2>
 <ul>
 <li><a href="Lingua::EN::Words2Nums-<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/Words2Nums/?root=joey">subversion repository</a></br>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/Words2Nums/?root=joey">subversion repository</a></br>
 <li><a href="CHANGES">changelog</a>
 <li>Lingua::EN::Words2Nums is in <a href="http://cpan.org/">CPAN</a> and 
 also in the Debian ditribution
diff --git a/programs/alien/index.html b/programs/alien/index.html
index eead5d2..5238ab1 100644
--- a/programs/alien/index.html
+++ b/programs/alien/index.html
@@ -40,7 +40,7 @@ breaking your system, don't try to replace it with an alien version.</p>
 <h2>Downloading Alien</h2>
 <ul>
 <li><a href="alien_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/alien/?root=joey">subversion repository</a></br>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/alien/?root=joey">subversion repository</a></br>
 <li><a href="CHANGES">Alien changelog</a>
 </ul>
 <h2>Other things you'll need</h2>
diff --git a/programs/dpkg-repack/index.html b/programs/dpkg-repack/index.html
index b6366d9..0105495 100644
--- a/programs/dpkg-repack/index.html
+++ b/programs/dpkg-repack/index.html
@@ -20,7 +20,7 @@ available elsewhere, or to store the current state of a package before you
 upgrade it.
 </p>
 dpkg-repack is available in subversion.
-<a href="http://svn.kitenet.net/trunk/src/dpkg-repack/?root=joey">Browse
+<a href="http://svn.kitenet.net/trunk/src/packages/dpkg-repack/?root=joey">Browse
 the repository online</a>. Of course it is also available in Debian.
 
 <h2>Recent Changes</h2>
diff --git a/programs/filters/index.html b/programs/filters/index.html
index 65e100c..a8e3a41 100644
--- a/programs/filters/index.html
+++ b/programs/filters/index.html
@@ -35,7 +35,7 @@ statement on them, often decades after they had written the original code.
 <h2>Downloading filters</h2>
 <ul>
 <li><a href="filters_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/filters/?root=joey">subversion repository</a></br>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/filters/?root=joey">subversion repository</a></br>
 <li><a href="CHANGES">filters changelog</a>
 </ul>
 
diff --git a/programs/pdmenu/index.html b/programs/pdmenu/index.html
index 00ab4a2..ecd1b92 100644
--- a/programs/pdmenu/index.html
+++ b/programs/pdmenu/index.html
@@ -46,7 +46,7 @@ is a must to compile Pdmenu.
 is a handy addon if you use Linux.
 </ul>
 <li>pdmenu is also part of the Debian distribution
-<li><a href="http://svn.kitenet.net/trunk/src/pdmenu/?root=joey">subversion repository</a>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/pdmenu/?root=joey">subversion repository</a>
 </ul>
 
 <h2>Recent Changes</h2>
diff --git a/programs/satutils/index.html b/programs/satutils/index.html
index a7a837c..2b48324 100644
--- a/programs/satutils/index.html
+++ b/programs/satutils/index.html
@@ -22,7 +22,7 @@ A program is also included to update your location on the
 <h2>Downloading satutils</h2>
 <ul>
 <li><a href="satutils_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/satutils/?root=joey">subversion repository</a></br>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/satutils/?root=joey">subversion repository</a></br>
 <li><a href="CHANGES">satutils changelog</a>
 </ul>
 
diff --git a/programs/sleepd/index.html b/programs/sleepd/index.html
index c94b410..87e4fee 100644
--- a/programs/sleepd/index.html
+++ b/programs/sleepd/index.html
@@ -14,7 +14,7 @@ must be used to actually put the system to sleep.
 <h2>Downloading sleepd</h2>
 <ul>
 <li><a href="sleepd_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
-<li><a href="http://svn.kitenet.net/trunk/src/sleepd/?root=joey">subversion repository</a></br>
+<li><a href="http://svn.kitenet.net/trunk/src/packages/sleepd/?root=joey">subversion repository</a></br>
 <li><a href="CHANGES">changelog</a>
 <li>sleepd is also in the Debian ditribution
 </ul>

new desc
diff --git a/programs/sleepd/index.html b/programs/sleepd/index.html
index fc7421c..c94b410 100644
--- a/programs/sleepd/index.html
+++ b/programs/sleepd/index.html
@@ -5,18 +5,11 @@
 <h1 align=center>sleepd</h1>
 
 <p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i></p>
-sleepd is a daemon to force laptops to enter apm  sleep
-after  some  period  of inactivity. This is useful if your
-laptop does not automatically go to sleep when you  aren't
-using it, and, like me, you often forget to shut it off.
+sleepd is a daemon to to put a laptop to sleep if it is not being used or
+if the battery is low.
 <p>
-sleepd monitors interrupts to detect when your laptop
-is in use. It defaults to automatically figuring out  what
-interupts  are  used by your keyboard and mouse (detection
-of mouse interrupts is only known to work with PS/2 mice).
-Other  interrupts  can  be specified. After a configurable
-amount of time with no activity on  these  interrupts,  it
-asks apm(1) to put the laptop to sleep.
+It supports both APM and ACPI, although in both cases external programs
+must be used to actually put the system to sleep.
 
 <h2>Downloading sleepd</h2>
 <ul>

debhelper changes
diff --git a/programs/debhelper/index.html b/programs/debhelper/index.html
index e3b30ee..2c98bbe 100644
--- a/programs/debhelper/index.html
+++ b/programs/debhelper/index.html
@@ -14,12 +14,13 @@ files, fix file permissions, integrate your package with the debian menu
 system, etc. This will be of use only to debian developers or others who
 wish to build debian packages.
 
-<p>
+<!-- <p>
 An interesting graph of how many packages have used debhelper over the years
 is <a href="http://auric.debian.org/~joeyh/debhelper-stats/">available</a>.
 <p>
+-->
 debhelper is available in subversion. Check out
-<tt>svn://kitenet.net/debhelper/trunk</tt>.
+<tt>svn://svn.debian.org/debhelper/trunk</tt>.
 Of course it is also available in Debian.
 </ul>
 

kill old thing
diff --git a/programs/alien/index.html b/programs/alien/index.html
index 6dd2918..eead5d2 100644
--- a/programs/alien/index.html
+++ b/programs/alien/index.html
@@ -6,7 +6,7 @@
 
 <p align=center>
 <i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i>
-<form align=center action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 	<input type="hidden" name="cmd" value="_xclick">
 	<input type="hidden" name="business" value="joey@kitenet.net">
 	<input type="hidden" name="item_name" value="alien">
@@ -62,9 +62,11 @@ distribution. It's called "alien-extra", and you can download it from
 <a href="ftp://ykbsb2.yk.psu.edu/pub/alien/">his ftp site</a>.
 </p>
 
+<!-- gone
 <p>Solaris packages of the software you need to use alien are also 
 <a href="http://mah.everybody.org/hacks/os/solaris">available</a>, thanks to
 <a href="mailto:mah@everybody.org">Mark A. Hershberger</a>.
+-->
 
 <h2>Recent Changes</h2>
 Changes in version <!--#include virtual="LATEST-VERSION-IS"-->:

foo
diff --git a/programs/alien/index.html b/programs/alien/index.html
index 3668cb9..6dd2918 100644
--- a/programs/alien/index.html
+++ b/programs/alien/index.html
@@ -4,8 +4,9 @@
 
 <h1 align=center>Alien package converter</h1>
 
-<p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<p align=center>
+<i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i>
+<form align=center action="https://www.paypal.com/cgi-bin/webscr" method="post">
 	<input type="hidden" name="cmd" value="_xclick">
 	<input type="hidden" name="business" value="joey@kitenet.net">
 	<input type="hidden" name="item_name" value="alien">

test donation button
diff --git a/programs/alien/index.html b/programs/alien/index.html
index f08154a..3668cb9 100644
--- a/programs/alien/index.html
+++ b/programs/alien/index.html
@@ -4,7 +4,19 @@
 
 <h1 align=center>Alien package converter</h1>
 
-<p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i></p>
+<p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+	<input type="hidden" name="cmd" value="_xclick">
+	<input type="hidden" name="business" value="joey@kitenet.net">
+	<input type="hidden" name="item_name" value="alien">
+	<input type="hidden" name="no_shipping" value="1">
+	<input type="hidden" name="cn" value="Comments?">
+	<input type="hidden" name="currency_code" value="USD">
+	<input type="hidden" name="tax" value="0">
+	<input type="hidden" name="bn" value="PP-DonationsBF">
+	<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" border="0" name="submit" alt="Donate">
+</form>
+</p>
 
 <p><IMG ALT="" SRC="alien.gif" align="right">
 Alien is a program that converts between the rpm, dpkg, stampede slp, and 
@@ -59,7 +71,12 @@ Changes in version <!--#include virtual="LATEST-VERSION-IS"-->:
 
 <h2>Contacting the Author</h2>
 <p>I welcome all bug reports, feature requests, and comments. Just 
-<a href="mailto:joey@kitenet.net">email me</a>.</p>
+<a href="mailto:joey@kitenet.net">email me</a>. If alien has saved you some
+time, show your appreciation by making a small 
+<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=alien&no_shipping=1&cn=Comments%3f&tax=0&currency_code=USD&bn=PP%2dDonationsBF&charset=UTF%2d8">donation</a>.
+</p>
+
+<hr>
 
 <p>Also of interest is my <a href="/~joey/pkg-comp/">comparison</a> of
 features of the package formats alien supports.</P>

cvs no longer available
diff --git a/programs/perlmoo/index.html b/programs/perlmoo/index.html
index 1d3239b..237029b 100644
--- a/programs/perlmoo/index.html
+++ b/programs/perlmoo/index.html
@@ -32,11 +32,5 @@ by untrusted users inside a perl process, even with Safe.pm. Due to this
 and other problems, I have dropped development on perlmoo, and wrote
 <a href="http://mooix.net/">mooix</a> instead.
 
-<p>
-
-Perlmoo's source is only availble from 
-<a href="http://cvs.kitenet.net/joey-cvs/public/packages/perlmoo">CVS</a>
-(in the Attic).
-
 </BODY>
 </HTML>

add
diff --git a/programs/filters/index.html b/programs/filters/index.html
new file mode 100644
index 0000000..65e100c
--- /dev/null
+++ b/programs/filters/index.html
@@ -0,0 +1,52 @@
+<HTML>
+<HEAD><title>The filters collection</title></HEAD>
+<BODY>
+
+<h1 align=center>filters</h1>
+
+<p align=center><i>Current version: <!--#include virtual="LATEST-VERSION-IS"--></i></p>
+
+The filters collection harks back to the late 80's, when various text
+filters were written to munge written language in amusing ways. The
+earliest and best known were legends such as the Swiedish Chef filter and
+B1FF.
+
+<p>
+
+Since 1996 I have been collecting these filters, keeping them running, and
+chasing down the copyright and licence information that lets me legally
+distribute them. In many cases this information is not available and so I
+have had to rewrite many of the early filters from scratch. The current
+filters package contains more than 20 filters.
+
+<p>
+
+The GNU project hosts a similar collection of filters, the
+<a href="http://ftp.gnu.org/non-gnu/talkfilters/">GNU talkfilters</a>.
+I would like to merge the two collections, but potential 
+<a href="talkfilters-mail">copyright issues</a> in the talkfilters and an
+inability to get a response back from its maintainer have prevented this so
+far. On the other hand, I do have to thank the many authors of filters who
+responded to my queries about getting a proper copyright and license
+statement on them, often decades after they had written the original code.
+
+<p>
+
+<h2>Downloading filters</h2>
+<ul>
+<li><a href="filters_<!--#include virtual="LATEST-VERSION-IS"-->.tar.gz">Latest source code</a><br>
+<li><a href="http://svn.kitenet.net/trunk/src/filters/?root=joey">subversion repository</a></br>
+<li><a href="CHANGES">filters changelog</a>
+</ul>
+
+<h2>Recent Changes</h2>
+Changes in version <!--#include virtual="LATEST-VERSION-IS"-->:
+<!--#include virtual="../showchanges.cgi?filters"-->
+
+<h2>Contacting the Author</h2>
+<p>I welcome all bug reports, comments (except for complaints about the
+harmless slurs present in some filters), and contributions of new filters.
+Just <a href="mailto:joey@kitenet.net">email me</a>.</p>
+
+</BODY>
+</HTML>
diff --git a/programs/filters/talkfilters-mail b/programs/filters/talkfilters-mail
new file mode 100644
index 0000000..0688905
--- /dev/null
+++ b/programs/filters/talkfilters-mail
@@ -0,0 +1,122 @@
+Date: Sat, 6 Nov 2004 16:08:00 -0500
+From: Joey Hess <joeyh@debian.org>
+To: Mark Lindner <markl@gnu.org>
+Subject: gnu talkfilters
+Message-ID: <20041106210800.GA9585@kitenet.net>
+Mime-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha1;
+	protocol="application/pgp-signature"; boundary="NzB8fVQJ5HfG6fxh"
+Content-Disposition: inline
+User-Agent: Mutt/1.5.6+20040907i
+Content-Length: 4744
+Lines: 108
+
+
+--NzB8fVQJ5HfG6fxh
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+I found your gnu talkfilters package today. I did not know this
+collection of filters existed, but I have been collecting filters since
+1996 and ended up with a collection of some of the same filters. This
+has shipped in the Debian GNU/Linux distribution as the "filters"
+package for many years. Now that I've found your package, which includes
+some new and some improved filters, and I wonder if I can somehow
+merge my filters package into it to avoid duplicate work.
+
+One way that could be done is to add filters from my collection to the
+talkfilters. I'd be happy to see this happen if you want to add them,
+and if the licenses and implementation language are ok. Some of my
+filters are written in perl, so would not be usable with the gaim
+plugin. Not all of them are GPLed, and only the ones written by me have
+to possibility of easily having their copyright assigned to the FSF, if
+you do that. The filters in my collection that are missing from yours
+are:
+
+ - censor (perl, GPL, copyright reassignable)
+ - eleet (perl, GPL, probably similar to warez, copyright reassignable)
+ - jibberish (perl, GPL, copyright reassignable)
+ - kraut (lex, public domain)
+ - ky00te (lex, GPL)
+ - newspeak (lex, BSD-ish)
+ - rasterman (perl, GPL)
+ - spammer (perl, GPL, copyright reassignable)
+ - studly (perl, public domain-ish)
+ - uniencode (perl, GPL, copyright reassignable)
+ - upside-down (perl, GPL, copyright reassignable)
+
+You can find the source here:
+http://packages.debian.org/unstable/games/filters
+
+It might be possible to use the talkfilters collection as the "upstream
+source" for the Debian filters package (or a new Debian talkfilters
+package). Unfortunatly this seems problimatic because of some copyright
+issues.
+
+I noticed that all of the filters in your package are marked
+as being GPL copyright by the FSF. I'm suprised to see that, because I
+had a lot of trouble tracking down the original authors of some of the
+same filters. All the filters in my collection are free software, but
+only because I rewrote several of them (eleet, fudd, chef, b1ff), and
+got copyright clarifications for others (cockney, jive, nyc, ken,
+ky00te, newspeak).
+
+Looks like you found a different, free implementations of b1ff. Much
+better than my reimplementation, probably.
+
+It seems to me that your fudd is based on a version from an unknown
+author. I have a copy of that old fudd.l from which yours is apparently
+derived, which is 37 lines and possibly too short to be copyrightable. I
+never found its author either, my replacement fudd is written in perl.
+
+I was never able to contact John Hagerman about the copyright of chef.
+Did you? I have a chef that is rewritten in perl but does not have
+exactly the same behavior as the original (see my README).
+
+I think that your cockney filter is oddly named. That was originally
+called the "ken" filter. The cockney filter in my collection was written
+by Daniel Klein, and I was able to get in touch with him and get it
+GPLed. It produces much more cockney english rather than the weird
+"rhyming slang" procuced by ken. I was able to contact ken's author in
+2001 and he put it in the public domain.
+
+I used to include valspeak in my collection, but since I couldn't find
+its author either, I dropped it for copyright reasons.
+
+Your authors file lists no known author for kraut, however I have a
+slightly different version of the same kraut filter that was John Sparks
+and is in the public domain.
+
+How did you manage to get valspeak, postmodern, pansy, and fudd, whose
+authors are unknown to be GPLed? According to the info page,
+
+      While all of these filters have been available in one form or
+  another in the public domain for many years, the original authors of
+  some of the filters are unknown. Reasonable attempts were made to find
+  the authors and obtain written permission to repackage the filters as
+  GNU software, but in some cases they could not be located.
+
+It seem to me questonable to slap the GPL and a FSF copyright on a file
+just because it is being distributed about the net. So I have some
+doubts about the validity of the copyright of some of the talkfilters. I
+would not be comfortable putting them in the Debian distribution with
+thieir copyright in this state. :-/
+
+--=20
+see shy jo
+
+--NzB8fVQJ5HfG6fxh
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: Digital signature
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBjT0wd8HHehbQuO8RAqpMAKCeOw1y8cOPvEcUk3gUcTpUqVB41wCggCb5
+mrpS924W/0jI2VIcqyw7LkI=
+=/OsH
+-----END PGP SIGNATURE-----
+
+--NzB8fVQJ5HfG6fxh--