Merge commit 'origin'

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 05ea68036c4f9095f779cba60ec595692babd207..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
 
-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.
@@ -24,36 +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 also an unofficial backport of ikiwiki for Debian 3.1, provided by
-Paweł Tęcza, at <http://gpa.net.icm.edu.pl/debian/>.
+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
-
-### subversion
+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).
 
-The current development version of ikiwiki can be accessed using subversion at 
-`svn://ikiwiki.info/ikiwiki/trunk`
+NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
 
-The source in subversion can be browsed
-[here](http://ikiwiki.info/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki).
-
-Commits to ikiwiki's source code are now fed into
-[CIA](http://cia.vc), and can be browsed, subscribed to etc on its
-[project page](http://cia.vc/stats/project/ikiwiki). Note that changes
-to the documentation wiki are currently excluded.
+FreeBSD has ikiwiki in its
+[ports collection](http://www.freshports.org/www/ikiwiki/).
 
-### git
+Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
 
-A git mirror of the trunk of the subversion repository is available at
-`git://ikiwiki.info/` and also at <http://ikiwiki.info/ikiwiki.git/>.
-It is updated using `git-svnimport` whenever changes are committed to the
-subversion repository.
+IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.
 
-### arch
+## revision control
 
-An unofficial arch mirror of the subversion repository is at
-<http://arch.debian.org/arch/private/srivasta/archive-2006-misc>
-and can be browsed [here](http://arch.debian.org/cgi-bin/archzoom.cgi/srivasta@debian.org--2006-misc?color=default?layout=larger?expand).
+Ikiwiki is developed in a [[git_repository|git]].