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

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

diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index 5d91f59306a0b2f08205445ca31a24fbfcade708..f5effdbe3d75d6e813063bb3e6dc576160a90542 100644 (file)
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -1,13 +1,17 @@
-I started using Ikiwiki as a way to replace [Trac](http://trac.edgewall.org/) when using [Monotone](http://monotone.ca/).  Version control has been an interest of mine for a while and I wrote most of the ikiwiki [[rcs/monotone]] plugin.
+I started using Ikiwiki as a way to replace [Trac](http://trac.edgewall.org/) when using [Monotone](http://monotone.ca/).  Version control has been an interest of mine for a while and I wrote most of the ikiwiki [[rcs/monotone]] plugin.  I'm not actively working on the Monotone plugin any more.

 
 Lately I've been using Ikiwiki for other things and seem to be scratching a few itches here and there. :)
 
 
 Lately I've been using Ikiwiki for other things and seem to be scratching a few itches here and there. :)
 

-I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/>
+I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/> or <http://www.google.com/profiles/will.uther>.

 
 

-> Regarding your recent change to [[ikiwiki/directive]], won't the inlined
-> list of directives tend to be empty when it's shown? Only if
-> listdirectives is installed will the directives underlay be enabled.
-> --[[Joey]]
+I have a git repository for some of my IkiWiki code: <http://www.cse.unsw.edu.au/~willu/ikiwiki.git>.
+
+Generic License Grant
+-----------------
+
+Unless otherwise specified, any code that I post to this wiki I release under the GPL2+.  Any non-code patches I post are released under [[standard ikiwiki licenses|freesoftware]].
+
+------

 
 ### Open Bugs:
 
 
 ### Open Bugs: