Merge branch 'master' into prefix-directives

[ikiwiki.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0979e9bf1082e6d2146effb0c3e3444831fd1cc3..6cbc1e489a491953753c9ea985fcb4da033de676 100644 (file)
--- 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/
 like this:
 
        git clone git://git.ikiwiki.info/


@@ -21,11 +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 approxiamtly 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
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `pristine-tar` contains deltas that