web commit by http://vibrog.myopenid.com/

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index dc0376213a70eb566f7ee98099a82269b6d9af17..d268757cc7936c64b423a19f6cced830d77567a6 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -25,10 +25,10 @@ Some of the branches included in the main repository include:
   work with the current *master* branch again.
 * `html` is an unfinished attempt at making ikiwiki output HTML 4.01
   instead of xhtml.
-* `prefix-directives` changes the preprocessor directive syntax. It
-  is approximately one failing test case away from merging.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `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.