Some fixes from Guillem Jover <guillem@debian.org>; welcome-message-800 changes rewor...

diff --git a/templates/change-reply b/templates/change-reply
index 7987276..5233225 100644 (file)
--- a/templates/change-reply
+++ b/templates/change-reply
@@ -4,7 +4,7 @@ Subject: DB Change Request
 Hello __EMAIL__!
 
 Your request to change your directory information has been processed.
-Note that there is a propogation time for many of the entries so please
+Note that there is a propagation time for many of the entries so please
 be patient. Here are the results:
 
 __RESULT__

diff --git a/templates/passwd-changed b/templates/passwd-changed
index f91f5e1..892f2e9 100644 (file)
--- a/templates/passwd-changed
+++ b/templates/passwd-changed
@@ -6,9 +6,9 @@ Hello __EMAIL__!
 Your password has been updated. Enclosed below is the new password encrypted
 with your key. __CRYPTTYPE__
 
-Currently LDAP information is replicated to each machine every 15 mins, 
+Currently LDAP information is replicated to each machine every 15 mins,
 you can set a proper password only by using the web interface at
-https://db.debian.org/
+<URL:https://db.debian.org/>.
 
 Please email __ADMIN__ if you have any questions.
 

diff --git a/templates/ping-reply b/templates/ping-reply
index 4db4b87..69129cf 100644 (file)
--- a/templates/ping-reply
+++ b/templates/ping-reply
@@ -1,5 +1,5 @@
 From: __FROM__
-Subject: Pring Reply
+Subject: Ping Reply
 
 Hello __EMAIL__!
 

diff --git a/templates/welcome-message-60000 b/templates/welcome-message-60000
index e721625..b84c00e 100644 (file)
--- a/templates/welcome-message-60000
+++ b/templates/welcome-message-60000
@@ -12,7 +12,7 @@ use this account to help make software run properly on the Debian GNU/Linux
 distribution. The username for this account is '__LOGIN__'. The password can
 be found encrypted with your PGP key and appended to this message.
 
-See http://db.debian.org/machines.cgi for a list of machines that are
+See <URL:http://db.debian.org/machines.cgi> for a list of machines that are
 available. The ones marked 'public' are available to non-developers.
 
 Requests for Debian software to be installed should be directed at

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 2715e8d..88f575a 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -12,18 +12,18 @@ User-Agent: nm-create script run by __WHOAMI__
 Dear __REALNAME__!
 
 An account has been created for you on developer-accessible machines
-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
+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
-at <URL:http://www.debian.org/devel/dmup>
+at <URL:http://www.debian.org/devel/dmup>.
 
 You have been subscribed to the debian-private mailing list as
 <__PRIVATE__>.  Please respect the privacy of that list and don't forward
 mail from it elsewhere.  E-mail to <__LOGIN__@debian.org> will be
 forwarded to <__EMAIL__>.  To change this, please see
-<URL:http://db.debian.org/forward.html> Also, please subscribe to 
+<URL:http://db.debian.org/forward.html>.  Also, please subscribe to
 debian-devel-announce, if you haven't done so already.
 
 We strongly suggest that you use your __LOGIN__@debian.org address for
@@ -36,7 +36,7 @@ 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
-titled "Debian Developer's reference"). 
+titled "Debian Developer's reference").
 
 We suggest that you subscribe to debian-mentors@lists.debian.org.
 This list is for new maintainers who seek help with initial packaging
@@ -57,35 +57,35 @@ 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://www.debian.org/devel/wnpp/>
+<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
-list to make sure nobody else is working on them.
+software you *must* announce your intention on the debian-devel
+mailing list to make sure nobody else is working on them.
 
-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 gluck.debian.org (aka cvs/www.debian.org), gluck is also our
-general shell server. Web pages should be placed in public_html on gluck 
-and refered to by http://people.debian.org/~__LOGIN__
+The machine ftp-master.debian.org is our main archive server.  Every
+uploaded package finds it's way there eventually.  master.debian.org
+is the home of our bug tracking system.  Project web pages and CVS
+archives are hosted on gluck.debian.org (aka cvs/www.debian.org),
+gluck is also our general shell server.  Web pages should be placed in
+public_html on gluck and refered to by
+<URL: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,
-please see <URL:http://db.debian.org/doc-mail.html> Otherwise when you
-first login a ~/.ssh directory will be created with the appropriate
-permissions. Please be aware of the security implications of using RSA
-authentication and ssh agents.
-
-Finally, please take a minute to visit <URL:http://db.debian.org/>. 
-Login using the password information appended to this email, and 
-update your personal information. The information is used to maintain 
-your accounts on various Debian machines, and also to allow other 
-developers and general users to find out more about you. Many of 
-the fields are only visible to other registered Debian developers. This
-is also the only way to change your password. The passwd program does not 
-yet work.
+or rlogin.  Our LDAP directory is able to share ssh RSA keys among
+machines, please see <URL:http://db.debian.org/doc-mail.html>
+Otherwise when you first login a ~/.ssh directory will be created with
+the appropriate permissions.  Please be aware of the security
+implications of using RSA authentication and ssh agents.
+
+Finally, please take a minute to visit <URL:http://db.debian.org/>.
+Login using the password information appended to this email, and
+update your personal information.  The information is used to maintain
+your accounts on various Debian machines, and also to allow other
+developers and general users to find out more about you.  Many of the
+fields are only visible to other registered Debian developers.  This
+is also the only way to change your password.  The passwd program does
+not yet work.
 
 Welcome to the project!