Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 6a88b6c56e8387385c7753ce37a8e202f27607ff..4d4bd08ecf25cce48a3ab4daf36277f95c1ea62c 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -11,15 +11,15 @@ 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]],
-[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]]
+Ikiwiki requires the [[!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.
 
 Various [[plugins]] use other perl modules and utilities; see their individual
 documentation for details.
 
-### installing dependencies with yum
+### Installing dependencies with yum
 
 Here's an example of how to install ikiwiki's dependencies using yum
 on Fedora 7:
@@ -28,7 +28,13 @@ on Fedora 7:
          perl-XML-Simple perl-TimeDate perl-HTML-Template perl-CGI-FormBuilder \
          perl-CGI-Session perl-File-MimeInfo perl-gettext perl-Authen-Passphrase
 
-### installing dependencies by hand
+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
 all the perl modules are installed. This is one way to install them, using
@@ -37,7 +43,7 @@ CPAN:
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
        PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki::Extras")'
 
-## installing ikiwiki by hand
+## Installing ikiwiki by hand
 
 Then to build and install ikiwiki: