19 files changed, 26 insertions, 24 deletions
diff --git a/README b/README
index f5b128d8a..f8dfc39de 100644
--- a/README
+++ b/README
@@ -2,4 +2,4 @@ Use ./Makefile.PL to generate a Makefile, "make" will build the
 documentation wiki and a man page, and "make install" will install ikiwiki.
 
 All other documentation is in the ikiwiki documentation wiki, which is also
-available online at <http://ikiwiki.kitenet.net/>
+available online at <http://ikiwiki.info/>
diff --git a/basewiki/index.mdwn b/basewiki/index.mdwn
index d598c1f89..f88c1de45 100644
--- a/basewiki/index.mdwn
+++ b/basewiki/index.mdwn
@@ -4,4 +4,4 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ----
 
-This wiki is powered by [ikiwiki](http://ikiwiki.kitenet.net).
+This wiki is powered by [ikiwiki](http://ikiwiki.info).
diff --git a/debian/changelog b/debian/changelog
index 53e072b6c..451046456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,9 @@ ikiwiki (1.43) UNRELEASED; urgency=low
     of perl are vulnerable and it is not known to really be exploitable from
     ikiwiki.
   * Add explicit module prereqs to Makefile.PL
+  * New domain name for ikiwiki: ikiwiki.info. Update your links.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 18 Feb 2007 12:58:18 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Feb 2007 15:12:01 -0500
 
 ikiwiki (1.42) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 9a5746751..eb41ea2f4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-ikiwiki is copyright 2006-2007 by Joey Hess <joey@kitenet.net> and
+ikiwiki is copyright 2006-2007 by Joey Hess <joey@ikiwiki.info> and
 contributors. It is licensed under the terms of the GPL version 2 or later.
 On Debian systems, the complete text of the GPL can be found in
 /usr/share/common-licenses/GPL
diff --git a/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn b/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
index 3e9ce8dc4..e032b115f 100644
--- a/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
+++ b/doc/bugs/Convert___34__somehost.com/user__34___OpenID_at_RecentChanges_page.mdwn
@@ -8,7 +8,7 @@ for all OpenIDs is a good idea. What's your opinion?
 > It's probably ok to do this, although there's the potential it might
 > misfire on some url. I've implemented it on a trial basis. [[bugs/done]] --[[Joey]]
 
->> Thanks! What version of ikiwiki do you use at ikiwiki.kitenet.net
+>> Thanks! What version of ikiwiki do you use at ikiwiki.info
 >> site? I still can see my "getopenid.com/ptecza" OpenID at
 >> RecentChanges page there... --Pawel
 
diff --git a/doc/bugs/openid_postsignin_failure.mdwn b/doc/bugs/openid_postsignin_failure.mdwn
index b18187c48..01c3e5a6f 100644
--- a/doc/bugs/openid_postsignin_failure.mdwn
+++ b/doc/bugs/openid_postsignin_failure.mdwn
@@ -22,7 +22,7 @@ Crypt::DH, URI-Fetch. --Ethan
 >> I put debugging output in openid.pm and it suggests that the 
 >> verification is taking place successfully. I see "openid.mode=id_res" 
 >> in the URI. On top of that, it's the same Openid server I use
->> to sign in here on ikiwiki.kitenet.net. --Ethan
+>> to sign in here on ikiwiki.info. --Ethan
 
 >>> Yikes, I don't really have the newest CGI::Session after all.. 
 >>> let me try updating that. --Ethan
@@ -34,7 +34,7 @@ Crypt::DH, URI-Fetch. --Ethan
 >>>>> should paste the url. --[[Joey]]
 
 I have cookies disabled on my computer, with a bunch of manual
-exceptions. This includes myopenid, ikiwiki.kitenet.net, livejournal,
+exceptions. This includes myopenid, ikiwiki.info, livejournal,
 and some others. Unfortunately it didn't include my own domain.
 So the URI that myopenid redirected me to was fine, but because
 I didn't have cookies set, I didn't have a session, and so 
diff --git a/doc/css_market/kirkambar.css b/doc/css_market/kirkambar.css
index 256986e32..76d9ba771 100644
--- a/doc/css_market/kirkambar.css
+++ b/doc/css_market/kirkambar.css
@@ -131,7 +131,7 @@ td.changelog {
  * Attribution `div` for IkiWiki.  Use something like as follows:
  *		<div id="attribution">
  *		    This site is maintained using Joey Hess's
- *		    <a href="http://ikiwiki.kitenet.net/">
+ *		    <a href="http://ikiwiki.info/">
  *		        <img src="ikiwiki.png" title="IkiWiki" alt="IkiWiki" />
  *		    </a>.
  *		</div>
diff --git a/doc/download.mdwn b/doc/download.mdwn
index ca7b49f32..4e8d538e0 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -27,10 +27,10 @@ Pawel Tecza, at <http://gpa.net.icm.edu.pl/debian/>.
 ## subversion
 
 The current development version of ikiwiki can be accessed using subversion at 
-`svn://ikiwiki.kitenet.net/ikiwiki/trunk`
+`svn://ikiwiki.info/ikiwiki/trunk`
 
 The source in subversion can be browsed
-[here](http://ikiwiki.kitenet.net/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki).
+[here](http://ikiwiki.info/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki).
 
 Commits to ikiwiki's source code are now fed into
 [CIA](http://cia.navi.cx/), and can be browsed, subscribed to etc on its
@@ -40,7 +40,7 @@ to the documentation wiki are currently excluded.
 ## git
 
 A git mirror of the trunk of the subversion repository is available at
-<http://ikiwiki.kitenet.net/ikiwiki.git/.git>. It is updated whenever
+<http://ikiwiki.info/ikiwiki.git/.git>. It is updated whenever
 changes are committed to the subversion repository.
 
 ## arch
diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
index 3a0ddb9f2..862e66561 100644
--- a/doc/helponformatting.mdwn
+++ b/doc/helponformatting.mdwn
@@ -65,8 +65,9 @@ To write a code block, indent each line with a tab or 4 spaces:
 To link to another page on the wiki, place the page's name inside double
 square brackets, so you would use `\[[WikiLink]]` to link to [[WikiLink]].
 
-To link to any other web page, or to an email address, you can just put the url in angle brackets: <<http://ikiwiki.kitenet.net>>, or you can use the form
-\[link text\]\(url\)
+To link to any other web page, or to an email address, you can just put the
+url in angle brackets: <<http://ikiwiki.info>>, or you can use the
+form \[link text\]\(url\)
 
 ----
 
diff --git a/doc/ikiwiki-mass-rebuild.mdwn b/doc/ikiwiki-mass-rebuild.mdwn
index f1ceff32f..05187ee9f 100644
--- a/doc/ikiwiki-mass-rebuild.mdwn
+++ b/doc/ikiwiki-mass-rebuild.mdwn
@@ -25,6 +25,6 @@ All options are passed on to ikiwiki.
 
 # AUTHOR
 
-Joey Hess <joey@kitenet.net>
+Joey Hess <joey@ikiwiki.info>
 
 Warning: this page is automatically made into ikiwiki-mass-rebuild's man page, edit with care
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4e50afc2e..b532bb10c 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -1,6 +1,6 @@
 Sites that are using ikiwiki include:
 
-* [This wiki](http://ikiwiki.kitenet.net) (of course!)
+* [This wiki](http://ikiwiki.info) (of course!)
 * [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog
 * [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry)
 * [Ulrik's small collection of small apps](http://www.student.lu.se/~cif04usv/wiki/)
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index e65faa0ac..d0b0c8221 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -3,7 +3,7 @@ decentralized authentication mechanism that allows you to have one login
 that you can use on a growing number of websites.
 
 Traditional password-based logins are still supported, but I'm considering
-switching at least ikiwiki.kitenet.net over to using only OpenID logins. 
+switching at least ikiwiki.info over to using only OpenID logins. 
 That would mean blowing away all the currently registered users and
 their preferences. If you're active on this wiki, I suggest you log out and
 log back in, try out the OpenID signup process if you don't already have an
diff --git a/doc/patchqueue/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn b/doc/patchqueue/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
index bb320063b..0fd715642 100644
--- a/doc/patchqueue/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
+++ b/doc/patchqueue/varioki_--_add_template_variables___40__with_closures_for_values__41___in_ikiwiki.setup.mdwn
@@ -9,7 +9,7 @@ This plugin hooks itsef into the "pagetemplate" hook, and adds parameters to the
       ’toplvl’   => ’sub {return $page eq "index"}’
     },
 
-For every key in the configured hash, the corresponding value is evaluated.  Based on whether the value was a stringified scalar, code, array, or hash, the value of the template parameter is generated on the fly.  The available variables are whatever is available to "pagetemplate" hook scripts, namely, $page, $destpage, and $template.  Additionally, the global variables and functions as defined in the Ikiwiki documentation (<http://ikiwiki.kitenet.net/plugins/write.html>) may be used.
+For every key in the configured hash, the corresponding value is evaluated.  Based on whether the value was a stringified scalar, code, array, or hash, the value of the template parameter is generated on the fly.  The available variables are whatever is available to "pagetemplate" hook scripts, namely, $page, $destpage, and $template.  Additionally, the global variables and functions as defined in the Ikiwiki documentation (<http://ikiwiki.info/plugins/write.html>) may be used.
 
 ManojSrivastava
 
diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn
index cf7a458c7..9648748d6 100644
--- a/doc/plugins/contrib/linguas.mdwn
+++ b/doc/plugins/contrib/linguas.mdwn
@@ -3,7 +3,7 @@
 Linguas
 =======
 
-Linguas is a plugin for [ikiwiki](http://ikiwiki.kitenet.net/) that
+Linguas is a plugin for [ikiwiki](http://ikiwiki.info/) that
 allows translations of wiki pages.
 
 Download: [linguas.pm](http://wiki.ettin.org/files/linguas.pm) (2006-08-21).
diff --git a/doc/plugins/contrib/navbar.mdwn b/doc/plugins/contrib/navbar.mdwn
index 8f15e83f7..16be0c33d 100644
--- a/doc/plugins/contrib/navbar.mdwn
+++ b/doc/plugins/contrib/navbar.mdwn
@@ -1,7 +1,7 @@
 [[template id=plugin name=navbar author="[[TobiOetiker]]"]]
 
 The Navbar Plugin renders a Navigation Bar into your page. It is based on code
-from the sidebar plug in see <http://ikiwiki.kitenet.net/plugins/sidebar.html>
+from the sidebar plug in see <http://ikiwiki.info/plugins/sidebar.html>
 for details.
 
 The plug in looks for a page called "navbar" 
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index a598ef716..27d478be1 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -34,7 +34,7 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 	   		All wikis are supposed to have a [[SandBox]],
 	   		so this one does too.
 	   		----
-	   		This wiki is powered by [ikiwiki](http://ikiwiki.kitenet.net).
+	   		This wiki is powered by [ikiwiki](http://ikiwiki.info).
    """]]
    
    See [[HelpOnFormatting]] for details about the markup language.
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index cfbe70aea..0a5393b37 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -13,7 +13,7 @@ This page controls what shortcut links the wiki supports.
 * [[shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
 * [[shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
 * [[shortcut name=ctan url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]]
-* [[shortcut name=iki url="http://ikiwiki.kitenet.net/%s.html"]]
+* [[shortcut name=iki url="http://ikiwiki.info/%s.html"]]
 * [[shortcut name=ljuser url="http://%s.livejournal.com/"]]
 * [[shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt"]]
 * [[shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]]
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2c9772574..24a5515e0 100644
--- 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
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 1c672f484..b811b8764 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -9,7 +9,7 @@
 </author>
 <id><TMPL_VAR PAGEURL></id>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
-<generator uri="http://ikiwiki.kitenet.net/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
+<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
 <updated><TMPL_VAR FEEDDATE></updated>
 <TMPL_VAR CONTENT>
 </feed>