CVS: tmda/htdocs config-vars.ht, 1.49, 1.50 config-vars.html, 1.94, 1.95 howto-template.ht, 1.11, 1.12 howto-template.html, 1.37, 1.38

"Jason R. Mastaler" <[email protected]> Mon, 01 Mar 2004 18:26:45 -0800
Newsgroups gmane.mail.spam.tmda.cvs
Message-ID <[email protected]>
Update of /cvsroot/tmda/tmda/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7068/htdocs

Modified Files:
	config-vars.ht config-vars.html howto-template.ht 
	howto-template.html 
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: config-vars.ht
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/config-vars.ht,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- config-vars.ht	27 Feb 2004 18:29:27 -0000	1.49
+++ config-vars.ht	2 Mar 2004 02:26:43 -0000	1.50
@@ -62,158 +62,152 @@
 </tr>
 <tr>
 <td><a href="#CONFIG_EXEC">CONFIG_EXEC</a></td>
-<td><a href="#CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY">CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</a></td>
-</tr>
-<tr>
-<td><a href="#CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY">CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</a></td>
 <td><a href="#CONFIRM_ACCEPT_CC">CONFIRM_ACCEPT_CC</a></td>
 </tr>
 <tr>
-<td><a href="#CONFIRM_ACCEPT_INITIAL_NOTIFY">CONFIRM_ACCEPT_INITIAL_NOTIFY</a></td>
 <td><a href="#CONFIRM_ACCEPT_NOTIFY">CONFIRM_ACCEPT_NOTIFY</a></td>
-</tr>
-<tr>
 <td><a href="#CONFIRM_ADDRESS">CONFIRM_ADDRESS</a></td>
-<td><a href="#CONFIRM_APPEND">CONFIRM_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#CONFIRM_APPEND">CONFIRM_APPEND</a></td>
 <td><a href="#CONFIRM_CC">CONFIRM_CC</a></td>
-<td><a href="#CONFIRM_MAX_MESSAGE_SIZE">CONFIRM_MAX_MESSAGE_SIZE</a></td>
 </tr>
 <tr>
+<td><a href="#CONFIRM_MAX_MESSAGE_SIZE">CONFIRM_MAX_MESSAGE_SIZE</a></td>
 <td><a href="#CRYPT_KEY_FILE">CRYPT_KEY_FILE</a></td>
-<td><a href="#DATADIR">DATADIR</a></td>
 </tr>
 <tr>
+<td><a href="#DATADIR">DATADIR</a></td>
 <td><a href="#DATED_TEMPLATE_VARS">DATED_TEMPLATE_VARS</a></td>
-<td><a href="#DATED_TIMEOUT">DATED_TIMEOUT</a></td>
 </tr>
 <tr>
+<td><a href="#DATED_TIMEOUT">DATED_TIMEOUT</a></td>
 <td><a href="#DB_BARE_APPEND">DB_BARE_APPEND</a></td>
-<td><a href="#DB_CONFIRM_APPEND">DB_CONFIRM_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#DB_CONFIRM_APPEND">DB_CONFIRM_APPEND</a></td>
 <td><a href="#DB_CONNECTION">DB_CONNECTION</a></td>
-<td><a href="#DELIVERY">DELIVERY</a></td>
 </tr>
 <tr>
+<td><a href="#DELIVERY">DELIVERY</a></td>
 <td><a href="#FILTER_BOUNCE_CC">FILTER_BOUNCE_CC</a></td>
-<td><a href="#FILTER_DROP_CC">FILTER_DROP_CC</a></td>
 </tr>
 <tr>
+<td><a href="#FILTER_DROP_CC">FILTER_DROP_CC</a></td>
 <td><a href="#FILTER_INCOMING">FILTER_INCOMING</a></td>
-<td><a href="#FILTER_OUTGOING">FILTER_OUTGOING</a></td>
 </tr>
 <tr>
+<td><a href="#FILTER_OUTGOING">FILTER_OUTGOING</a></td>
 <td><a href="#FINGERPRINT">FINGERPRINT</a></td>
