Merge branch 'master' into autoconfig

[ikiwiki.git] / doc / download.mdwn

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 95c48b456eef0beb4ab387bf999e847d25c1f9e7..71d333ad4d7b5fd5e64ac948f102b62a829a4874 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -11,7 +11,7 @@ Installation steps and requirements are listed on the [[install]] page.
 ## packages
 
 To install with apt, if using Debian (since 4.0), or Ubuntu (since 6.10):
 ## packages
 
 To install with apt, if using Debian (since 4.0), or Ubuntu (since 6.10):

-[[template id=note text="""
+[[!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,10 +24,12 @@ 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,
+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).
 

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