Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast

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

diff --git a/doc/patch.mdwn b/doc/patch.mdwn
index a1c304c58c7e39c8c88b77a48e4752fe7e58d460..7d0f9847c5f1847e3554074c5c39c82ae26031d2 100644 (file)
--- a/doc/patch.mdwn
+++ b/doc/patch.mdwn
@@ -2,11 +2,11 @@ Since we have enough people working on ikiwiki to be dangerous, or at least
 to duplicate work without coordination, here's a queue of suggested patches.
 
 If you post a patch to the [[todo]] or [[bugs]] list, or elsewhere,
 to duplicate work without coordination, here's a queue of suggested patches.
 
 If you post a patch to the [[todo]] or [[bugs]] list, or elsewhere,

-once it's ready to be applied, add a link to 'patch' so it will show
-up here.
+once it's ready to be applied, add a 'patch' tag so it will show up here.

 
 If your patch is non-trivial and might need several iterations to get
 
 If your patch is non-trivial and might need several iterations to get

-right, please consider publishing a [[git]] branch.
+right, or you'd just like to make it easy for [[Joey]] to apply it,
+please consider publishing a [[git]] [[branch|branches]].

 
 [[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
 !link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]]
 
 [[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
 !link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]]