link to branches

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

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 3f17226e66fb035d5b7dc9529d02db7623a36d14..bc3bdc668b7e2526627ecef16cf663dfa72ebe3a 100644 (file)
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -7,13 +7,8 @@ Branches referred to in open [[bugs]] and [[todo]]:
 [[!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 +17,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
+