X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fbranches.mdwn;h=b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56;hb=f5205731d99f3d706ede67745f7c2b01a24fb904;hp=c2a55d74623bd17bd40a4253fea71d2f80e42781;hpb=e93f31a5ef49275a750c20f96890d2ecc517fe88;p=ikiwiki.git

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index c2a55d746..b7b9164ac 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -1,19 +1,19 @@
 In order to refer to a branch in one of the [[git]] repositories, for
 example when submitting a [[patch]], you can use the
-[[templates/gitbranch]] template.
+[[templates/gitbranch]] template. For example:
+
+	\[[!template id=gitbranch branch=yourrepo/amazingbranch author="\[[yourname]]"]]
+
+Branches that have been [[reviewed]] and need work will not be listed
+here.
 
 Branches referred to in open [[bugs]] and [[todo]]:
 
-[[!inline pages="(todo/* or bugs/*) and link(branches) and !link(bugs/done)
+[[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
 and !link(todo/done) and !*/*/*" show=0 archive=yes]]
 
-The main ikiwiki git repository has some branches included in it, too:
+Long-lived branches in the main git repository:
 
-* `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-  due to license issues.  Also some bits need to be tweaked to make it
-  work with the current *master* branch again.
-* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
-  changes.
 * `debian-stable` is used for updates to the old version included in
   Debian's stable release, and `debian-testing` is used for updates to
   Debian's testing release. (These and similar branches will be rebased.)
@@ -22,3 +22,4 @@ The main ikiwiki git repository has some branches included in it, too:
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
+* `setup` contains the ikiwiki.setup file for this site