Change references from alioth to salsa in the DD welcome email

Closes: #910057

diff --git a/debian/changelog b/debian/changelog
index 1287727..2f7548c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ userdir-ldap (0.3.93) UNRELEASED; urgency=medium
   [ Ansgar Burchardt ]
   * ud-mailgate: include name of unknown host in error message
 
+  [ Joseph Herlant ]
+  * Change references from alioth to salsa in the DD welcome email
+  (Closes: #910057)
+
  -- Peter Palfrader <weasel@debian.org>  Thu, 01 Mar 2018 20:47:02 +0100
 
 userdir-ldap (0.3.92) unstable; urgency=medium

diff --git a/templates/welcome-message-Debian b/templates/welcome-message-Debian
index d8848e5..e511a9e 100644 (file)
--- a/templates/welcome-message-Debian
+++ b/templates/welcome-message-Debian
@@ -72,13 +72,12 @@ If you want your own Debian related site to appear behind
 <URL:https://people.debian.org/~__LOGIN__/> then put it on this
 machine in the directory ~/public_html/.
 
-The machine hosting most of our VCS repositories
-({svn,bzr,git,arch,hg}.debian.org) is alioth.debian.org. It's handled
-by a separate team (admin@alioth.debian.org) as it allows login by
+The machine hosting most of our VCS repositories (only git now)
+is salsa.debian.org. It's handled
+by a separate team (salsa-admin@debian.org) as it allows login by
 non-Debian developers. You probably already have a *-guest account
-there.  Please refer to https://wiki.debian.org/AliothFAQ to learn
-anything you need to know, including how to activate your account and
-how to request the removal of your old -guest account.
+there.  Please refer to https://wiki.debian.org/Salsa to learn
+anything you need to know, including how to activate your account.
 
 There is one developer-only mailing list, debian-private.  You have been
 subscribed to this list as <__PRIVATE__>, please respect the privacy of