Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/patch.mdwn b/doc/patch.mdwn
index d8ac3cd42f2f587552e630fc99acc103f75e86fd..ca16202259824a4513e276806ee1b91d1d989a86 100644 (file)
--- a/doc/patch.mdwn
+++ b/doc/patch.mdwn
@@ -1,9 +1,11 @@
 Since we have enough people working on ikiwiki to be dangerous, or at least
 Since we have enough people working on ikiwiki to be dangerous, or at least

-to duplicate work without coordination, and since few people have direct
-commit access to the tree, here's a queue of suggested patches.
+to duplicate work without coordination, here's a queue of suggested patches.

 
 

-If you post a patch to the wiki, once it's ready to be applied, add a
-'patch' tag so it will show up here.
+If you post a patch to the [[todo]] or [[bugs]] list, or elsewhere,
+once it's ready to be applied, add a 'patch' tag so it will show up here.

 
 

-[[inline pages="todo/* and link(patch) and !*/Discussion" rootpage="todo"
-archive="yes"]]
+If your patch is non-trivial and might need several iterations to get
+right, please consider publishing a [[git]] branch.
+
+[[inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
+!link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]]