Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 789c82d17cb986d8441b0313585202da8b6e4d8a..6c248045fbfbbee9d396e80b505b6bb9ecddf652 100644 (file)
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -6,23 +6,25 @@ add your wiki to [[IkiwikiUsers]] if you use ikiwiki.
 The best place to download a tarball of the latest release is from 
 <http://packages.debian.org/unstable/source/ikiwiki>.
 
 The best place to download a tarball of the latest release is from 
 <http://packages.debian.org/unstable/source/ikiwiki>.
 

+Installation steps and requirements are listed on the [[install]] page.
+

 ## packages
 
 If using Debian (since 4.0), or Ubuntu (since 6.10):
 ## packages
 
 If using Debian (since 4.0), or Ubuntu (since 6.10):

-
-        apt-get install ikiwiki
-
+[[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.

+"""]]
+
+        apt-get install ikiwiki

 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 
 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 

-While this deb has been developed on Debian unstable, it should also work
-on stable, although to get the CGI stuff working on stable, you will need
-to upgrade to a newer version of libcgi-formbuilder-perl, `3.05`.
+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 'sarge', provided by
+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/>.
 
 Also. FreeBSD has ikiwiki in its
 Paweł Tęcza, at <http://gpa.net.icm.edu.pl/debian/>.
 
 Also. FreeBSD has ikiwiki in its


@@ -30,27 +32,20 @@ Also. FreeBSD has ikiwiki in its
 
 ## revision control
 
 
 ## revision control
 

-### subversion
+### git

 
 

-The current development version of ikiwiki can be accessed using subversion at 
-`svn://ikiwiki.info/ikiwiki/trunk`
+Ikiwiki is developed in a git repository and can be checked out by
+either of these commands:

 
 

-The source in subversion can be browsed
-[here](http://ikiwiki.info/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki).
+       git clone git://git.ikiwiki.info/
+       git clone http://git.ikiwiki.info/ikiwiki.git/

 
 

-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.
+The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).

 
 

-### git
+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).

 
 

-A git mirror of the trunk of the subversion repository is available at
-<http://ikiwiki.info/ikiwiki.git/.git>. It is updated whenever
-changes are committed to the subversion repository.
-
-### arch
+### subversion

 
 

-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's subversion repository is no longer available, use git instead.