-<td><a href="#FULLNAME">FULLNAME</a></td>
 </tr>
 <tr>
+<td><a href="#FULLNAME">FULLNAME</a></td>
 <td><a href="#HMAC_BYTES">HMAC_BYTES</a></td>
-<td><a href="#HOSTNAME">HOSTNAME</a></td>
 </tr>
 <tr>
+<td><a href="#HOSTNAME">HOSTNAME</a></td>
 <td><a href="#LOGFILE_DEBUG">LOGFILE_DEBUG</a></td>
-<td><a href="#LOGFILE_INCOMING">LOGFILE_INCOMING</a></td>
 </tr>
 <tr>
+<td><a href="#LOGFILE_INCOMING">LOGFILE_INCOMING</a></td>
 <td><a href="#LOGFILE_OUTGOING">LOGFILE_OUTGOING</a></td>
-<td><a href="#MAIL_FOLLOWUP_TO">MAIL_FOLLOWUP_TO</a></td>
 </tr>
 <tr>
+<td><a href="#MAIL_FOLLOWUP_TO">MAIL_FOLLOWUP_TO</a></td>
 <td><a href="#MAIL_TRANSFER_AGENT">MAIL_TRANSFER_AGENT</a></td>
-<td><a href="#MAIL_TRANSPORT">MAIL_TRANSPORT</a></td>
 </tr>
 <tr>
+<td><a href="#MAIL_TRANSPORT">MAIL_TRANSPORT</a></td>
 <td><a href="#MAX_AUTORESPONSES_PER_DAY">MAX_AUTORESPONSES_PER_DAY</a></td>
-<td><a href="#MESSAGE_FROM_STYLE">MESSAGE_FROM_STYLE</a></td>
 </tr>
 <tr>
+<td><a href="#MESSAGE_FROM_STYLE">MESSAGE_FROM_STYLE</a></td>
 <td><a href="#MESSAGE_TAG_HEADER_STYLE">MESSAGE_TAG_HEADER_STYLE</a></td>
-<td><a href="#PENDING_BLACKLIST_APPEND">PENDING_BLACKLIST_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_BLACKLIST_APPEND">PENDING_BLACKLIST_APPEND</a></td>
 <td><a href="#PENDING_CACHE">PENDING_CACHE</a></td>
-<td><a href="#PENDING_CACHE_LEN">PENDING_CACHE_LEN</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_CACHE_LEN">PENDING_CACHE_LEN</a></td>
 <td><a href="#PENDING_CLEANUP_ODDS">PENDING_CLEANUP_ODDS</a></td>
-<td><a href="#PENDING_DELETE_APPEND">PENDING_DELETE_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_DELETE_APPEND">PENDING_DELETE_APPEND</a></td>
 <td><a href="#PENDING_DIR">PENDING_DIR</a></td>
-<td><a href="#PENDING_LIFETIME">PENDING_LIFETIME</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_LIFETIME">PENDING_LIFETIME</a></td>
 <td><a href="#PENDING_RELEASE_APPEND">PENDING_RELEASE_APPEND</a></td>
-<td><a href="#PENDING_WHITELIST_APPEND">PENDING_WHITELIST_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_WHITELIST_APPEND">PENDING_WHITELIST_APPEND</a></td>
 <td><a href="#PENDING_WHITELIST_RELEASE">PENDING_WHITELIST_RELEASE</a></td>
-<td><a href="#PRIMARY_ADDRESS_MATCH">PRIMARY_ADDRESS_MATCH</a></td>
 </tr>
 <tr>
+<td><a href="#PRIMARY_ADDRESS_MATCH">PRIMARY_ADDRESS_MATCH</a></td>
 <td><a href="#PURGED_HEADERS_CLIENT">PURGED_HEADERS_CLIENT</a></td>
-<td><a href="#PURGED_HEADERS_DELIVERY">PURGED_HEADERS_DELIVERY</a></td>
 </tr>
 <tr>
+<td><a href="#PURGED_HEADERS_DELIVERY">PURGED_HEADERS_DELIVERY</a></td>
 <td><a href="#PURGED_HEADERS_SERVER">PURGED_HEADERS_SERVER</a></td>
-<td><a href="#RECIPIENT_DELIMITER">RECIPIENT_DELIMITER</a></td>
 </tr>
 <tr>
+<td><a href="#RECIPIENT_DELIMITER">RECIPIENT_DELIMITER</a></td>
 <td><a href="#RECIPIENT_HEADER">RECIPIENT_HEADER</a></td>
-<td><a href="#RESPONSE_DIR">RESPONSE_DIR</a></td>
 </tr>
 <tr>
+<td><a href="#RESPONSE_DIR">RESPONSE_DIR</a></td>
 <td><a href="#SENDER_TEMPLATE_VARS">SENDER_TEMPLATE_VARS</a></td>
-<td><a href="#SENDMAIL_PROGRAM">SENDMAIL_PROGRAM</a></td>
 </tr>
 <tr>
+<td><a href="#SENDMAIL_PROGRAM">SENDMAIL_PROGRAM</a></td>
 <td><a href="#SMTPAUTH_PASSWORD">SMTPAUTH_PASSWORD</a></td>
-<td><a href="#SMTPAUTH_USERNAME">SMTPAUTH_USERNAME</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPAUTH_USERNAME">SMTPAUTH_USERNAME</a></td>
 <td><a href="#SMTPHOST">SMTPHOST</a></td>
-<td><a href="#SMTPSSL">SMTPSSL</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPSSL">SMTPSSL</a></td>
 <td><a href="#SMTPSSL_CERTFILE">SMTPSSL_CERTFILE</a></td>
-<td><a href="#SMTPSSL_KEYFILE">SMTPSSL_KEYFILE</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPSSL_KEYFILE">SMTPSSL_KEYFILE</a></td>
 <td><a href="#SMTP_MAX_SESSIONS_PER_CONNECTION">SMTP_MAX_SESSIONS_PER_CONNECTION</a></td>
-<td><a href="#SUMMARY_HEADERS">SUMMARY_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#SUMMARY_HEADERS">SUMMARY_HEADERS</a></td>
 <td><a href="#TAGS_CONFIRM">TAGS_CONFIRM</a></td>
-<td><a href="#TAGS_DATED">TAGS_DATED</a></td>
 </tr>
 <tr>
+<td><a href="#TAGS_DATED">TAGS_DATED</a></td>
 <td><a href="#TAGS_KEYWORD">TAGS_KEYWORD</a></td>
-<td><a href="#TAGS_SENDER">TAGS_SENDER</a></td>
 </tr>
 <tr>
+<td><a href="#TAGS_SENDER">TAGS_SENDER</a></td>
 <td><a href="#TEMPLATE_DIR">TEMPLATE_DIR</a></td>
-<td><a href="#TEMPLATE_DIR_MATCH_RECIPIENT">TEMPLATE_DIR_MATCH_RECIPIENT</a></td>
 </tr>
 <tr>
+<td><a href="#TEMPLATE_DIR_MATCH_RECIPIENT">TEMPLATE_DIR_MATCH_RECIPIENT</a></td>
 <td><a href="#TEMPLATE_DIR_MATCH_SENDER">TEMPLATE_DIR_MATCH_SENDER</a></td>
-<td><a href="#TEMPLATE_EMAIL_HEADERS">TEMPLATE_EMAIL_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#TEMPLATE_EMAIL_HEADERS">TEMPLATE_EMAIL_HEADERS</a></td>
 <td><a href="#TEMPLATE_ENCODED_HEADERS">TEMPLATE_ENCODED_HEADERS</a></td>
-<td><a href="#TERSE_SUMMARY_HEADERS">TERSE_SUMMARY_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#TERSE_SUMMARY_HEADERS">TERSE_SUMMARY_HEADERS</a></td>
 <td><a href="#TMDAINJECT">TMDAINJECT</a></td>
-<td><a href="#USERNAME">USERNAME</a></td>
 </tr>
 <tr>
