Make makerepo set the Git merge remote

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

diff --git a/doc/install.mdwn b/doc/install.mdwn
index bc10677376e00551b4e277adfc47dd0a8da578d8..5e3720c5ebc609457b6fd887d86c5ca8aaa6a179 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -5,28 +5,37 @@ 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 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 `URI` and `HTML::Parser` 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`.
+Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]],
+[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]]
+perl modules be installed.

 
 

-The [[tla]] support also needs the `MailTools` perl module.
+It also uses the following perl modules if available: [[cpan
+CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer), [[cpan
+Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], [[cpan
+RPC::XML]], [[cpan XML::Simple]], [[cpan XML::Feed]], [[cpan
+File::MimeInfo]], [[cpan Locale::gettext]] (version 1.04 or newer).
+
+It's recommended you have a C compiler, as ikiwiki uses one to build
+wrappers.

 
 Various [[plugins]] use other libraries and utlities; see their individual
 documentation for details.
 
 
 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.
+The Debian packages depend on and recommend an appropriate set of packages.
+
+While Fedora 7 doesn't have an ikiwiki package, you can install needed
+perl modules using this command:
+
+       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

 
 If you want to install from the tarball, you should make sure that the
 required perl modules are installed, then run:
 
 
 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 test # optional

-        make install
+       make install

 
 See [[download]] for where to get it.
 
 See [[download]] for where to get it.