Updated FAQ

FAQ.md

@@ -2765,7 +2765,7 @@ The following extra variables are available:
 * *to* (array)
 * *subject* (string)
 * *text* (string)
-* *hasAttachments* (boolean; deprecated, use function *attachments()*)
+* *hasAttachments* (boolean; deprecated, use function *attachments()* instead)
 
 The following extra operators are available:
 
@@ -2775,14 +2775,16 @@ The following extra operators are available:
 The following extra functions are available:
 
 * *header(name)* (returns an array of header values for the named header)
-* *blocklist()* (version 1.2176-1.2178; deprecated)
+* *blocklist()* (version 1.2176-1.2178; deprecated, use *onBlocklist()* instead)
 * *onBlocklist()* (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2179)
-* *hasMx()* (returns boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)
-* *attachments()* (returns integer indicating number of attachments; since version 1.2179)
+* *hasMx()* (returns a boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)
+* *attachments()* (returns an integer indicating number of attachments; since version 1.2179)
 
-Example condition:
+Example conditions:
 
-```header("X-Mailer") contains "Open-Xchange" && from matches ".*service@.*" && !hasAttachments```
+```header("X-Mailer") contains "Open-Xchange" && from matches ".*service@.*"```
+
+```!onBlocklist() && hasMx() && attachments() > 0```
 
 <br>
 

index.html

@@ -1506,7 +1506,7 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <li><em>to</em> (array)</li>
 <li><em>subject</em> (string)</li>
 <li><em>text</em> (string)</li>
-<li><em>hasAttachments</em> (boolean; deprecated, use function <em>attachments()</em>)</li>
+<li><em>hasAttachments</em> (boolean; deprecated, use function <em>attachments()</em> instead)</li>
 </ul>
 <p>The following extra operators are available:</p>
 <ul>
@@ -1516,13 +1516,14 @@ X-Google-Original-From: Somebody &lt;somebody+extra@example.org&gt;</code></pre>
 <p>The following extra functions are available:</p>
 <ul>
 <li><em>header(name)</em> (returns an array of header values for the named header)</li>
-<li><em>blocklist()</em> (version 1.2176-1.2178; deprecated)</li>
+<li><em>blocklist()</em> (version 1.2176-1.2178; deprecated, use <em>onBlocklist()</em> instead)</li>
 <li><em>onBlocklist()</em> (returns a boolean indicating if the sender/server is on a DNS blocklist; since version 1.2179)</li>
-<li><em>hasMx()</em> (returns boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)</li>
-<li><em>attachments()</em> (returns integer indicating number of attachments; since version 1.2179)</li>
+<li><em>hasMx()</em> (returns a boolean indicating if the from/reply-to address has an associated MX record; since version 1.2179)</li>
+<li><em>attachments()</em> (returns an integer indicating number of attachments; since version 1.2179)</li>
 </ul>
-<p>Example condition:</p>
-<p><code>header("X-Mailer") contains "Open-Xchange" &amp;&amp; from matches ".*service@.*" &amp;&amp; !hasAttachments</code></p>
+<p>Example conditions:</p>
+<p><code>header("X-Mailer") contains "Open-Xchange" &amp;&amp; from matches ".*service@.*"</code></p>
+<p><code>!onBlocklist() &amp;&amp; hasMx() &amp;&amp; attachments() &gt; 0</code></p>
 <p><br></p>
 <p><strong>Actions</strong></p>
 <p>You can select one of these actions to apply to matching messages:</p>