X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cd3298ae35f61acc08f488f4fa658c0e880549e2..2c18086a74ead49dddf6a50e56faf3cb7fdb9f0c:/doc/branches.mdwn?ds=sidebyside

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 4accc21ca..232f2ce6a 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -4,6 +4,9 @@ example when submitting a [[patch]], you can use the
 
 	\[[!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)
@@ -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