diff options
| author | Louis <spalax@gresille.org> | 2014-07-17 12:29:01 +0200 |
|---|---|---|
| committer | Louis <spalax@gresille.org> | 2014-07-17 12:29:01 +0200 |
| commit | 774cf3d323e7f34d7bed19800c5439d38b48c894 (patch) | |
| tree | 31a063a4266709ff1e5fbf5e692465a67ee8526e /doc/users | |
| parent | d10e62f955839a3232b1107b17cfa51568c8aee3 (diff) | |
| parent | b1ccd9c4640b0ba2dd067acd185592592744aea4 (diff) | |
| download | ikiwiki-774cf3d323e7f34d7bed19800c5439d38b48c894.tar ikiwiki-774cf3d323e7f34d7bed19800c5439d38b48c894.tar.gz | |
Merge branch 'master' into spalax
Diffstat (limited to 'doc/users')
| -rw-r--r-- | doc/users/smcv.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/smcv/ready.mdwn (renamed from doc/users/smcv/yesplease.mdwn) | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/users/smcv.mdwn b/doc/users/smcv.mdwn index a4eb564ce..9835049c3 100644 --- a/doc/users/smcv.mdwn +++ b/doc/users/smcv.mdwn @@ -7,4 +7,4 @@ My repository containing ikiwiki branches: * gitweb: http://git.pseudorandom.co.uk/smcv/ikiwiki.git * anongit: git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git -Recently tried to [[help with the review backlog|yesplease]]. +Recently tried to [[help with the review backlog|users/smcv/ready]]. diff --git a/doc/users/smcv/yesplease.mdwn b/doc/users/smcv/ready.mdwn index b100b374e..ed8aa2618 100644 --- a/doc/users/smcv/yesplease.mdwn +++ b/doc/users/smcv/ready.mdwn @@ -1,7 +1,10 @@ A tag for patches that I would merge if I had commit access to ikiwiki, in the hope that it's a useful shortlist for committers to look at. -They're mirrored in my git repository under the `ready/*` namespace. +Two categories: + +* my own branches, in my git repository under the `ready/*` namespace +* other people's branches, mirrored in my git repo in the same namespace [[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and - !link(todo/done) and link(users/smcv/yesplease) and !*/Discussion" + !link(todo/done) and link(users/smcv/ready) and !*/Discussion" archive="yes"]] |