Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 8f90165825e1f6dd2d68d23371b8afd4eee1374b..86ddb46b2c9c66a7b5065967ffd499de916e0c01 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -10,8 +10,8 @@ Installation steps and requirements are listed on the [[install]] page.
 
 ## packages
 
 
 ## packages
 

-If using Debian (since 4.0), or Ubuntu (since 6.10):
-[[template id=note text="""
+To install with 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
 ikiwiki, there have been lots of enhancements and bug fixes since those
 versions.
 Note that Debian 4.0 and especially Ubuntu 6.10 contain older versions of
 ikiwiki, there have been lots of enhancements and bug fixes since those
 versions.


@@ -24,14 +24,21 @@ 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>.
 
 There is a backport of a recent version of ikiwiki for Debian 4.0 at
 <http://packages.debian.org/etch-backports/ikiwiki>.
 

-There is also an unofficial backport of ikiwiki for Ubuntu Gutsy
-and Ubuntu Hardy, provided by Paweł Tęcza,
+Fedora versions 8 and newer have RPMs of ikiwiki available.
+
+There is also an unofficial backport of ikiwiki for Ubuntu Hardy, 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).
 
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 

-Also, FreeBSD has ikiwiki in its
+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/).
 
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 

-And Gentoo has an [ebuild](http://bugs.gentoo.org/attachment.cgi?id=145837) 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
 
 
 ## revision control