Revert spam

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 3b02e912732fe522c49725145dea6974487bf081..3890df9f299a69bb59e5ad73a2195d31d2e0cf5a 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -11,11 +11,9 @@ The best place to download a tarball of the latest release is from
 
 Manual installation steps and requirements are listed on the [[install]] page.
 
-## packages
+## Debian / Ubuntu packages
 
-### Debian / Ubuntu
-
-To install with apt:
+To install with [apt](http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations), if using Debian or Ubuntu:
 
         apt-get install ikiwiki
 
@@ -28,27 +26,26 @@ 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).
 
-### Fedora / other RPM based systems
+## 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
+## BSD ports
+
+NetBSD, Mac OS X, Solaris, and many other platforms: [pkgsrc](http://www.pkgsrc.org/) has an [ikiwiki package](http://pkgsrc.se/www/ikiwiki).
 
-NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
+pkg install -U ikiwiki
 
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
-### Others
+## Other packages
 
 Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database. 
 
 The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL&p=1&q=ikiwiki) has packages for openSUSE
 
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
-by running `sudo port install ikiwiki`.
-
-A [PKGBUILD for Arch Linux](http://aur.archlinux.org/packages.php?ID=12284) is in the AUR.
+A [PKGBUILD for Arch Linux](https://aur.archlinux.org/packages/ikiwiki/) is in the AUR.