From 52342be6aac75d78dfc975ccc807ec7841ac77df Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Fri, 10 Oct 2014 23:56:19 +0800
Subject: [PATCH] Typo in quarantining.html.
---
README.md | 42 +++++++++++++++++++++++++++++++++++++++++
howto/1-quarantining.md | 6 +++---
html/quarantining.html | 12 ++++++------
3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 9f8223cb..f2608b9c 100644
--- a/README.md
+++ b/README.md
@@ -967,3 +967,45 @@ We're working on migrating [old wiki documents](http://www.iredmail.org/wiki) to
* [Turn on debug mode in OpenLDAP](https://bitbucket.org/zhb/docs.iredmail.org/src/default/troubleshooting/turn.on.debug.mode.in.openldap.md)
# Frequently Asked Questions
* [Why append timestamp in maildir path](https://bitbucket.org/zhb/docs.iredmail.org/src/default/faq/why.append.timestamp.in.maildir.path.md)
+# Install iRedMail
+* [Install iRedMail on Red Hat Enterprise Linux, CentOS](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/install.iredmail.on.rhel.md)
+* [Setup DNS records for your iRedMail server](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/setup_dns.md)
+* [Perform silent/unattended iRedMail installation](https://bitbucket.org/zhb/docs.iredmail.org/src/default/installation/unattended.iredmail.installation.md)
+# How to
+* [Change mail attachment size](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/0-change.mail.attachment.size.md)
+* [Completely disable Amavisd + ClamAV + SpamAssassin](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/0-completely.disable.amavisd.clamav.spamassassin.md)
+* [Enable SMTPS service (SMTP over SSL, port 465)](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/0-enable.smtps.md)
+* [Amavisd + SpamAssassin not working, no mail header (X-Spam-*) inserted.](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/1-amavisd.no.x-spam.headers.md)
+* [Disable spam virus scanning for outgoing mails](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/1-disable.spam.virus.scanning.for.outgoing.mails.md)
+* [Quarantining](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/1-quarantining.md)
+* [Allow insecure POP3/IMAP/SMTP connections without STARTTLS](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/2-allow.insecure.pop3.imap.smtp.connections.md)
+* [Allow user to send email without authentication](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/allow.user.to.send.email.without.authentication.md)
+* [Configure Thunderbird as mail client (POP3/IMAP, SMTP and global ldap address book)](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/configure.thunderbird.md)
+* [Force mail user to change password in 90 days](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/force.user.to.change.password.md)
+* [Ignore Trash folder in mailbox quota](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/ignore.trash.folder.in.quota.md)
+* [LDAP: Add an alias domain](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/ldap.add.alias.domain.md)
+* [LDAP: Add a mail alias account](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/ldap.add.mail.alias.md)
+* [LDAP: Add a mail list account](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/ldap.add.mail.list.md)
+* [LDAP: User mail forwarding.](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/ldap.user.mail.forwarding.md)
+* [Monitor incoming and outgoing mails with BCC](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/monitor.incoming.and.outgoing.mails.with.bcc.md)
+* [Pipe incoming email for certain user to external script ](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/pipe.incoming.email.for.certain.user.to.external.script.md)
+* [Force Dovecot to recalculate mailbox quota](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/recalculate.mailbox.quota.md)
+* [SQL: Create an mail alias account with SQL command line](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/sql.create.mail.alias.md)
+* [Store SpamAssassin bayes in SQL](https://bitbucket.org/zhb/docs.iredmail.org/src/default/howto/store.spamassassin.bayes.in.sql.md)
+# Third-party integrations
+* [Integrate Microsoft Active Directory in iRedMail](https://bitbucket.org/zhb/docs.iredmail.org/src/default/integrations/active.directory.md)
+* [SOGo: install SOGo on CentOS 6 with iRedMail (MySQL backend)](https://bitbucket.org/zhb/docs.iredmail.org/src/default/integrations/sogo-centos-6-mysql.md)
+* [Enabling Apache Solr 4.10 (using jetty) with Dovecot 2.2 for fulltext search results on Centos 6 (iRedMail compatible)](https://extremeshok.com/6622/enabling-apache-solr-4-10-using-jetty-with-dovecot-2-2-for-fulltext-search-results-on-centos-6-iredmail-compatible/)
+# Cluster
+* [An Ultra-HA, full Mult-Master E-mail cluster with iRedMail, MariaDB, and IPVS](http://pastebin.com/JcYeQBrX), contributed by Joshua Boniface.
+# Migrations
+* [Migrate iRedAdmin open source edition to iRedAdmin-Pro](https://bitbucket.org/zhb/docs.iredmail.org/src/default/migrations/migrate.or.upgrade.iredadmin.md)
+* [Migrate old iRedMail server to the latest stable release](https://bitbucket.org/zhb/docs.iredmail.org/src/default/migrations/migrate.to.new.iredmail.server.md)
+* [Password hashes](https://bitbucket.org/zhb/docs.iredmail.org/src/default/migrations/password.hashes.md)
+# Troubleshooting and Debug
+* [Turn on debug mode in Amavisd](https://bitbucket.org/zhb/docs.iredmail.org/src/default/troubleshooting/turn.on.debug.mode.in.amavisd.md)
+* [Turn on debug mode in Cluebringer](https://bitbucket.org/zhb/docs.iredmail.org/src/default/troubleshooting/turn.on.debug.mode.in.cluebringer.md)
+* [Turn on debug mode in Dovecot](https://bitbucket.org/zhb/docs.iredmail.org/src/default/troubleshooting/turn.on.debug.mode.in.dovecot.md)
+* [Turn on debug mode in OpenLDAP](https://bitbucket.org/zhb/docs.iredmail.org/src/default/troubleshooting/turn.on.debug.mode.in.openldap.md)
+# Frequently Asked Questions
+* [Why append timestamp in maildir path](https://bitbucket.org/zhb/docs.iredmail.org/src/default/faq/why.append.timestamp.in.maildir.path.md)
diff --git a/howto/1-quarantining.md b/howto/1-quarantining.md
index 9875a80c..a7508647 100644
--- a/howto/1-quarantining.md
+++ b/howto/1-quarantining.md
@@ -100,14 +100,14 @@ Screenshots attached at the bottom.
If you want to quarantine clean emails into SQL database for further approval
or whatever reason, please follow below steps:
-1. Update below parameters in Amavisd config file `amavisd.conf`:
+* Update below parameters in Amavisd config file `amavisd.conf`:
```perl
$clean_quarantine_method = 'sql:';
$clean_quarantine_to = 'clean-quarantine';
```
-2. Find policy bank `MYUSERS`, append two lines in this policy bank:
+* Find policy bank `MYUSERS`, append two lines in this policy bank:
```perl
$policy_bank{'MYUSERS'} = {
@@ -117,7 +117,7 @@ $policy_bank{'MYUSERS'} = {
}
```
-3. Restart Amavisd service.
+* Restart Amavisd service.
Now all clean emails sent by your mail users will be quarantined into SQL
database.
diff --git a/html/quarantining.html b/html/quarantining.html
index b1a34022..c5ef3bcf 100644
--- a/html/quarantining.html
+++ b/html/quarantining.html
@@ -107,16 +107,16 @@ or delete them.
Quarantine clean emails
If you want to quarantine clean emails into SQL database for further approval
or whatever reason, please follow below steps:
-
+
- Update below parameters in Amavisd config file
amavisd.conf
:
-
+
$clean_quarantine_method = 'sql:';
$clean_quarantine_to = 'clean-quarantine';
-
+
- Find policy bank
MYUSERS
, append two lines in this policy bank:
-
+
$policy_bank{'MYUSERS'} = {
...
clean_quarantine_method => 'sql:',
@@ -124,9 +124,9 @@ $clean_quarantine_to = 'clean-quarantine';
}
-
+
- Restart Amavisd service.
-
+
Now all clean emails sent by your mail users will be quarantined into SQL
database.
Screenshots