From 7896a2f6b08f2eb35f63cff7c77c92d340884533 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Wed, 7 Jan 2015 21:35:53 +0800
Subject: [PATCH] Recommend to use iRedAPD plugin 'reject_null_sender' as first
 plugin, and 'reject_sender_login_mismatch' as second one.

---
 html/upgrade.iredmail.0.8.7-0.9.0.html    | 10 +++++++---
 upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/html/upgrade.iredmail.0.8.7-0.9.0.html b/html/upgrade.iredmail.0.8.7-0.9.0.html
index 0df82585..77dd8b26 100644
--- a/html/upgrade.iredmail.0.8.7-0.9.0.html
+++ b/html/upgrade.iredmail.0.8.7-0.9.0.html
@@ -93,7 +93,8 @@ latest stable release immediately: <a href="http://trac.roundcube.net/wiki/Howto
 <li>in iRedMail-0.9.0 and future iRedMail releases, we will use white/blacklists
   stored in Amavisd database in Amavisd (after-queue) and iRedAPD (before-queue),
   so you must enable iRedAPD plugin <code>amavisd_wblist</code>.</li>
-<li>it's strongly recommended to enable plugin <code>reject_null_sender</code> to prevent spam.</li>
+<li>it's strongly recommended to enable plugin <code>reject_null_sender</code> (as first
+  plugin listed in iRedAPD parameter <code>plugins =</code>) to prevent spam.</li>
 </ul>
 <p>iRedAPD-1.4.4 fixes several issues and brings some new features:</p>
 <ul>
@@ -104,8 +105,10 @@ latest stable release immediately: <a href="http://trac.roundcube.net/wiki/Howto
 <li>
 <p>New plugins:</p>
 <ul>
-<li><code>reject_null_sender</code>: prevent authenticated user to send spam as null
-  sender (<code>from=&lt;&gt;</code> in Postfix log file).</li>
+<li>
+<p><code>reject_null_sender</code>: prevent authenticated user to send spam as null
+  sender (<code>from=&lt;&gt;</code> in Postfix log file).</p>
+</li>
 <li>
 <p><code>amavisd_wblist</code>: it uses per-recipient white/blacklists stored in
   Amavisd SQL database to reject emails sent from blacklisted senders and
@@ -125,6 +128,7 @@ or per-user setting. Priority: per-user &gt; per-domain &gt; global.</p>
   own alias addresses by default. You can still set
   <code>ALLOWED_LOGIN_MISMATCH_STRICTLY = False</code> in iRedAPD config file
   (<code>/opt/iredapd/settings.py</code>) to allow user to send as any sender if you want.</p>
+<p>It's recommended to enable this plugin right after plugin <code>reject_null_sender</code>.</p>
 </li>
 </ul>
 <p>Important note: If you want to manage white/blacklists with iRedAdmin-Pro,
diff --git a/upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md b/upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md
index ee421aad..26323663 100644
--- a/upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md
+++ b/upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md
@@ -49,7 +49,8 @@ Important notes:
 * in iRedMail-0.9.0 and future iRedMail releases, we will use white/blacklists
   stored in Amavisd database in Amavisd (after-queue) and iRedAPD (before-queue),
   so you must enable iRedAPD plugin `amavisd_wblist`.
-* it's strongly recommended to enable plugin `reject_null_sender` to prevent spam.
+* it's strongly recommended to enable plugin `reject_null_sender` (as first
+  plugin listed in iRedAPD parameter `plugins =`) to prevent spam.
 
 iRedAPD-1.4.4 fixes several issues and brings some new features:
 
@@ -59,6 +60,7 @@ iRedAPD-1.4.4 fixes several issues and brings some new features:
 * New plugins:
     * `reject_null_sender`: prevent authenticated user to send spam as null
       sender (`from=<>` in Postfix log file).
+
     * `amavisd_wblist`: it uses per-recipient white/blacklists stored in
       Amavisd SQL database to reject emails sent from blacklisted senders and
       bypass whitelisted senders.
@@ -76,6 +78,8 @@ iRedAPD-1.4.4 fixes several issues and brings some new features:
   `ALLOWED_LOGIN_MISMATCH_STRICTLY = False` in iRedAPD config file
   (`/opt/iredapd/settings.py`) to allow user to send as any sender if you want.
 
+    It's recommended to enable this plugin right after plugin `reject_null_sender`.
+
 Important note: If you want to manage white/blacklists with iRedAdmin-Pro,
 you have to enable plugin `amavisd_wblist`.