diff --git a/doc/changes.ht b/doc/changes.ht
index 8556763..679a15c 100644
--- a/doc/changes.ht
+++ b/doc/changes.ht
@@ -14,7 +14,7 @@ by Barry Warsaw. The mascot
is by Christian Hafner,
or maybe his wife. I chose Maxwell's daemon because it tirelessly
and invisibly sorts molecules, just as milters sort mail.
-Cristian has also provided a fun
+Christian has also provided a fun
simulation that lets you try your hand at sorting molecules.
diff --git a/doc/faq.ht b/doc/faq.ht
index 9b888b3..c07267c 100644
--- a/doc/faq.ht
+++ b/doc/faq.ht
@@ -99,13 +99,14 @@ If you are running bms.py, then the block_chinese option in
Q. Why does sendmail coredump with milters on OpenBSD?
A. Sendmail has a problem with unix sockets on old versions of OpenBSD.
-Use an internet domain socket instead. For example, in
+OpenBSD users report that this problem has been fixed, so upgrading
+OpenBSD will fix this. Otherwise, you can
+use an internet domain socket instead. For example, in
sendmail.cf use
Xpythonfilter, S=inet:1234@localhost
and change sample.py accordingly.
- OpenBSD users report that this problem has been fixed.
Q. How can I change the bounce message for an invalid recipient?
@@ -139,10 +140,15 @@ Xpythonfilter, S=local:/var/log/milter/pythonsock, F=T, T=C:5m;S:20s;R:60s;E:5m
Q. There is a Python traceback in the log file! What happened to
my email?
- A. When the milter fails with an untrapped exception, a TEMPFAIL
-result (451) is returned to the sender. The sender will then retry every
-hour or so for several days. Hopefully, someone will notice the
-traceback, and workaround or fix the problem.
+
A. By default, when the milter fails with an untrapped exception, a
+TEMPFAIL result (451) is returned to the sender. The sender will then retry
+every hour or so for several days. Hopefully, someone will notice the
+traceback, and workaround or fix the problem. Beginning with milter-0.8.2,
+you can call milter.set_exception_policy(milter.CONTINUE)
+to cause an untrapped exception to continue processing with the
+next callback or milter instead. For
+completeness, you can also set the exception policy to
+milter.REJECT.
Q. I read some notes such as "Check valid domains allowed by internal
senders to detect PCs infected with spam trojans." but could not
diff --git a/doc/logmsgs.ht b/doc/logmsgs.ht
index f7e1a6c..19c9fb3 100644
--- a/doc/logmsgs.ht
+++ b/doc/logmsgs.ht
@@ -5,7 +5,8 @@ DT { font-weight: bolder; padding-top: 1em }
Milter Log Documentation
-The milter log has a variety of "tags" in it that indicate what it did.
+The milter log from the bms.py application has a variety of "tags" in it that
+indicate what it did.
- DSPAM: honeypot SCREENED
diff --git a/doc/policy.ht b/doc/policy.ht
index 95c905b..c559cb1 100644
--- a/doc/policy.ht
+++ b/doc/policy.ht
@@ -2,6 +2,11 @@ Title: Python Milter Mail Policy
Python Milter Mail Policy
+These are the policies implemented by the bms.py milter
+application. The milter and Milter modules do not implement any policies
+by themselves. Eventually, I'll get the bms.py milter moved to its
+own package.
+
Classify connection
When the SMTP client connects, the connection IP address is
diff --git a/doc/requirements.ht b/doc/requirements.ht
index c97fca0..62c5ec8 100644
--- a/doc/requirements.ht
+++ b/doc/requirements.ht
@@ -7,13 +7,13 @@ Title: Requirements
want to use python 2.0 or better. The python code uses a number of
python 2 features. The email support requires python 2.4.
- Python must be configured with thread support. This is because
-sendmail's libmilter requires thread support.
+pymilter uses sendmail's libmilter which requires thread support.
- You must compile sendmail with libmilter enabled. In versions of
sendmail prior to 8.12 libmilter is marked FFR (For Future Release) and
is not installed by default.
Sendmail 8.12 still does not enable libmilter by default. You must
explicitly select the "MILTER" option when compiling.
-
- Python milter has been tested against sendmail-8.11 and sendmail-8.12.
+
- Python milter has been tested against sendmail-8.11 through sendmail-8.13.
- Python milter must be compiled for the specific version of sendmail
it will run with. (Since the result is dynamically loaded, there could
conceivably be multiple versions available and selected at startup - but