Pull all the patches and fragements of patches from tumov and me together

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

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2c97725748803e740b252a3d473e0eb2386ac2f1..24a5515e0947f4b1789616e89a74fd16f16f0f1e 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -265,6 +265,6 @@ configuration options of their own.
 
 # AUTHOR
 
-Joey Hess <joey@kitenet.net>
+Joey Hess <joey@ikiwiki.info>
 
-Warning: this page is automatically made into ikiwiki's man page via [mdwn2man](http://ikiwiki.kitenet.net/cgi-bin/viewvc.cgi/trunk/mdwn2man?root=ikiwiki&view=markup).  Edit with care
+Warning: this page is automatically made into ikiwiki's man page via [mdwn2man](http://ikiwiki.info/cgi-bin/viewvc.cgi/trunk/mdwn2man?root=ikiwiki&view=markup).  Edit with care