From efe28b8e4a6014b06f713e7f552e3d336e520fb3 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Wed, 17 Sep 2014 22:02:19 +0800
Subject: [PATCH] Review quarantining.clean.mail.md.

---
 .../quarantining.clean.mail.md                | 30 ++++++++++++-------
 html/index.html                               |  1 +
 index.md                                      |  1 +
 3 files changed, 21 insertions(+), 11 deletions(-)
 rename quarantining.clean.mail.md => 4-howto/quarantining.clean.mail.md (53%)

diff --git a/quarantining.clean.mail.md b/4-howto/quarantining.clean.mail.md
similarity index 53%
rename from quarantining.clean.mail.md
rename to 4-howto/quarantining.clean.mail.md
index d80bf89f..d299b64d 100644
--- a/quarantining.clean.mail.md
+++ b/4-howto/quarantining.clean.mail.md
@@ -1,20 +1,22 @@
-<http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Quarantining.Clean.Mail>
-#How to quarantining clean mail into SQL database for further approval
-If you want to quarantine clean mails into SQL database for further approval (with iRedAdmin-Pro or other tools), please try below steps:
+# How to quarantine clean mail into SQL database
+
+To quarantine clean mails into SQL database, please follow below steps:
 
 # Configure Amavisd to enable quarantining
 
 * Edit Amavisd config file, find below settings and update them. If it doesn't exist, just add them.
- * on Red Hat Enterprise Linux, CentOS, Scientific Linux, it's /etc/amavisd.conf or /etc/amavisd/amavisd.conf.
- * on Debian/Ubuntu, it's /etc/amavis/conf.d/50-user
- * on FreeBSD, it's /usr/local/etc/amavisd.conf
- * on OpenBSD, it's /etc/amavisd.conf
+    * on Red Hat Enterprise Linux, CentOS, Scientific Linux, it's `/etc/amavisd/amavisd.conf`.
+    * on Debian/Ubuntu, it's `/etc/amavis/conf.d/50-user`.
+    * on FreeBSD, it's `/usr/local/etc/amavisd.conf`.
+    * on OpenBSD, it's `/etc/amavisd.conf`.
+
 <pre>
 $clean_quarantine_method = 'sql:';
 $clean_quarantine_to = 'clean-quarantine';
 </pre>
 
 * Find policy bank 'MYUSERS', append two lines in this policy bank:
+
 <pre>
 $policy_bank{'MYUSERS'} = {
     ...
@@ -24,14 +26,20 @@ $policy_bank{'MYUSERS'} = {
 </pre>
 
 * Make sure you have '@storage_sql_dsn' enabled. For example:
+
 <pre>
 @storage_sql_dsn = (
     ['DBI:mysql:database=amavisd;host=127.0.0.1;port=3306', 'amavisd', 'qAv9CYva0vHA1GCX0J9f23WJvqRzt7'],
-);</pre>
-* Restart Amavisd service.
-<br>That's all. Now all clean emails sent by your mail users will be quarantined into SQL database. if you have iRedAdmin-Pro, you can manage (release or delete) quarantined emails with it.
+);
+</pre>
 
-# Screenshot of iRedAdmin-Pro for your reference 
+* Restart Amavisd service.
+
+That's all. Now all clean emails sent by your mail users will be quarantined
+into SQL database. if you have iRedAdmin-Pro, you can manage (release or delete)
+quarantined emails with it.
+
+* Screenshot of iRedAdmin-Pro for your reference 
 
 * [View quarantined mails](http://www.iredmail.org/images/iredadmin/system_maillog_quarantined.png)
 * [Expand quarantined mail to view mail headers and body](http://www.iredmail.org/images/iredadmin/system_maillog_quarantined_expanded.png) 
diff --git a/html/index.html b/html/index.html
index 04d77d8a..7b91d7e6 100644
--- a/html/index.html
+++ b/html/index.html
@@ -20,6 +20,7 @@
 <li><a href="howto/howto.configure.thunderbird.for.iredmail.html"> Configure Thunderbird as mail client (IMAP, SMTP and global ldap address book)</a></li>
 <li><a href="howto/howto.enable.smtps.service.html"> How to enable SMTPS service (SMTP over SSL, port 465)</a></li>
 <li><a href="howto/pipe.incoming.email.for.certain.user.to.external.script.html"> How to pipe incoming email for certain user to external script </a></li>
+<li><a href="howto/quarantining.clean.mail.html"> How to quarantine clean mail into SQL database</a></li>
 <li><a href="howto/recalculate.mailbox.quota.html"> How to force Dovecot to recalculate mailbox quota
 </a></li>
 <li><a href="howto/store.spamassassin.bayes.in.sql.html"> How to store spamassassin bayes in SQL</a></li>
diff --git a/index.md b/index.md
index b06fc90b..cf7e0deb 100644
--- a/index.md
+++ b/index.md
@@ -9,6 +9,7 @@
 * [ Configure Thunderbird as mail client (IMAP, SMTP and global ldap address book)](howto/howto.configure.thunderbird.for.iredmail.html)
 * [ How to enable SMTPS service (SMTP over SSL, port 465)](howto/howto.enable.smtps.service.html)
 * [ How to pipe incoming email for certain user to external script ](howto/pipe.incoming.email.for.certain.user.to.external.script.html)
+* [ How to quarantine clean mail into SQL database](howto/quarantining.clean.mail.html)
 * [ How to force Dovecot to recalculate mailbox quota
](howto/recalculate.mailbox.quota.html)
 * [ How to store spamassassin bayes in SQL](howto/store.spamassassin.bayes.in.sql.html)
 * [ How to perform silent/unattended iRedMail installation](howto/unattended.iredmail.installation.html)