urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

master
Joey Hess 2011-01-14 13:49:19 -04:00
parent e7cb15cba5
commit b12770ac3e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/branches.mdwn
View File

@ -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.)