Merging upstream version 3.9.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 25 insertions, 34 deletions

diff --git a/html/header_checks.5.html b/html/header_checks.5.html
index 6bb114a..c1c8b17 100644
--- a/html/header_checks.5.html
+++ b/html/header_checks.5.html
@@ -392,40 +392,31 @@ HEADER_CHECKS(5)                                              HEADER_CHECKS(5)
        <b>Return-Path:</b>.
 
 <b>CONFIGURATION PARAMETERS</b>
-       <b><a href="postconf.5.html#body_checks">body_checks</a></b>
-              Lookup  tables with content filter rules for message body lines.
-              These filters see one physical line at a time, in chunks  of  at
-              most <b>$<a href="postconf.5.html#line_length_limit">line_length_limit</a></b> bytes.
-
-       <b><a href="postconf.5.html#body_checks_size_limit">body_checks_size_limit</a></b>
-              The amount of content per message body segment (attachment) that
-              is subjected to <b>$<a href="postconf.5.html#body_checks">body_checks</a></b> filtering.
-
-       <b><a href="postconf.5.html#header_checks">header_checks</a></b>
-
-       <b><a href="postconf.5.html#mime_header_checks">mime_header_checks</a></b> (default: <b>$<a href="postconf.5.html#header_checks">header_checks</a></b>)
-
-       <b><a href="postconf.5.html#nested_header_checks">nested_header_checks</a></b> (default: <b>$<a href="postconf.5.html#header_checks">header_checks</a></b>)
-              Lookup tables with  content  filter  rules  for  message  header
-              lines:  respectively,  these  are applied to the initial message
-              headers (not including MIME headers), to the MIME  headers  any-
-              where  in  the  message,  and to the initial headers of attached
-              messages.
-
-              Note: these filters see one logical message header  at  a  time,
-              even when a message header spans multiple lines. Message headers
-              that are longer than  <b>$<a href="postconf.5.html#header_size_limit">header_size_limit</a></b>  characters  are  trun-
-              cated.
-
-       <b><a href="postconf.5.html#disable_mime_input_processing">disable_mime_input_processing</a></b>
-              While  receiving mail, give no special treatment to MIME related
-              message headers; all text after the initial message  headers  is
-              considered  to  be  part  of  the  message body. This means that
-              <b><a href="postconf.5.html#header_checks">header_checks</a></b> is applied to all the initial message headers, and
-              that <b><a href="postconf.5.html#body_checks">body_checks</a></b> is applied to the remainder of the message.
-
-              Note:  when  used  in  this  manner,  <b><a href="postconf.5.html#body_checks">body_checks</a></b> will process a
-              multi-line message header one line at a time.
+       <b><a href="postconf.5.html#body_checks">body_checks</a> (empty)</b>
+              Optional  lookup  tables  for content inspection as specified in
+              the <a href="header_checks.5.html"><b>body_checks</b>(5)</a> manual page.
+
+       <b><a href="postconf.5.html#body_checks_size_limit">body_checks_size_limit</a> (51200)</b>
+              How much text in a message body segment (or attachment,  if  you
+              prefer to use that term) is subjected to <a href="postconf.5.html#body_checks">body_checks</a> inspection.
+
+       <b><a href="postconf.5.html#header_checks">header_checks</a> (empty)</b>
+              Optional  lookup  tables  for  content  inspection  of   primary
+              non-MIME  message  headers, as specified in the <a href="header_checks.5.html"><b>header_checks</b>(5)</a>
+              manual page.
+
+       <b><a href="postconf.5.html#mime_header_checks">mime_header_checks</a> ($<a href="postconf.5.html#header_checks">header_checks</a>)</b>
+              Optional lookup tables for content inspection  of  MIME  related
+              message  headers,  as  described  in the <a href="header_checks.5.html"><b>header_checks</b>(5)</a> manual
+              page.
+
+       <b><a href="postconf.5.html#nested_header_checks">nested_header_checks</a> ($<a href="postconf.5.html#header_checks">header_checks</a>)</b>
+              Optional lookup tables for content inspection of  non-MIME  mes-
+              sage   headers   in  attached  messages,  as  described  in  the
+              <a href="header_checks.5.html"><b>header_checks</b>(5)</a> manual page.
+
+       <b><a href="postconf.5.html#disable_mime_input_processing">disable_mime_input_processing</a> (no)</b>
+              Turn off MIME processing while receiving mail.
 
 <b>EXAMPLES</b>
        Header pattern to block attachments with bad file name extensions.  For