Merge branch 'master' into revert

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 507b250a58efd3793eff4b673c1d6eec9c456779..92c8a4f759810ee7f5a02b41900f9f884947a28b 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -1,14 +1,17 @@
-Here's how to get ikiwiki. See [[setup]] for how to use it, and be sure to
-add your wiki to [[IkiwikiUsers]] if you use ikiwiki.
+Here's how to get ikiwiki in source or prepackaged form. See [[setup]] for
+how to use it, and be sure to add your wiki to [[IkiwikiUsers]] if you use
+ikiwiki.

 
 

-## tarball
+## source
+
+Ikiwiki is developed in a [[git_repository|git]].

 
 The best place to download a tarball of the latest release is from 
 <http://packages.debian.org/unstable/source/ikiwiki>.
 
 
 The best place to download a tarball of the latest release is from 
 <http://packages.debian.org/unstable/source/ikiwiki>.
 

-Installation steps and requirements are listed on the [[install]] page.
+Manual installation steps and requirements are listed on the [[install]] page.

 
 

-## packages
+## Debian / Ubuntu packages

 
 To install with apt, if using Debian or Ubuntu:
 
 
 To install with apt, if using Debian or Ubuntu:
 


@@ -16,27 +19,34 @@ To install with apt, if using Debian or Ubuntu:
 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 
 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 

-There is a backport of a recent version of ikiwiki for Debian 4.0 at
-<http://packages.debian.org/etch-backports/ikiwiki>.
-
-Fedora versions 8 and newer have RPMs of ikiwiki available.
+There is a backport of a recent version of ikiwiki for Debian 5.0 at
+<http://packages.debian.org/lenny-backports/ikiwiki>.

 
 

-There is also an unofficial backport of ikiwiki for Ubuntu Intrepid, provided by
+There is also an unofficial backport of ikiwiki for Ubuntu Jaunty, provided by

 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 
 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 

+## RPM packages
+
+Fedora versions 8 and newer have RPMs of ikiwiki available.
+
+Ikiwiki's source includes a RPM spec file, which you can use to build your
+own RPM.
+
+## BSD ports
+
+Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.
+

 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
 
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
 
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 

+## Other packages
+

 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`.
+The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL&p=1&q=ikiwiki) has packages for openSUSE

 
 A [PKGBUILD for Arch Linux](http://aur.archlinux.org/packages.php?ID=12284) is in the AUR.
 
 A [PKGBUILD for Arch Linux](http://aur.archlinux.org/packages.php?ID=12284) is in the AUR.

-
-## revision control
-
-Ikiwiki is developed in a [[git_repository|git]].