Update links in help files for the new websites

4 files changed, 53 insertions, 40 deletions

diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt
index c6e75ab0..34b28bb7 100644
--- a/muttator/locale/en-US/intro.txt
+++ b/muttator/locale/en-US/intro.txt
@@ -5,12 +5,12 @@ LOGO
 mutt.*
 +++</center>+++
 
-section:Introduction[intro]
+section::Introduction[intro]
 
-http://muttator.mozdev.org[Muttator] is a free browser add-on for Thunderbird,
-which makes it look and behave like the http://www.vim.org[Vim]
-text editor. It has similar key bindings, and you could call it a modal
-mail client, as key bindings differ according to which mode you are in.
+http://vimperator.org/muttator[Muttator] is a free browser add-on for
+Thunderbird, which makes it look and behave like the http://www.vim.org[Vim]
+text editor. It has similar key bindings, and you could call it a modal mail
+client, as key bindings differ according to which mode you are in.
 
 |warning| +
 Warning:
@@ -26,9 +26,9 @@ Muttator was written by mailto:stubenschrott@vimperator.org[Martin Stubenschrott
 If you appreciate my work on Muttator and want to encourage me working on it
 more, you can either send me greetings, patches or make a donation:
 
-NOTE: If this link does not work, go to http://muttator.mozdev.org and click
-the donation button there, because Thunderbird seems to have a problem when
-this link is inside an e-mail (which this help screen actually is).
+NOTE: If this link does not work, go to http://vimperator.org/muttator and
+click the donation button there, because Thunderbird seems to have a problem
+when this link is inside an e-mail (which this help screen actually is).
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 <!-- the PAYPAL code -->
@@ -47,7 +47,7 @@ Of course as a believer in free open source software, only make a donation
 if you really like Muttator and the money doesn't hurt -- otherwise just use
 it, recommend it and like it :)
 
-section:Help{nbsp}topics[overview]
+section::Help{nbsp}topics[overview]
 
 //TO BE WRITTEN...
 
@@ -74,7 +74,7 @@ out about available mappings, commands and options. When in Message mode
 You can also jump directly to the help of a specific command with [c]:help
 o[c] or [c]:help :set[c].
 
-section:Features[features]
+section::Features[features]
 
 * Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m],
   [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m]<C-f>[m], etc.)
@@ -86,7 +86,7 @@ section:Features[features]
   [c]:set guioptions=f[c])
 * Ability to [c]:source[c] JavaScript files, and to use a [a]~/.muttatorrc[a]
   file with syntax highlighting if you install
-  http://vimperator.org/trac/ticket/328[muttator.vim]
+  http://code.google.com/p/vimperator-labs/issues/detail?id=51[muttator.vim]
 * Count supported for many commands ([m]3<C-o>[m] will go back 3 messages)
 * Beep on errors
 * [c]:map[c] support (and feedkeys() for script writers)
@@ -95,12 +95,18 @@ section:Features[features]
 
 // * A comprehensive help file, explaining all commands, mappings and options.
 
-section:Contact[contact]
-
-Please send comments/bug reports/patches to the mailing list, where I will
-properly answer any questions. You can also join the #vimperator IRC channel
-on irc.freenode.net or check the Wiki for frequently asked questions. Make
-sure, you have read the TODO file first, as I am aware of many things which
-can be improved when I find time for it or get patches.
+section::Contact[contact]
+
+Please send comments/bug reports/patches to the mailing list, where we will
+properly answer any questions. You can also join the
++++<a href="irc://irc.freenode.net/vimperator">#vimperator</a>+++ IRC channel
+on http://www.freenode.net/[Freenode] or check the
+http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-muttator[Wiki]
+for
+http://code.google.com/p/vimperator-labs/wiki/MuttatorFAQ[frequently asked
+questions (FAQ)]. Make sure, you have read the
+http://vimperator-labs.googlecode.com/hg/muttator/TODO[TODO] file first, as we
+are aware of many things which can be improved when we find time for it or
+receive patches.
 
 // vim: set filetype=asciidoc:
diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt
index d232e086..94b517be 100644
--- a/vimperator/locale/en-US/intro.txt
+++ b/vimperator/locale/en-US/intro.txt
@@ -10,10 +10,10 @@ VIMperator :)
 
 heading::Introduction[intro]
 
-http://vimperator.org[Vimperator] is a free browser add-on for Firefox,
-which makes it look and behave like the http://www.vim.org[Vim]
-text editor. It has similar key bindings, and you could call it a modal
-web browser, as key bindings differ according to which mode you are in.
+http://vimperator.org/vimperator[Vimperator] is a free browser add-on for
+Firefox, which makes it look and behave like the http://www.vim.org[Vim] text
+editor. It has similar key bindings, and you could call it a modal web browser,
+as key bindings differ according to which mode you are in.
 
 |warning| +
 Warning:
@@ -28,11 +28,11 @@ If you like it but can't remember the shortcuts, then press [m]<F1>[m] or
 |author| |donation| |sponsor| +
 Vimperator was initially written by mailto:stubenschrott@vimperator.org[Martin
 Stubenschrott] but has found many other