+<td><a href="#USERNAME">USERNAME</a></td>
 <td><a href="#USEVIRTUALDOMAINS">USEVIRTUALDOMAINS</a></td>
-<td><a href="#VIRTUALDOMAINS">VIRTUALDOMAINS</a></td>
 </tr>
 <tr>
+<td><a href="#VIRTUALDOMAINS">VIRTUALDOMAINS</a></td>
 <td><a href="#X_TMDA_IN_SUBJECT">X_TMDA_IN_SUBJECT</a></td>
+</tr>
 </table>
 
 <dl>
@@ -435,7 +429,10 @@
 <a name="ACTION_MISSING_PENDING"><h4>ACTION_MISSING_PENDING</h4></a>
 <dd>
 Specifies how confirmation messages should be disposed of if the
-message to be confirmed can not be located.
+message to be confirmed can not be located on disk.  This might be
+the case if you hand-released the message before the sender tried to
+confirm it by e-mail, or if the sender sent multiple confirmation
+replies.
 Possible values include:
 <br><br>
 "<code>bounce</code>"
@@ -621,26 +618,6 @@
 <br><br>
 Default is True (use execfile())
 <dt><hr>
-<a name="CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY"><h4>CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate already
-confirmed notices.  These are the notices returned to senders when
-they successfully confirm a message which has already been
-confirmed.  Their content is based on the
-confirm_accept_already_confirmed.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
-<a name="CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY"><h4>CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate already
-released notices.  These are the notices returned to senders when
-they successfully confirm a message which has already been released
-by tmda-pending or tmda-cgi.  Their content is based on the
-confirm_accept_already_released.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
 <a name="CONFIRM_ACCEPT_CC"><h4>CONFIRM_ACCEPT_CC</h4></a>
 <dd>
 An optional e-mail address which will be sent a copy of the
@@ -652,20 +629,12 @@
 <br><br>
 No default.
 <dt><hr>
-<a name="CONFIRM_ACCEPT_INITIAL_NOTIFY"><h4>CONFIRM_ACCEPT_INITIAL_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate initial
-confirmation acceptance notices.  These are the notices returned to
-senders when they initially confirm their original message causing
-it to be delivered.  Their content is based on the
-confirm_accept_initial.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
 <a name="CONFIRM_ACCEPT_NOTIFY"><h4>CONFIRM_ACCEPT_NOTIFY</h4></a>
 <dd>
-Set this variable to False if you do not want to generate any confirmation
-acceptance notices at all.
+Set this variable to False if you do not want to generate any
+confirmation acceptance notices.  These are the notices returned to
+senders when they confirm their original message by e-mail.  Their
+content is based on the confirm_accept.txt template.
 <br><br>
 Default is True (turned on)
 <dt><hr>

Index: config-vars.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/config-vars.html,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- config-vars.html	1 Mar 2004 19:02:13 -0000	1.94
+++ config-vars.html	2 Mar 2004 02:26:43 -0000	1.95
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED.  DO NOT EDIT. -->
-<!-- Mon Mar  1 12:05:06 2004 -->
+<!-- Mon Mar  1 19:08:29 2004 -->
 <!-- USING HT2HTML 2.0 -->
 <!-- SEE http://ht2html.sf.net -->
 <!-- User-specified headers:
@@ -270,158 +270,152 @@
 </tr>
 <tr>
 <td><a href="#CONFIG_EXEC">CONFIG_EXEC</a></td>
-<td><a href="#CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY">CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</a></td>
-</tr>
-<tr>
-<td><a href="#CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY">CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</a></td>
 <td><a href="#CONFIRM_ACCEPT_CC">CONFIRM_ACCEPT_CC</a></td>
 </tr>
 <tr>
-<td><a href="#CONFIRM_ACCEPT_INITIAL_NOTIFY">CONFIRM_ACCEPT_INITIAL_NOTIFY</a></td>
 <td><a href="#CONFIRM_ACCEPT_NOTIFY">CONFIRM_ACCEPT_NOTIFY</a></td>
-</tr>
-<tr>
 <td><a href="#CONFIRM_ADDRESS">CONFIRM_ADDRESS</a></td>
-<td><a href="#CONFIRM_APPEND">CONFIRM_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#CONFIRM_APPEND">CONFIRM_APPEND</a></td>
 <td><a href="#CONFIRM_CC">CONFIRM_CC</a></td>
-<td><a href="#CONFIRM_MAX_MESSAGE_SIZE">CONFIRM_MAX_MESSAGE_SIZE</a></td>
 </tr>
 <tr>
+<td><a href="#CONFIRM_MAX_MESSAGE_SIZE">CONFIRM_MAX_MESSAGE_SIZE</a></td>
 <td><a href="#CRYPT_KEY_FILE">CRYPT_KEY_FILE</a></td>
-<td><a href="#DATADIR">DATADIR</a></td>
 </tr>
 <tr>
+<td><a href="#DATADIR">DATADIR</a></td>
 <td><a href="#DATED_TEMPLATE_VARS">DATED_TEMPLATE_VARS</a></td>
-<td><a href="#DATED_TIMEOUT">DATED_TIMEOUT</a></td>
 </tr>
 <tr>
+<td><a href="#DATED_TIMEOUT">DATED_TIMEOUT</a></td>
 <td><a href="#DB_BARE_APPEND">DB_BARE_APPEND</a></td>
-<td><a href="#DB_CONFIRM_APPEND">DB_CONFIRM_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#DB_CONFIRM_APPEND">DB_CONFIRM_APPEND</a></td>
 <td><a href="#DB_CONNECTION">DB_CONNECTION</a></td>
-<td><a href="#DELIVERY">DELIVERY</a></td>
 </tr>
 <tr>
+<td><a href="#DELIVERY">DELIVERY</a></td>
 <td><a href="#FILTER_BOUNCE_CC">FILTER_BOUNCE_CC</a></td>
-<td><a href="#FILTER_DROP_CC">FILTER_DROP_CC</a></td>
 </tr>
 <tr>
+<td><a href="#FILTER_DROP_CC">FILTER_DROP_CC</a></td>
 <td><a href="#FILTER_INCOMING">FILTER_INCOMING</a></td>
-<td><a href="#FILTER_OUTGOING">FILTER_OUTGOING</a></td>
 </tr>
 <tr>
+<td><a href="#FILTER_OUTGOING">FILTER_OUTGOING</a></td>
 <td><a href="#FINGERPRINT">FINGERPRINT</a></td>
-<td><a href="#FULLNAME">FULLNAME</a></td>
 </tr>
 <tr>
+<td><a href="#FULLNAME">FULLNAME</a></td>
 <td><a href="#HMAC_BYTES">HMAC_BYTES</a></td>
-<td><a href="#HOSTNAME">HOSTNAME</a></td>
 </tr>
 <tr>
+<td><a href="#HOSTNAME">HOSTNAME</a></td>
 <td><a href="#LOGFILE_DEBUG">LOGFILE_DEBUG</a></td>
-<td><a href="#LOGFILE_INCOMING">LOGFILE_INCOMING</a></td>
 </tr>
 <tr>
+<td><a href="#LOGFILE_INCOMING">LOGFILE_INCOMING</a></td>
 <td><a href="#LOGFILE_OUTGOING">LOGFILE_OUTGOING</a></td>
-<td><a href="#MAIL_FOLLOWUP_TO">MAIL_FOLLOWUP_TO</a></td>
 </tr>
 <tr>
+<td><a href="#MAIL_FOLLOWUP_TO">MAIL_FOLLOWUP_TO</a></td>
 <td><a href="#MAIL_TRANSFER_AGENT">MAIL_TRANSFER_AGENT</a></td>
-<td><a href="#MAIL_TRANSPORT">MAIL_TRANSPORT</a></td>
 </tr>
 <tr>
+<td><a href="#MAIL_TRANSPORT">MAIL_TRANSPORT</a></td>
 <td><a href="#MAX_AUTORESPONSES_PER_DAY">MAX_AUTORESPONSES_PER_DAY</a></td>
-<td><a href="#MESSAGE_FROM_STYLE">MESSAGE_FROM_STYLE</a></td>
 </tr>
 <tr>
+<td><a href="#MESSAGE_FROM_STYLE">MESSAGE_FROM_STYLE</a></td>
 <td><a href="#MESSAGE_TAG_HEADER_STYLE">MESSAGE_TAG_HEADER_STYLE</a></td>
-<td><a href="#PENDING_BLACKLIST_APPEND">PENDING_BLACKLIST_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_BLACKLIST_APPEND">PENDING_BLACKLIST_APPEND</a></td>
 <td><a href="#PENDING_CACHE">PENDING_CACHE</a></td>
-<td><a href="#PENDING_CACHE_LEN">PENDING_CACHE_LEN</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_CACHE_LEN">PENDING_CACHE_LEN</a></td>
 <td><a href="#PENDING_CLEANUP_ODDS">PENDING_CLEANUP_ODDS</a></td>
-<td><a href="#PENDING_DELETE_APPEND">PENDING_DELETE_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_DELETE_APPEND">PENDING_DELETE_APPEND</a></td>
 <td><a href="#PENDING_DIR">PENDING_DIR</a></td>
-<td><a href="#PENDING_LIFETIME">PENDING_LIFETIME</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_LIFETIME">PENDING_LIFETIME</a></td>
 <td><a href="#PENDING_RELEASE_APPEND">PENDING_RELEASE_APPEND</a></td>
-<td><a href="#PENDING_WHITELIST_APPEND">PENDING_WHITELIST_APPEND</a></td>
 </tr>
 <tr>
+<td><a href="#PENDING_WHITELIST_APPEND">PENDING_WHITELIST_APPEND</a></td>
 <td><a href="#PENDING_WHITELIST_RELEASE">PENDING_WHITELIST_RELEASE</a></td>
-<td><a href="#PRIMARY_ADDRESS_MATCH">PRIMARY_ADDRESS_MATCH</a></td>
 </tr>
 <tr>
+<td><a href="#PRIMARY_ADDRESS_MATCH">PRIMARY_ADDRESS_MATCH</a></td>
 <td><a href="#PURGED_HEADERS_CLIENT">PURGED_HEADERS_CLIENT</a></td>
-<td><a href="#PURGED_HEADERS_DELIVERY">PURGED_HEADERS_DELIVERY</a></td>
 </tr>
 <tr>
+<td><a href="#PURGED_HEADERS_DELIVERY">PURGED_HEADERS_DELIVERY</a></td>
 <td><a href="#PURGED_HEADERS_SERVER">PURGED_HEADERS_SERVER</a></td>
-<td><a href="#RECIPIENT_DELIMITER">RECIPIENT_DELIMITER</a></td>
 </tr>
 <tr>
+<td><a href="#RECIPIENT_DELIMITER">RECIPIENT_DELIMITER</a></td>
 <td><a href="#RECIPIENT_HEADER">RECIPIENT_HEADER</a></td>
-<td><a href="#RESPONSE_DIR">RESPONSE_DIR</a></td>
 </tr>
 <tr>
+<td><a href="#RESPONSE_DIR">RESPONSE_DIR</a></td>
 <td><a href="#SENDER_TEMPLATE_VARS">SENDER_TEMPLATE_VARS</a></td>
-<td><a href="#SENDMAIL_PROGRAM">SENDMAIL_PROGRAM</a></td>
 </tr>
 <tr>
+<td><a href="#SENDMAIL_PROGRAM">SENDMAIL_PROGRAM</a></td>
 <td><a href="#SMTPAUTH_PASSWORD">SMTPAUTH_PASSWORD</a></td>
-<td><a href="#SMTPAUTH_USERNAME">SMTPAUTH_USERNAME</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPAUTH_USERNAME">SMTPAUTH_USERNAME</a></td>
 <td><a href="#SMTPHOST">SMTPHOST</a></td>
-<td><a href="#SMTPSSL">SMTPSSL</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPSSL">SMTPSSL</a></td>
 <td><a href="#SMTPSSL_CERTFILE">SMTPSSL_CERTFILE</a></td>
-<td><a href="#SMTPSSL_KEYFILE">SMTPSSL_KEYFILE</a></td>
 </tr>
 <tr>
+<td><a href="#SMTPSSL_KEYFILE">SMTPSSL_KEYFILE</a></td>
 <td><a href="#SMTP_MAX_SESSIONS_PER_CONNECTION">SMTP_MAX_SESSIONS_PER_CONNECTION</a></td>
-<td><a href="#SUMMARY_HEADERS">SUMMARY_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#SUMMARY_HEADERS">SUMMARY_HEADERS</a></td>
 <td><a href="#TAGS_CONFIRM">TAGS_CONFIRM</a></td>
-<td><a href="#TAGS_DATED">TAGS_DATED</a></td>
 </tr>
 <tr>
+<td><a href="#TAGS_DATED">TAGS_DATED</a></td>
 <td><a href="#TAGS_KEYWORD">TAGS_KEYWORD</a></td>
-<td><a href="#TAGS_SENDER">TAGS_SENDER</a></td>
 </tr>
 <tr>
+<td><a href="#TAGS_SENDER">TAGS_SENDER</a></td>
 <td><a href="#TEMPLATE_DIR">TEMPLATE_DIR</a></td>
-<td><a href="#TEMPLATE_DIR_MATCH_RECIPIENT">TEMPLATE_DIR_MATCH_RECIPIENT</a></td>
 </tr>
 <tr>
+<td><a href="#TEMPLATE_DIR_MATCH_RECIPIENT">TEMPLATE_DIR_MATCH_RECIPIENT</a></td>
 <td><a href="#TEMPLATE_DIR_MATCH_SENDER">TEMPLATE_DIR_MATCH_SENDER</a></td>
-<td><a href="#TEMPLATE_EMAIL_HEADERS">TEMPLATE_EMAIL_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#TEMPLATE_EMAIL_HEADERS">TEMPLATE_EMAIL_HEADERS</a></td>
 <td><a href="#TEMPLATE_ENCODED_HEADERS">TEMPLATE_ENCODED_HEADERS</a></td>
-<td><a href="#TERSE_SUMMARY_HEADERS">TERSE_SUMMARY_HEADERS</a></td>
 </tr>
 <tr>
+<td><a href="#TERSE_SUMMARY_HEADERS">TERSE_SUMMARY_HEADERS</a></td>
 <td><a href="#TMDAINJECT">TMDAINJECT</a></td>
-<td><a href="#USERNAME">USERNAME</a></td>
 </tr>
 <tr>
+<td><a href="#USERNAME">USERNAME</a></td>
 <td><a href="#USEVIRTUALDOMAINS">USEVIRTUALDOMAINS</a></td>
-<td><a href="#VIRTUALDOMAINS">VIRTUALDOMAINS</a></td>
 </tr>
 <tr>
+<td><a href="#VIRTUALDOMAINS">VIRTUALDOMAINS</a></td>
 <td><a href="#X_TMDA_IN_SUBJECT">X_TMDA_IN_SUBJECT</a></td>
+</tr>
 </table>
 
 <dl>
@@ -643,7 +637,10 @@
 <a name="ACTION_MISSING_PENDING"><h4>ACTION_MISSING_PENDING</h4></a>
 <dd>
 Specifies how confirmation messages should be disposed of if the
-message to be confirmed can not be located.
+message to be confirmed can not be located on disk.  This might be
+the case if you hand-released the message before the sender tried to
+confirm it by e-mail, or if the sender sent multiple confirmation
+replies.
 Possible values include:
 <br><br>
 "<code>bounce</code>"
@@ -829,26 +826,6 @@
 <br><br>
 Default is True (use execfile())
 <dt><hr>
-<a name="CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY"><h4>CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate already
-confirmed notices.  These are the notices returned to senders when
-they successfully confirm a message which has already been
-confirmed.  Their content is based on the
-confirm_accept_already_confirmed.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
-<a name="CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY"><h4>CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate already
-released notices.  These are the notices returned to senders when
-they successfully confirm a message which has already been released
-by tmda-pending or tmda-cgi.  Their content is based on the
-confirm_accept_already_released.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
 <a name="CONFIRM_ACCEPT_CC"><h4>CONFIRM_ACCEPT_CC</h4></a>
 <dd>
 An optional e-mail address which will be sent a copy of the
@@ -860,20 +837,12 @@
 <br><br>
 No default.
 <dt><hr>
-<a name="CONFIRM_ACCEPT_INITIAL_NOTIFY"><h4>CONFIRM_ACCEPT_INITIAL_NOTIFY</h4></a>
-<dd>
-Set this variable to False if you do not want to generate initial
-confirmation acceptance notices.  These are the notices returned to
-senders when they initially confirm their original message causing
-it to be delivered.  Their content is based on the
-confirm_accept_initial.txt template.
-<br><br>
-Default is True (turned on)
-<dt><hr>
 <a name="CONFIRM_ACCEPT_NOTIFY"><h4>CONFIRM_ACCEPT_NOTIFY</h4></a>
 <dd>
-Set this variable to False if you do not want to generate any confirmation
-acceptance notices at all.
+Set this variable to False if you do not want to generate any
+confirmation acceptance notices.  These are the notices returned to
+senders when they confirm their original message by e-mail.  Their
+content is based on the confirm_accept.txt template.
 <br><br>
 Default is True (turned on)
 <dt><hr>

Index: howto-template.ht
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/howto-template.ht,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- howto-template.ht	21 Feb 2004 01:09:21 -0000	1.11
+++ howto-template.ht	2 Mar 2004 02:26:43 -0000	1.12
@@ -42,25 +42,9 @@
 </tr>
 
 <tr>
-<td>confirm_accept_initial.txt
+<td>confirm_accept.txt
 </td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_INITIAL_NOTIFY">CONFIRM_ACCEPT_INITIAL_NOTIFY</a> 
-is set to True
-</td>
-</tr>
-
-<tr>
-<td>confirm_accept_already_confirmed.txt
-</td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY">CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</a> 
-is set to True
-</td>
-</tr>
-
-<tr>
-<td>confirm_accept_already_released.txt
-</td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY">CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</a> 
+<td>When <a href="config-vars.html#CONFIRM_ACCEPT_NOTIFY">CONFIRM_ACCEPT_NOTIFY</a> 
 is set to True
 </td>
 </tr>

Index: howto-template.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/howto-template.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- howto-template.html	21 Feb 2004 01:09:21 -0000	1.37
+++ howto-template.html	2 Mar 2004 02:26:43 -0000	1.38
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED.  DO NOT EDIT. -->
-<!-- Fri Feb 20 17:57:14 2004 -->
+<!-- Mon Mar  1 18:16:33 2004 -->
 <!-- USING HT2HTML 2.0 -->
 <!-- SEE http://ht2html.sf.net -->
 <!-- User-specified headers:
@@ -250,25 +250,9 @@
 </tr>
 
 <tr>
-<td>confirm_accept_initial.txt
+<td>confirm_accept.txt
 </td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_INITIAL_NOTIFY">CONFIRM_ACCEPT_INITIAL_NOTIFY</a> 
-is set to True
-</td>
-</tr>
-
-<tr>
-<td>confirm_accept_already_confirmed.txt
-</td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY">CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY</a> 
-is set to True
-</td>
-</tr>
-
-<tr>
-<td>confirm_accept_already_released.txt
-</td>
-<td>When <a href="config-vars.html#CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY">CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY</a> 
+<td>When <a href="config-vars.html#CONFIRM_ACCEPT_NOTIFY">CONFIRM_ACCEPT_NOTIFY</a> 
 is set to True
 </td>
 </tr>