aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-10-24 22:21:06 -0400
committerJoey Hess <joey@kodama.kitenet.net>2007-10-24 22:21:06 -0400
commit6a647437379cdf883aa825d40ce0f23e95df17e7 (patch)
treebd8dee87aedb0086cfc69f2a2f6f325a27a2d06f /doc
parentf60c3cb0465c5bb2c53eedb2f93b4f25d1e26a83 (diff)
downloadikiwiki-6a647437379cdf883aa825d40ce0f23e95df17e7.tar
ikiwiki-6a647437379cdf883aa825d40ce0f23e95df17e7.tar.gz
ikiwiki is now stored in a git repository
Note that all the sha1s did change from those in the earlier ikiwiki git repos gated from svn. Thank you, git-svnimport, for the pain.
Diffstat (limited to 'doc')
-rw-r--r--doc/download.mdwn30
-rw-r--r--doc/news/git_move.mdwn6
-rw-r--r--doc/news/moved_to_git.mdwn10
-rw-r--r--doc/rcs/svn.mdwn4
4 files changed, 23 insertions, 27 deletions
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 05ea68036..6c248045f 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -32,28 +32,20 @@ Also. FreeBSD has ikiwiki in its
## 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
-`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.
-
-### 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.
diff --git a/doc/news/git_move.mdwn b/doc/news/git_move.mdwn
deleted file mode 100644
index 6497e430d..000000000
--- a/doc/news/git_move.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-I've redone ikiwiki's git gateway. Hopefully it will work better now. The
-urls to the git repository have changed, see [[download]]. --[[Joey]]
-
-Run `git config remote.origin.url git://ikiwiki.info/` (or `git config
-remote.origin.url http://ikiwiki.info/ikiwiki.git`) to let your existing
-clones know about the new location. --[[madduck]]
diff --git a/doc/news/moved_to_git.mdwn b/doc/news/moved_to_git.mdwn
new file mode 100644
index 000000000..1896be640
--- /dev/null
+++ b/doc/news/moved_to_git.mdwn
@@ -0,0 +1,10 @@
+I've started using git as ikiwiki's main repository. See [[download]] for
+repository locations.
+
+Note that all the sha1sums have changed from those in previously published
+git repositories. Blame [git-svnimport](http://bugs.debian.org/447965/).
+
+I hope that this will make it easier to maintain and submit patches for
+ikiwiki.
+
+--[[Joey]]
diff --git a/doc/rcs/svn.mdwn b/doc/rcs/svn.mdwn
index cd35511c0..f8c44b6eb 100644
--- a/doc/rcs/svn.mdwn
+++ b/doc/rcs/svn.mdwn
@@ -1,7 +1,7 @@
[Subversion](http://subversion.tigris.org/) is a revision control system. While ikiwiki is relatively
independent of the underlying revision control system, and can easily be
-used without one, using it with Subversion is recommended since it's how
-the author uses it.
+used without one, using it with Subversion or another revision control
+system is recommended.
Ikiwiki can run as a [[post-commit]] hook to update a wiki whenever commits
come in. When running as a [[cgi]] with Subversion, ikiwiki automatically