HEADmaster

4 files changed, 11 insertions, 8 deletions

diff --git a/src/mailman_pgp/workflows/key_change.py b/src/mailman_pgp/workflows/key_change.py
index 66fb4e9..ed5ad70 100644
--- a/src/mailman_pgp/workflows/key_change.py
+++ b/src/mailman_pgp/workflows/key_change.py
@@ -35,7 +35,7 @@ from mailman_pgp.workflows.mod_approval import (
 
 CHANGE_CONFIRM_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
+This is a PGP enabled mailing list.
 You requested to change your key.
 Reply to this message with this whole text
 signed with your supplied key, either inline or PGP/MIME.
diff --git a/src/mailman_pgp/workflows/key_confirm.py b/src/mailman_pgp/workflows/key_confirm.py
index cf87832..6abd560 100644
--- a/src/mailman_pgp/workflows/key_confirm.py
+++ b/src/mailman_pgp/workflows/key_confirm.py
@@ -26,9 +26,11 @@ from mailman_pgp.pgp.wrapper import PGPWrapper
 
 CONFIRM_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
+This is a PGP enabled mailing list.
+You need to confirm ownership of a key you set.
 Reply to this message with this whole text
 signed with your supplied key, either inline or PGP/MIME.
+Doing so will confirm your key.
 
 Fingerprint: {}
 Token: {}
diff --git a/src/mailman_pgp/workflows/key_set.py b/src/mailman_pgp/workflows/key_set.py
index 95e6e7c..32273ca 100644
--- a/src/mailman_pgp/workflows/key_set.py
+++ b/src/mailman_pgp/workflows/key_set.py
@@ -25,10 +25,11 @@ from mailman_pgp.database import transaction
 
 KEY_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
-We need your pubkey.
+This is a PGP enabled mailing list.
+Your PGP public key is required.
 Reply to this message with it as a PGP/MIME(preferred) or inline.
-----------"""
+----------
+"""
 
 
 @public
diff --git a/src/mailman_pgp/workflows/mod_approval.py b/src/mailman_pgp/workflows/mod_approval.py
index ea3369b..b96866e 100644
--- a/src/mailman_pgp/workflows/mod_approval.py
+++ b/src/mailman_pgp/workflows/mod_approval.py
@@ -27,7 +27,7 @@ from mailman_pgp.pgp.mime import MIMEWrapper
 
 SUBSCRIPTION_MOD_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
+This is a PGP enabled mailing list.
 A user with address {address} requested subscription.
 The key is attached to this message.
 
@@ -37,7 +37,7 @@ Fingerprint: {fingerprint}
 
 KEY_CHANGE_MOD_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
+This is a PGP enabled mailing list.
 A subscriber with address {address} requested a change of his key.
 The new key is attached to this message.
 
@@ -48,7 +48,7 @@ New key fingerprint: {new_fpr}
 
 KEY_REVOKE_MOD_REQUEST = """\
 ----------
-TODO: this is a pgp enabled list.
+This is a PGP enabled mailing list.
 A subscriber with address {address} revoked a part of his key,
 which made it unusable and needs to be reset. The subscriber
 supplied a new key. The new key is attached to this message.