X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4e3329699bbacfd5f41699590333b0f3e06750d5..2f3a279f68dcf8c1566d82419fc7257e162ee345:/doc/git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0979e9bf1..d268757cc 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki is developed in a git_repository and can be checked out 
+Ikiwiki is developed in a git repository and can be checked out 
 like this:
 
 	git clone git://git.ikiwiki.info/
@@ -21,13 +21,14 @@ own [[patches|patch]].
 Some of the branches included in the main repository include:
 
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-  die to license issues.
+  due to license issues.  Also some bits need to be tweaked to make it
+  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 approxiamtly 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.