aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-01-14 13:49:19 -0400
committerJoey Hess <joey@kitenet.net>2011-01-14 13:49:19 -0400
commitb12770ac3e382e82125e2950a3ea6594584bb2c6 (patch)
tree635837590e07eec306196df8282ba2c157140aa0
parente7cb15cba5c78467a61870870a788334584424d9 (diff)
downloadikiwiki-b12770ac3e382e82125e2950a3ea6594584bb2c6.tar
ikiwiki-b12770ac3e382e82125e2950a3ea6594584bb2c6.tar.gz
cleanup
-rw-r--r--doc/branches.mdwn11
1 files changed, 1 insertions, 10 deletions
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.)