move all package indo to download page

The package info was getting split between download and install.
Leave install for manual instructions.

diff --git a/doc/download.mdwn b/doc/download.mdwn
index f3f0a004b08cd851c157fc8c02728fc929513c03..dcabaa3df76c08c35bca61c12a12283eaadb9507 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -10,6 +10,8 @@ Installation steps and requirements are listed on the [[install]] page.
 
 ## packages
 
+### apt
+
 If using Debian (since 4.0), or Ubuntu (since 6.10):
 [[template id=note text="""
 Note that Debian 4.0 and especially Ubuntu 6.10 contain older versions of
@@ -28,10 +30,15 @@ There is also an unofficial backport of ikiwiki for Ubuntu Gutsy
 and Ubuntu Hardy, provided by Paweł Tęcza,
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 
-Also, FreeBSD has ikiwiki in its
+### other
+
+FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
-And Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
+Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
+
+IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.
 
 ## revision control
 

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 68f1c10dfd8e29a40cffe2c1e49ca4e476a628e1..6a88b6c56e8387385c7753ce37a8e202f27607ff 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -1,6 +1,7 @@
-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.
+This page documents how to install ikiwiki if a prepackaged version is not
+available for your distribution, and you are faced with [[downloading|download]]
+the source and installing by hand. Ikiwiki should work on most unix-like
+systems.
 
 ## Dependencies
 
@@ -18,26 +19,16 @@ they are available.
 Various [[plugins]] use other perl modules and utilities; see their individual
 documentation for details.
 
-## Debian
+### installing dependencies with yum
 
-The Debian packages depend on and recommend an appropriate set of packages,
-so just install ikiwiki using apt.
-
-## Fedora 7
-
-While Fedora 7 doesn't have an ikiwiki package, you can install needed
-perl modules using this command:
+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
 
-## macports
-
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
-by running `sudo port install ikiwiki`.
-
-## Installing by hand
+### 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
@@ -46,6 +37,8 @@ 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
+
 Then to build and install ikiwiki:
 
        perl Makefile.PL # PREFIX=/dir to install elsewhere