Merge commit 'origin'

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 609d074b5f437bd8b6fcf89d059d4ce62e64a764..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,28 +24,22 @@ 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, provided by
-Paweł Tęcza, at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
+Fedora versions 8 and newer have RPMs of ikiwiki available.

 
 

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

 
 

-### git
+NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).

 
 

-Ikiwiki is developed in a git repository and can be checked out by
-either of these commands:
-
-       git clone git://git.ikiwiki.info/
-       git clone http://git.ikiwiki.info/ikiwiki.git/
+FreeBSD has ikiwiki in its
+[ports collection](http://www.freshports.org/www/ikiwiki/).

 
 

-The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).
+Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 

 
 

-Commits to this git repository are fed into [CIA](http://cia.vc), and can
-be browsed, subscribed to etc on its
-[project page](http://cia.vc/stats/project/ikiwiki).
+IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.

 
 

-### subversion
+## revision control

 
 

-Ikiwiki's subversion repository is no longer available, use git instead.
+Ikiwiki is developed in a [[git_repository|git]].