From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 Jan 2011 17:49:19 +0000 (-0400)
Subject: cleanup
X-Git-Tag: 3.20110122~37
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b12770ac3e382e82125e2950a3ea6594584bb2c6?hp=e7cb15cba5c78467a61870870a788334584424d9

cleanup
---

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 558ef8067..bc3bdc668 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -7,17 +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]]
 
-All branches:
+Long-lived branches in the main git repository:
 
-[[!inline pages="link(/branches)" show=0 archive=yes]]
-
-The main ikiwiki git repository has some branches included in it, too:
-
-* `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.)