update with new features to deal with large sites

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

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index f336412903097abe2944ac53e3f5be51f98910af..232f2ce6a71f1cd14ca2b85d4d8dad2baf7c5e02 100644 (file)
--- 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:
 
 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]]:
 
 
 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
 * `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
   can use to recreate released tarballs of ikiwiki

-
+* `setup` contains the ikiwiki.setup file for this site