X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fb511114bb185abb807c384b17e2ba564ee1e269..3ae8a75101c88712517294b4ebbb3e4bc68d446d:/doc/branches.mdwn?ds=sidebyside

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index f33641290..232f2ce6a 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -2,7 +2,10 @@ 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. For example:
 
-	\[[!template id=gitbranch branch=yourrepo/amazingbranch author="[[yourname]]"]]
+	\[[!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]]:
 
@@ -17,6 +20,6 @@ Long-lived branches in the main git repository:
 * `ignore` gets various branches merged to it that [[Joey]] wishes to ignore
   when looking at everyone's unmerged changes.
 * `pristine-tar` contains deltas that
-  [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
+  [pristine-tar](http://joeyh.name/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
-
+* `setup` contains the ikiwiki.setup file for this site