web commit from 85.177.35.89: poll vote (It's fast enough)

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 90f030ab4ab0555e42c9b08a0ef34dcff7da7ed5..d268757cc7936c64b423a19f6cced830d77567a6 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -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
 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.
 * `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
 * `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.