* Uploading/Non-Uploading DDs

* remove superfluous "and"
* SSH fingerprints of the machines
* Debian CA
* mention debian-infrastructure-announce
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 01c5756..3f9c480 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -17,14 +17,16 @@ Dear __REALNAME__!
 Your account '__LOGIN__' has just been created in the central LDAP
 database of the Debian project.  Please note that it needs a bit of time
 until this information is synced with all developer-accessible machines.
-You should be able to login or upload packages after about 30-60 minutes.
-The password for this account can be found appended to this message,
-encrypted with your GPG key.
+You should be able to login into debian.org machines after about 30-60
+minutes.  The password for this account can be found appended to this
+message, encrypted with your GPG key. If you applied for Debian
+Developer with uploading rights, you should be able to upload packages
+already.
 
 Email sent to <__LOGIN__@debian.org> will be forwarded to <__EMAIL__>,
 to change this visit <URL:http://db.debian.org/forward.html>.
 The Debian mail setup allows various per-user settings, like enabling
-greylisting and sender-verify-callouts and per-user dns blocklists.
+greylisting, sender-verify-callouts and per-user dns blocklists.
 Please refer to <URL:http://db.debian.org/doc-mail.html> on how to change
 these settings.  Some may also be exposed via the web interface behind
 <URL:https://db.debian.org/login.html>.
@@ -45,7 +47,14 @@ 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>
 Please be aware of the security implications of using RSA authentication
-and ssh agents.
+and ssh agents.  The SSH fingerprints for all Debian machines can be
+looked up at <URL:http://db.debian.org/machines.cgi> or a known_hosts
+file can be downloaded from <URL:https://db.debian.org/debian_known_hosts>.
+
+Debian secures some of it's websites using SSL. The SSL certificates
+used are signed by the intermediate CA ca.debian.org. ca.debian.org
+itself is signed by SPI CA which is part of the Debian package
+ca-certificates.
 
 To give you a quick overview here is a list of the most important
 machines from the project you can access.  There is the main archive
@@ -106,7 +115,9 @@ You can find much more information useful to developers at
 
 Also, please subscribe to the mailing list debian-devel-announce, if you
 haven't done so already.  All Debian developers are required to read
-this list, as important announcements are made there.
+this list, as important announcements are made there. Changes to
+Debian's infrastructure and maintenance of it are announced to the
+debian-infrastructure-announce mailing list.
 
 We strongly suggest that you use your __LOGIN__@debian.org address for
 the maintainer field in your packages, because that one will be valid