X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/830152d2a970b3c301f42c4fb81b04e96e3b018f..eab909095bd018d6a5778158038bdc9bbc30a939:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index 6cbc1e489..d268757cc 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -25,12 +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. - Passes all test cases; pending merge. - * `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.