Doc fixes

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

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 5e84fdc..5df81e8 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -1,8 +1,8 @@
 To: "__REALNAME__" <__EMAIL__>
 From: __WHOAMI__
 Subject: New Debian maintainer __REALNAME__
 To: "__REALNAME__" <__EMAIL__>
 From: __WHOAMI__
 Subject: New Debian maintainer __REALNAME__

-Cc: new-maintainer@debian.org
-Reply-To: new-maintainer@debian.org
+Cc: da-manager@debian.org
+Reply-To: da-manager@debian.org

 Date: __DATE__
 User-Agent: nm-create script run by __WHOAMI__
 
 Date: __DATE__
 User-Agent: nm-create script run by __WHOAMI__
 


@@ -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
 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
 
 You can find more information useful to developers at
 <URL:http://www.debian.org/devel/> (in particular, see the subsection


@@ -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 
 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 refered 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,
 
 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,