-http://vimperator.org/trac/wiki/Vimperator/Authors[contributors] in the
-meanwhile. If you appreciate the work on Vimperator and want to encourage us
-working on it more, you can send us greetings, patches, or donations (thanks a
-lot to http://vimperator.org/trac/wiki/Vimperator/Donors[these people] who
-already did):
+http://vimperator-labs.googlecode.com/hg/vimperator/AUTHORS[contributors] in
+the meanwhile. If you appreciate the work on Vimperator and want to encourage
+us working on it more, you can send us greetings, patches, or donations (thanks
+a lot to http://vimperator-labs.googlecode.com/hg/vimperator/Donors[these
+people] who already did):
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 <!-- the PAYPAL code -->
@@ -103,7 +103,7 @@ section::Features[features]
   [c]:set guioptions=[c])
 * Ability to [c]:source[c] JavaScript files, and to use a [a]~/.vimperatorrc[a]
   file with syntax highlighting if you install
-  http://vimperator.org/trac/ticket/26[vimperator.vim]
+  http://code.google.com/p/vimperator-labs/issues/detail?id=7[vimperator.vim]
 * Easy quick searches ([c]:open foo[c] will search for "foo" in google,
   [c]:open ebay terminator[c] will search for "terminator" on ebay)
   with support for Firefox keyword bookmarks and search engines
@@ -127,9 +127,12 @@ Please send comments/bug reports/patches to the mailing list, where we will
 properly answer any questions. You can also join the
 +++<a href="irc://irc.freenode.net/vimperator">#vimperator</a>+++ IRC channel
 on http://www.freenode.net/[Freenode] or check the
-http://vimperator.org/trac/wiki/Vimperator/Wiki[Wiki] for
-http://vimperator.org/trac/wiki/Vimperator/FAQ[frequently asked questions
-(FAQ)]. Make sure, you have read the TODO file first, as we are aware of many
-things which can be improved when we find time for it or receive patches.
+http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator[Wiki]
+for
+http://code.google.com/p/vimperator-labs/wiki/VimperatorFAQ[frequently asked
+questions (FAQ)]. Make sure, you have read the
+http://vimperator-labs.googlecode.com/hg/vimperator/TODO[TODO] file first, as
+we are aware of many things which can be improved when we find time for it or
+receive patches.
 
 // vim: set filetype=asciidoc:
diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt
index fc3a7250..6747db66 100644
--- a/vimperator/locale/en-US/tutorial.txt
+++ b/vimperator/locale/en-US/tutorial.txt
@@ -242,8 +242,9 @@ section::I'm{nbsp}interested...but{nbsp}lost![support]
 Vimperator has an energetic and growing user base. If you've run into a problem
 that you can't seem to solve with Vimperator, or if you think you might have
 found a bug, please let us know! There is support available on the
-http://vimperator.cutup.org/index.php?title=Main_Page[wiki], or in the
-#vimperator IRC channel on http://freenode.net/[freenode].
+http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-vimperator[wiki],
+or in the +++<a href="irc://irc.freenode.net/vimperator">#vimperator</a>+++ IRC
+channel on http://freenode.net/[freenode].
 
 If you have any feature requests or (even better) offers to help, we'd love to
 hear from you as well. Developers work on Vimperator whenever possible, but we
diff --git a/xulmus/locale/en-US/intro.txt b/xulmus/locale/en-US/intro.txt
index 02535be8..80fcd6ef 100644
--- a/xulmus/locale/en-US/intro.txt
+++ b/xulmus/locale/en-US/intro.txt
@@ -2,7 +2,7 @@ logo:[]
 
 section::Introduction[intro]
 
-http://vimperator.org/Xulmus[Xulmus] is a free media player add-on for
+http://vimperator.org/xulmus[Xulmus] is a free media player add-on for
 Songbird, which combines the best features of the
 http://cmus.sourceforge.net[CMus] music player and the http://www.vim.org[Vim]
 text editor.
@@ -92,7 +92,7 @@ section::Features[features]
   [c]:set guioptions=[c])
 * Ability to [c]:source[c] JavaScript files, and to use a [a]~/.xulmusrc[a]
   file with syntax highlighting if you install
-  http://vimperator.org/trac/ticket/327[xulmus.vim]
+  http://code.google.com/p/vimperator-labs/issues/detail?id=50[xulmus.vim]
 * Easy quick searches ([c]:open foo[c] will search for "foo" in google,
   [c]:open ebay terminator[c] will search for "terminator" on ebay)
   with support for Songbird keyword bookmarks and search engines
@@ -116,9 +116,12 @@ Please send comments/bug reports/patches to the mailing list, where we will
 properly answer any questions. You can also join the
 +++<a href="irc://irc.freenode.net/vimperator">#vimperator</a>+++ IRC channel
 on http://www.freenode.net/[Freenode] or check the
-http://vimperator.org/trac/wiki/Xulmus/Wiki[Wiki] for
-http://vimperator.org/trac/wiki/Xulmus/FAQ[frequently asked questions
-(FAQ)]. Make sure, you have read the TODO file first, as we are aware of many
-things which can be improved when we find time for it or receive patches.
+http://code.google.com/p/vimperator-labs/w/list?q=label%3Aproject-xulmus[Wiki]
+for
+http://code.google.com/p/vimperator-labs/wiki/XulmusFAQ[frequently asked
+questions (FAQ)]. Make sure, you have read the
+http://vimperator-labs.googlecode.com/hg/xulmus/TODO[TODO] file first, as we
+are aware of many things which can be improved when we find time for it or
+receive patches.
 
 // vim: set filetype=asciidoc: