CVS: tmda/templates confirm_accept.txt, 1.13, 1.14 bounce_missing_pending.txt, 1.1, 1.2 confirm_accept_already_confirmed.txt, 1.1, NONE confirm_accept_already_released.txt, 1.1, NONE confirm_accept_initial.txt, 1.1, NONE

Update of /cvsroot/tmda/tmda/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7068/templates

Modified Files:
	bounce_missing_pending.txt 
Added Files:
	confirm_accept.txt 
Removed Files:
	confirm_accept_already_confirmed.txt 
	confirm_accept_already_released.txt confirm_accept_initial.txt 
Log Message:
No longer distinguish between 'released', 'confirmed', and 'still
pending' messages in the pending queue.  Messages are simply unlinked
once confirmed or released rather than being renamed with a '3,R' or
'3,C' suffix.

The behavior was somewhat nice in that it allowed for a more
intelligent auto-response in the event that someone tried to confirm
their message by e-mail after it was hand-released by the recipient.

As it turned out, this slight convenience was not worth all the extra
costs (substantially increased code complexity, increased storage
requirements, and user confusion among others).

Senders who try to confirm by e-mail will now get back an
auto-response controlled by bounce_missing_pending.txt if their
message no longer exists on disk.  TMDA users who don't like the
default wording can either customize it this template, or change
ACTION_MISSING_PENDING to something other than 'bounce'.



Index: bounce_missing_pending.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/bounce_missing_pending.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bounce_missing_pending.txt	21 Feb 2004 01:09:21 -0000	1.1
+++ bounce_missing_pending.txt	2 Mar 2004 02:26:43 -0000	1.2
@@ -10,4 +10,6 @@
 
 <%(recipient_address)s>:
 
-Your original message could not be located, please resend.
+Your original message could not be located.  This may be because the
+recipient has already delivered your message by hand.  If in doubt,
+you might want to resend your message.

--- confirm_accept_already_confirmed.txt DELETED ---

--- confirm_accept_already_released.txt DELETED ---

--- confirm_accept_initial.txt DELETED ---