Merge branch 'master' into po

Conflicts:
	debian/changelog

4 files changed, 16 insertions, 14 deletions

diff --git a/doc/users/TimBosse.mdwn b/doc/users/TimBosse.mdwn
new file mode 100644
index 000000000..bd459cc80
--- /dev/null
+++ b/doc/users/TimBosse.mdwn
@@ -0,0 +1 @@
+<http://bosboot.org>
diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index 61c381d96..0030a30d3 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -47,7 +47,7 @@ welcome.
    headers at top of a file (e.g., `title: Page Title` or
    `date: November 2, 2008 11:14 EST`).
 
- * [pandoc][] - Markdown page processing via Pandoc.  LaTeX and
+ * [pandoc][] - Markdown page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another).  LaTeX and
    reStructuredText are optional.
 
  * [path][] - Provides path-specific template conditionals such as
diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 1cda23999..551d4764a 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -16,5 +16,12 @@ of software for this task.
 
  * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
 
-I am also working on some ikiwiki hacks: an alternative approach to
-[[plugins/comments]]; a system for [[forum/managing_todo_lists]].
+I am also working on some ikiwiki hacks:
+
+* an alternative approach to [[plugins/comments]] (see
+  [[todo/more flexible inline postform]] for one piece of the puzzle;
+  <http://dev.jmtd.net/comments/> for some investigation into making the post
+  form more integrated)
+* a system for [[forum/managing_todo_lists]] (see also
+  [[todo/interactive todo lists]] and <http://dev.jmtd.net/outliner/> for the
+  current WIP).
diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 4d2204f8a..bb5cef6a6 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -4,14 +4,8 @@
 <tschwinge@gnu.org>  
 <http://www.thomas.schwinge.homeip.net/>
 
-
-With respect to *[[ikiwiki]]* I'm currently working on...
-
-* setting it up for the [GNU Hurd's web pages](http://www.gnu.org/software/hurd/);
-* setting it up as a replacement for the GNU Hurd's previous wiki (TWiki): <http://bddebian.com/~wiki/>;
-
-... and all that while trying to preserve the previous content's history,
-which is stored in a CVS repository for the web pages and a RCS repository
-for the wiki.
-
-Read [About the TWiki to ikiwiki conversion](http://www.bddebian.com/~wiki/about_the_twiki_to_ikiwiki_conversion/).
+I have converted the [GNU Hurd](http://www.gnu.org/software/hurd/)'s previous
+web pages and previous wiki pages to a *[[ikiwiki]]* system; and all that while
+preserving the previous content's history, which was stored in a CVS repository
+for the HTML web pages and a TWiki RCS repository for the wiki; see
+<http://www.gnu.org/software/hurd/colophon.html>.