aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-01 17:31:21 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-01 17:31:21 -0400
commit45a2074071882b3bcb13b8983a4e5b6be0eda750 (patch)
tree10bfcc17df8ca5e6a3e28bdb6f81d73e689f9b26 /doc
parentbf386e22f5fb65999c38668cb011bdf4ae26d72c (diff)
downloadikiwiki-45a2074071882b3bcb13b8983a4e5b6be0eda750.tar
ikiwiki-45a2074071882b3bcb13b8983a4e5b6be0eda750.tar.gz
update
Diffstat (limited to 'doc')
-rw-r--r--doc/git.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn
index fc702b325..e5fef6a5a 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -29,8 +29,10 @@ Some of the branches included in the main repository include:
instead of xhtml.
* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
changes.
+* `darcs` is being used to add darcs support.
* `pristine-tar` contains deltas that
[pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
can use to recreate released tarballs of ikiwiki
* `debian-stable` is used for updates to the old version included in
- Debian's stable release.
+ Debian's stable release, and `debian-testing` is used for updates to
+ Debian's testing release.