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 feb0742b61cd17678a3f2f355da23e599ca2150b..5e3720c5ebc609457b6fd887d86c5ca8aaa6a179 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -6,13 +6,22 @@ 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 the [[cpan Text::Markdown]], [[cpan URI]],
 5.8.8. (5.8.0 has been reported not to work).
 
 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: 
-[[cpan CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 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).
+[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]]
+perl modules be installed.
+
+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.
+
+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:
 
 While Fedora 7 doesn't have an ikiwiki package, you can install needed
 perl modules using this command:


@@ -21,9 +30,6 @@ perl modules using this command:
          perl-XML-Simple perl-TimeDate perl-HTML-Template perl-CGI-FormBuilder \
          perl-CGI-Session perl-File-MimeInfo perl-gettext
 
          perl-XML-Simple perl-TimeDate perl-HTML-Template perl-CGI-FormBuilder \
          perl-CGI-Session perl-File-MimeInfo perl-gettext
 

-Various [[plugins]] use other libraries and utlities; see their individual
-documentation for details.
-

 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: