James patch

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

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index a1e8362..52d18e4 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -16,7 +16,7 @@ with username '__LOGIN__'.  The password for this account can be found
 encrypted with your PGP or GPG key and appended to this message. A list 
 of machines available to Debian developers can be found at
 <URL:http://db.debian.org/machines.cgi>. Please take a minute now to
-familiarize yourself with the Debian Machine Usage Policy, available
+familiarise yourself with the Debian Machine Usage Policy, available
 at <URL:http://www.debian.org/devel/dmup>
 
 You have been subscribed to the debian-private mailing list as
@@ -29,9 +29,10 @@ debian-devel-announce, if you haven't done so already.
 We strongly suggest that you use your __LOGIN__@debian.org address for
 the maintainer field in your packages, because that one will be valid
 as long as you are a Debian developer, even if you change jobs, leave
-university or change Internet Service providers.  If you do so, please 
-add that address to your PGP/GPG key(s) (using `gpg --edit-key 
-"YOUR USER ID"') and send it to <keyring-maint@debian.org>.
+university or change Internet Service providers.  If you do so, please
+add that address to your PGP/GPG key(s) (using `gpg --edit-key "YOUR
+USER ID"') and send it to the keyring server at keyring.debian.org
+with `gpg --keyserver keyring.debian.org --send-keys "YOUR USER ID"'.
 
 You can find more information useful to developers at
 <URL:http://www.debian.org/devel/> (in particular, see the subsection
@@ -59,7 +60,7 @@ You should have read these documents before working on your packages.
 If you have some spare time and want to contribute it to Debian you
 may wish to take a look at the "Work-Needing and Prospective Packages
 for Debian GNU/Linux" also known as WNPP that can be found at
-<URL:http://ftp.debian.org/debian/doc/package-developer/prospective-packages.html>
+<URL:http://www.debian.org/devel/wnpp/>
 
 If you plan to make a Debian package from a not yet packaged piece of
 software you *must* announce your intention on the debian-devel mailing
@@ -69,7 +70,9 @@ The machine ftp-master.debian.org is our main archive server.  Every
 uploaded package finds it's way there (except for Packages covered by US 
 crypto laws which go to non-us.debian.org) eventually. master.debian.org is 
 the home of our bug tracking system. Project web pages and CVS archives are 
-hosted on va.debian.org (aka cvs/www.debian.org).
+hosted on klecker.debian.org (aka cvs/www.debian.org), klecker is also our
+general shell server. Web pages should be placed in public_html on klecker 
+and referred to by http://people.debian.org/~__LOGIN__
 
 You should use ssh to log into the machines instead of regular telnet
 or rlogin. Our LDAP directory is able to share ssh RSA keys among machines,