diff options
| -rw-r--r-- | doc/branches.mdwn | 28 | ||||
| -rw-r--r-- | doc/templates/gitbranch.mdwn | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/doc/branches.mdwn b/doc/branches.mdwn deleted file mode 100644 index e1a808677..000000000 --- a/doc/branches.mdwn +++ /dev/null @@ -1,28 +0,0 @@ -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. - -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: - -[[!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.) -* `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) - can use to recreate released tarballs of ikiwiki diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn index 79444cda5..4fdf937ff 100644 --- a/doc/templates/gitbranch.mdwn +++ b/doc/templates/gitbranch.mdwn @@ -1,5 +1,5 @@ <span class="infobox"> -Available in a [[!taglink /git]] repository [[branch|/branches]].<br /> +Available in a [[!taglink /git]] repository [[!taglink branch|/branches]].<br /> Branch: <TMPL_VAR branch><br /> Author: <TMPL_VAR author><br /> </span> |