Apply patch to welcome-message-800 provided by Sandro Tosi:

[mirror/userdir-ldap.git] / templates / welcome-message-800

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 6c0473e..e16f328 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -4,7 +4,7 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 Subject: New Debian maintainer __REALNAME__
-Cc: da-manager@debian.org
+Cc: da-manager@debian.org, debian-admin@debian.org
 Reply-To: da-manager@debian.org
 Date: __DATE__
 User-Agent: nm-create script run by __WHOAMI__
@@ -38,21 +38,21 @@ to know which one has chroots available for you.
 You need to use ssh to log into the machines; telnet and rlogin are
 disabled for security reasons.  The LDAP directory is able to share RSA
 ssh keys among machines, please see <URL:http://db.debian.org/doc-mail.html>
-Otherwise when you first login a ~/.ssh directory will be created with
-the appropriate permissions.  Please be aware of the security
-implications of using RSA authentication and ssh agents.
+Please be aware of the security implications of using RSA authentication
+and ssh agents.
 
 To give you a quick overview here is a list of the most important
 machines from the project you can access.  First there is
-ftp-master.debian.org, it is our main archive server and the place
+ftp.upload.debian.org, it is our main archive server and the place
 where you upload your packages.  It is restricted, so you can only
 upload with anonymous FTP - a tool like dput or dupload can aid this
-process.  The Projects web pages, CVS archive, the main shell server
-and various other stuff is located on gluck.debian.org.  This machine
-is also reachable as {cvs,people,www}.debian.org.  If you want your
-own Debian related site to appear behind
-<URL:http://people.debian.org/~__LOGIN__> then put it at this machine
-in the directory ~/public_html/.
+process.  The Projects CVS archive and various other stuff is located
+on gluck.debian.org.  This machine is also reachable as
+cvs.debian.org.  The Project main shell server is located at
+ravel.debian.org.  This machine is also reachable as
+people.debian.org.  If you want your own Debian related site to appear
+behind <URL:http://people.debian.org/~__LOGIN__> then put it at 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
@@ -75,6 +75,10 @@ find out more about you.  Many of the fields are only visible to other
 registered Debian developers.  This is also the only way to change your
 password.  The passwd program does not yet work.
 
+You can refer to http://wiki.debian.org/MigrateToDDAccount to find
+additional notes to help you migrate your previous information to your
+new account.
+
 Before we go on with other important information let's remember the most
 important documents from the NM process.  That you now got your account
 doesn't mean to stop reading and checking them whenever you do packaging
@@ -120,6 +124,7 @@ may wish to take a look at the "Work-Needing and Prospective Packages",
 Welcome to the project!
 
 -- 
+Debian System Administrators on behalf of
 The Debian New Maintainer Team
 
 __PASSWORD__