minor welcome message updates in the salsa paragraph

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

diff --git a/templates/welcome-message-Debian b/templates/welcome-message-Debian
index ce62fad..0689bb5 100644 (file)
--- 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>).
 
 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
 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
 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
 <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
 <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
 
 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,11 @@ 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/.
 
 <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
-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.
+The service hosting most of our git repositories is salsa.debian.org,
+and it is handled by a seperate team that you can reach at
+salsa-admin@debian.org.  You probably already have a *-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
 
 There is one developer-only mailing list, debian-private.  You have been
 subscribed to this list as <__PRIVATE__>, please respect the privacy of