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

diff --git a/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn
new file mode 100644 (file)
index 0000000..0c39c41
--- /dev/null
+++ b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn
@@ -0,0 +1 @@
+Would you consider Recommending `libtext-markdown-discount` instead of depending on it?  It isn't available in wheezy, and the sid version is the wrong side of a perl transition, unfortunately.  This is the only dependency preventing the stock sid version of ikiwiki from being installable on a wheezy host. -- [[Jon]]

diff --git a/doc/users/ajt.mdwn b/doc/users/ajt.mdwn
index bc47040b65ad050e313390d3156f817a4366e579..61efbf8b6b2c565f136abd4942a307b3383f3c8e 100644 (file)
--- a/doc/users/ajt.mdwn
+++ b/doc/users/ajt.mdwn
@@ -12,9 +12,9 @@ I like wikis and I'm currently in love with ikiwiki, having moved my home intran
 
 * [iredale dot net](http://www.iredale.net/) my web server and main blog
 * [ajt](http://www.perlmonks.org/index.pl?node_id=113686) my Perkmonks home node
-* [ajt](http://use.perl.org/~ajt) my use Perl home
 * [ATRICKETT](http://search.cpan.org/~atrickett/) my CPAN folder
 * [ajt](http://www.debian-administration.org/users/ajt) my Debian-Administration home (good site btw)
+* [ajt](http://www.blipfoto.com/ajt) by blipfoto photo blog
 * [drajt](http://www.linkedin.com/in/drajt) my LinkedIn profile
 * [drajt](http://www.slideshare.net/drajt) my "Slidespace" on SlideShare
 * [AdamTrickett](http://www.hants.lug.org.uk/cgi-bin/wiki.pl?AdamTrickett) my wiki page on my LUG's site

diff --git a/doc/users/schmonz-web-ikiwiki.mdwn b/doc/users/schmonz-web-ikiwiki.mdwn
new file mode 100644 (file)
index 0000000..6b0dbed
--- /dev/null
+++ b/doc/users/schmonz-web-ikiwiki.mdwn
@@ -0,0 +1 @@
+[[!meta redir=users/schmonz]]