[mango] Fix some of the broken URLs and update the form mails.

[Andrea Veri <av src gnome org>]

commit 5ec1383f87cebb49b6dd5d0399c475bc8f3949f4
Author: Andrea Veri <av gnome org>
Date:   Wed Aug 21 14:09:41 2013 +0200

    Fix some of the broken URLs and update the form mails.

 templates/user_instructions.xsl |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/templates/user_instructions.xsl b/templates/user_instructions.xsl
index 1e760d7..26be8b4 100644
--- a/templates/user_instructions.xsl
+++ b/templates/user_instructions.xsl
@@ -28,7 +28,7 @@
       test="normalize-space($output) != ''">Dear <xsl:value-of select="user/cn"/>,
 <xsl:value-of select="$output"/><xsl:if test="not(boolean(user/group[ cn='mailusers']))"><xsl:call-template 
name="plug-foundation"/></xsl:if>
 
-For any other issues, please contact 'support gnome org'.
+For any other issues, please contact 'accounts gnome org'.
 
 --
 The GNOME Accounts Team
@@ -38,7 +38,7 @@ Your GNOME Git account will be ready for use in about 1 hour.
 
 For information on using GNOME Git, please see:
 
-http://live.gnome.org/Git
+https://wiki.gnome.org/Git
 
 When working on modules in Git, please be sure you have read and
 understood the README.git or HACKING files if they exist. If they do not
@@ -64,18 +64,17 @@ As a member of the GNOME Foundation, you also qualify for a full
 '<xsl:value-of select="user/uid"/>@gnome.org' e-mail alias. To apply for
 your Foundation Member alias to be set up, please see the notes here:
 
-http://live.gnome.org/NewEmailRequest</xsl:template><xsl:template name="shellintro">
+https://wiki.gnome.org/NewEmailRequest</xsl:template><xsl:template name="shellintro">
 
 Within 1 hour, you can ssh/scp to <xsl:value-of select="user/uid"/>@master.gnome.org. Please 
-read http://sysadmin.gnome.org/users/security.html for guidelines about
-using your SSH key.
+read https://wiki.gnome.org/SSHKeyGuidelines for guidelines about using your SSH key.
 
 To upload a release, first scp the tarball to your home directory. Then
-run the "install-module" script. If you run it without arguments, you
+run the "ftpadmin" script. If you run it without arguments, you
 get a nice help message that explains how this tool should be used.</xsl:template><xsl:template 
name="mailintro">
 OK, your <xsl:value-of select="user/uid"/>@gnome.org email alias should be working in about an 
 hour from now. Remember to follow the rules outlined on
-http://live.gnome.org/MailAliasPolicy when using
+http://wiki.gnome.org/MailAliasPolicy when using
 your mail alias.
 </xsl:template><xsl:template name="keysadded">
 One or more SSH keys have been added to your GNOME account. It will take