aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-01-01 17:40:50 -0400
committerJoey Hess <joey@kitenet.net>2012-01-01 17:40:50 -0400
commit335ffd06763dffa7de733f0e45304edcc7249f87 (patch)
tree6927c16b5418fd11fb7c825cff0e59539f15349a
parentaa2ba8ad9a92d0c8fc59201675b789d6d302f4d7 (diff)
downloadikiwiki-335ffd06763dffa7de733f0e45304edcc7249f87.tar
ikiwiki-335ffd06763dffa7de733f0e45304edcc7249f87.tar.gz
switch bundle to discount, and mention it in install
-rw-r--r--Bundle/IkiWiki.pm2
-rw-r--r--doc/install.mdwn3
2 files changed, 3 insertions, 2 deletions
diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm
index a82362317..a0bd60e46 100644
--- a/Bundle/IkiWiki.pm
+++ b/Bundle/IkiWiki.pm
@@ -16,7 +16,7 @@ perl -MCPAN -e 'install Bundle::IkiWiki'
=head1 CONTENTS
-Text::Markdown
+Text::Markdown::Discount
HTML::Scrubber
HTML::Template
HTML::Parser
diff --git a/doc/install.mdwn b/doc/install.mdwn
index f38ae2aab..9c5d5939b 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -11,7 +11,8 @@ Ikiwiki is a perl program, and needs a recent version of perl such as
It's recommended you have a C compiler, as ikiwiki uses one to build
wrappers.
-Ikiwiki requires the [[!cpan Text::Markdown]], [[!cpan URI]],
+Ikiwiki requires the [[!cpan Text::Markdown::Discount]] (or
+[[!cpan Text::Markdown]]), [[!cpan URI]],
[[!cpan HTML::Parser]], [[!cpan HTML::Template]], and [[!cpan HTML::Scrubber]]
perl modules be installed. It can also use a lot of other perl modules, if
they are available.