X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/99d52a1794f25ee2efc7a580e8e9bc8819811bd9..81dd13f01f1423bc39dd13990eeaf2886cf3e473:/doc/install.mdwn

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 575598546..da84616e4 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -1,29 +1,30 @@
-The easiest way to install ikiwiki is using the Debian package.
+The easiest way to install ikiwiki is using the Debian package, but you can
+also [[download]] the source and install it by hand. Ikiwiki should work on
+most unix-like systems.
 
 Ikiwiki is a perl program, and needs a recent version of perl such as
 5.8.8. (5.8.0 has been reported not to work).
 
-Ikiwiki requires [[MarkDown]] and the `HTML::Parser` perl module be
+Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]],
+[[cpan HTML::Parser]], and [[cpan HTML::Template]] perl modules be
 installed, and also uses the following perl modules if available: 
-`CGI::Session` `CGI::FormBuilder` (version 3.02.02 or newer)
-`HTML::Template` `Mail::Sendmail` `Time::Duration` `Date::Parse`,
-`HTML::Scrubber`, `RPC::XML`, `XML::Simple`, `XML::Feed`.
+[[cpan CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.02.02 or newer),
+[[cpan Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]],
+[[cpan HTML::Scrubber]], [[cpan RPC::XML]], [[cpan XML::Simple]],
+[[cpan XML::Feed]], [[cpan File::MimeInfo]], [[cpan Locale::gettext]]
+(version 1.04 or newer).
 
-The [[tla]] support also needs the `MailTools` perl module.
+The [[tla]] support also needs the [[cpan MailTools]] perl module.
 
 Various [[plugins]] use other libraries and utlities; see their individual
 documentation for details.
 
-If you're installing MarkDown by hand, note that it should be installed as
-`Markdown.pm` somewhere in perl's module search path, or alternately as
-`/usr/bin/markdown`. Ikiwiki will find it under either name.
-
 If you want to install from the tarball, you should make sure that the
 required perl modules are installed, then run:
 
-        perl Makefile.PL # PREFIX=/dir to install elsewhere
-        make
+	perl Makefile.PL # PREFIX=/dir to install elsewhere
+	make
 	make test # optional
-        make install
+	make install
 
 See [[download]] for where to get it.