Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 25a360efdcef2c28218f0389c3bb8df6fe80ab1a..71f7eb54b236648acceb28dc7803cfea6e9514cf 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -13,7 +13,7 @@ rejected.
 The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary).
 
 Commits to this git repository are fed into [KGB](http://kgb.alioth.debian.org/)
 The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary).
 
 Commits to this git repository are fed into [KGB](http://kgb.alioth.debian.org/)

-for transmission to the #ikiwiki irc channel.
+for transmission to the #ikiwiki irc channel. See also: [[spam_fighting]]

 
 ## personal git repositories
 
 
 ## personal git repositories
 


@@ -76,6 +76,8 @@ think about merging them. This is recommended. :-)
 * [[ttw]] `git://github.com/ttw/ikiwiki.git`
 * [[anarcat]] `git://src.anarcat.ath.cx/ikiwiki`
 * anderbubble `git://civilfritz.net/ikiwiki.git`
 * [[ttw]] `git://github.com/ttw/ikiwiki.git`
 * [[anarcat]] `git://src.anarcat.ath.cx/ikiwiki`
 * anderbubble `git://civilfritz.net/ikiwiki.git`

+* frioux `git://github.com/frioux/ikiwiki`
+* llipavsky `git://github.com/llipavsky/ikiwiki`

 
 ## branches
 
 
 ## branches