aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2008-02-06 21:40:23 -0800
committerJosh Triplett <josh@freedesktop.org>2008-02-06 21:40:23 -0800
commit830152d2a970b3c301f42c4fb81b04e96e3b018f (patch)
treea3143ad9ae289cd4b9eb17e3218302adad3dc9ff /doc
parented16e5fd9fdf5a7e3716d951731868414e13563c (diff)
downloadikiwiki-830152d2a970b3c301f42c4fb81b04e96e3b018f.tar
ikiwiki-830152d2a970b3c301f42c4fb81b04e96e3b018f.tar.gz
Update status of prefix-directives branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/git.mdwn6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn
index dc0376213..6cbc1e489 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -25,8 +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.
+
+* `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