(no commit message)

[git.ikiwiki.info.git] / doc / install.mdwn

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 4d4bd08ecf25cce48a3ab4daf36277f95c1ea62c..9c5d5939b132ca07b46a97c1656d9e8ad69263d1 100644 (file)
--- 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.
@@ -19,21 +20,6 @@ they are available.
 Various [[plugins]] use other perl modules and utilities; see their individual
 documentation for details.
 
-### Installing dependencies with yum
-
-Here's an example of how to install ikiwiki's dependencies using yum
-on Fedora 7:
-
-       yum install perl-Text-Markdown perl-Mail-Sendmail perl-HTML-Scrubber \
-         perl-XML-Simple perl-TimeDate perl-HTML-Template perl-CGI-FormBuilder \
-         perl-CGI-Session perl-File-MimeInfo perl-gettext perl-Authen-Passphrase
-
-And in Ubuntu Intrepid:
-
-       apt-get install libtext-markdown-perl libhtml-scrubber-perl libxml-simple-perl \
-         libtimedate-perl libhtml-template-perl libcgi-formbuilder-perl libcgi-session-perl \
-         libfile-mimeinfo-perl liblocale-gettext-perl libauthen-passphrase-perl
-
 ### Installing dependencies by hand
 
 If you want to install by hand from the tarball, you should make sure that
@@ -56,5 +42,6 @@ If you're using a shared hosting provider, of the sort where you don't have
 root, you can still install ikiwiki. There are tutorials covering this for
 a few providers:
 
+
 * [[tips/NearlyFreeSpeech]]
 * [[tips/DreamHost]]