diff options
| author | Joey Hess <joey@kitenet.net> | 2012-02-02 22:43:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-02 22:43:25 -0400 |
| commit | 7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7 (patch) | |
| tree | 4e04d5265694b9e0b76b9e3ebf3577308732942f | |
| parent | 0a9bb3edc2a9819ba87de1b6e57155120b6aba44 (diff) | |
| parent | 5468502b9c29c5177fbcf2ac98499531102f9855 (diff) | |
| download | ikiwiki-7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7.tar ikiwiki-7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
| -rw-r--r-- | doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn | 1 | ||||
| -rw-r--r-- | doc/users/ajt.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/schmonz-web-ikiwiki.mdwn | 1 |
3 files changed, 3 insertions, 1 deletions
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 index 000000000..0c39c41ae --- /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 bc47040b6..61efbf8b6 100644 --- 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 index 000000000..6b0dbed88 --- /dev/null +++ b/doc/users/schmonz-web-ikiwiki.mdwn @@ -0,0 +1 @@ +[[!meta redir=users/schmonz]] |