Merge commit 'intrigeri/po'

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 511a0a75c8e0db75540714cb379e5b7f615c2694..f6971e84b49fd9725c1e9fee36142a0661b8dcb5 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -30,13 +30,25 @@ into [[Joey]]'s working tree. This is recommended. :-)
 
 <!-- Machine-parsed format: * wikilink <git:url> -->
 
-* [[github]] <git://github.com/joeyh/ikiwiki.git> 
-  [browse](http://github.com/joeyh/ikiwiki/tree/master)
+* github `git://github.com/joeyh/ikiwiki.git`
+  ([browse](http://github.com/joeyh/ikiwiki/tree/master))  
   A mirror of the main repo, automatically updated.
-* [[smcv]] <git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git>
-* [[intrigeri]] <git://gaffer.ptitcanardnoir.org/ikiwiki.git>
-* [[gmcmanus]] <git://github.com/gmcmanus/ikiwiki.git>
-* [[jelmer]] <git://git.samba.org/jelmer/ikiwiki.git>
+* l10n `git://l10n.ikiwiki.info/`
+  Open push localization branch used for <http://l10n.ikiwiki.info/>
+* [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
+* [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
+* [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
+* [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
+* [[hendry]] `git://webconverger.org/git/ikiwiki`
+* [[jon]] `git://github.com/jmtd/ikiwiki.git`
+* [[ikipostal|DavidBremner]] `git://pivot.cs.unb.ca/git/ikipostal.git`
+* [[ikimailbox|DavidBremner]] `git://pivot.cs.unb.ca/git/ikimailbox.git`
+* [[ikiplugins|DavidBremner]] `git://pivot.cs.unb.ca/git/ikiplugins.git`
+* [[jonas|JonasSmedegaard]] `git://source.jones.dk/ikiwiki-upstream`
+* [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
+* [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
+* [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
+* [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
 
 ## branches
 
@@ -49,10 +61,11 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
-* `darcs` is being used to add darcs support.
 * `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.
+* `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