X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fwelcome-message-Debian;h=e511a9ecb853725919e9d3afd3cbb9df01444e19;hb=ded9a82b901b9784d9ac5343c598b409f23fa060;hp=ce62fada5c6bf4806f78627733cd9caa0de55ab1;hpb=fea714a501b4cd813dfb8800511d2bc42559e79b;p=mirror%2Fuserdir-ldap.git

diff --git a/templates/welcome-message-Debian b/templates/welcome-message-Debian
index ce62fad..e511a9e 100644
--- a/templates/welcome-message-Debian
+++ b/templates/welcome-message-Debian
@@ -38,10 +38,6 @@ a look at <URL:https://db.debian.org/machines.cgi>.
 Please remember that you accepted the Debian Machine Usage Policy in
 your NM process (available at <URL:https://www.debian.org/devel/dmup>).
 
-If you need additional software installed on one of the machines (in the
-host system) please contact debian-admin@lists.debian.org, but keep in
-mind that not all software is available on all architectures.
-
 On porter machines, the chroot environments can be entered with the
 'schroot' command, depending on setup; take a look at the list of
 machines to know which are our porterboxes.  You can install build
@@ -52,15 +48,15 @@ and ask your fellow DDs if you need any help.
 You need to use ssh to log into the machines; telnet and rlogin are
 disabled for security reasons.  On debian.org servers the only ssh
 authentication method available is publickey.  The LDAP directory is
-able to share RSA ssh keys among machines, please see
+able to share public ssh keys among machines, please see
 <URL:https://db.debian.org/doc-mail.html>.  Please be aware of the
-security implications of using RSA authentication and ssh agents.  The
-SSH fingerprints for all Debian machines can be looked up at
+security implications of using public-key authentication and ssh agents.
+The SSH fingerprints for all Debian machines can be looked up at
 <URL:https://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 its websites using SSL. The SSL certificates
-used are signed by a current commercial certificate authority.
+used are signed by Let's Encrypt certificate authority.
 
 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
@@ -76,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