Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/forum/managing_todo_lists.mdwn b/doc/forum/managing_todo_lists.mdwn
new file mode 100644 (file)
index 0000000..238b000
--- /dev/null
+++ b/doc/forum/managing_todo_lists.mdwn
@@ -0,0 +1,4 @@
+I keep some TODO lists on ikiwiki pages. I'm half-tempted to write a plugin
+to make ticking items off and adding items easier via the web interface. I'm
+aware though that this is not really what ikiwiki is designed for. Would
+anyone else find this useful? -- [[users/jon]]

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8dea61f6ae4fb46b930d363e1937a4f097f2a5d7..cf454f8d25df3d0a76ecbe7cb822ad8d9c0fa989 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -44,6 +44,7 @@ Projects & Organizations
 * [St Hugh of Lincoln Primary School in Surrey](http://hugh.vm.bytemark.co.uk/)
 * [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
+* [A webpage about biometric travel documents (in german)](http://biometrische-ausweise.ch), which uses an Ikiwiki with a subversion repository.
 
 Personal sites and blogs
 ========================