po plugin: do not allow msgmerge to create backup files

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index fc702b32560eeeec5891005f80bfe78cb540c24e..e5fef6a5adad4b449c934e62c16778b0d11ae279 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -29,8 +29,10 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.

+* `darcs` is being used to add darcs support.

 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `debian-stable` is used for updates to the old version included in
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `debian-stable` is used for updates to the old version included in

-  Debian's stable release.
+  Debian's stable release, and `debian-testing` is used for updates to
+  Debian's testing release.