From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001
From: David Lawrence Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has
-deemed 'secure'. This means emails containing information about those [% terms.bugs %]
+ Some bugs in this [% terms.Bugzilla %] are in groups the administrator has
+deemed 'secure'. This means emails containing information about those bugs
will only be sent encrypted. Enter your PGP/GPG public key or
-SMIME certificate here to receive full update emails for such [% terms.bugs %].
If you are a member of a secure group, or if you enter a key here, your password reset email -will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, -you will not be able to reset your password without the assistance of an administrator.
+If you are a member of a secure group, or if you enter a key here, your password reset email will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, you will not be able to reset your password without the assistance of an administrator.
diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl index 4e1a5c577..76525eac2 100644 --- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl +++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl @@ -24,12 +24,12 @@ title = "SecureMail Help" %] -[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] -will not send unencrypted email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either +Bugzilla considers certain groups as "secure". If a bug is in one of those groups, Bugzilla will not send unencrypted +email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either a S/MIME or a GPG/PGP key on the SecureMail preferences tab.gpg --armor --output pubkey.txt --export 'Your Name'
Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %]. +
Paste the contents of pubkey.txt into the SecureMail text field in Bugzilla.