From 55a82ef7b22296eb1c3b46efbca02ae4ab103a52 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Mon, 14 Dec 2015 23:36:29 +0800 Subject: [PATCH] Sync. --- en_US/howto/0-performance.tuning.md | 4 ++-- en_US/overview/0-used.components.md | 12 +++++------ .../upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md | 20 +++++++++++++++++++ en_US/upgrade/1-iredmail.releases.md | 4 +++- html/css/markdown.css | 5 +++-- html/iredmail.releases.html | 12 ++++++++++- html/performance.tuning.html | 4 ++-- html/upgrade.iredmail.0.9.2-0.9.3.html | 20 +++++++++++++++++++ html/used.components.html | 12 +++++------ 9 files changed, 73 insertions(+), 20 deletions(-) diff --git a/en_US/howto/0-performance.tuning.md b/en_US/howto/0-performance.tuning.md index 1e8b04d2..a799b4bc 100644 --- a/en_US/howto/0-performance.tuning.md +++ b/en_US/howto/0-performance.tuning.md @@ -7,8 +7,8 @@ you can follow below suggestions for better performance. ### Setup a DNS server in LAN or localhost to cache DNS queries -Mail services heavily rely on DNS service and perform many many DNS queries, -a cache DNS server in LAN or localhost helps a lot: +Mail services __heavily__ rely on DNS service and perform many many DNS queries, +a cache DNS server in LAN or localhost helps __A LOT__: * It speeds up DNS queries. This helps a lot. * It reduces DNS queries to DNSBL servers, so that you can continue using their diff --git a/en_US/overview/0-used.components.md b/en_US/overview/0-used.components.md index 0e544411..898fb46e 100644 --- a/en_US/overview/0-used.components.md +++ b/en_US/overview/0-used.components.md @@ -64,12 +64,6 @@ - -iRedAPD -A very simple postfix policy server developed by iRedMail team -grep '__version__' /opt/iredapd/libs/__init__.py - - Roundcube Webmail (PHP) @@ -94,6 +88,12 @@ + +iRedAPD +A very simple postfix policy server developed by iRedMail team +grep '__version__' /opt/iredapd/libs/__init__.py + + diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md index fe1a4003..45547aee 100644 --- a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md +++ b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md @@ -6,6 +6,7 @@ > We offer remote upgrade service, check [the price](../support.html) and [contact us](../contact.html). +* 2015-12-14: New section: `Migrate from Cluebringer to iRedAPD`. * 2015-12-14: Fix duplicate folder name in section `Dovecot-2.2: Add more special folders as alias folders`. * 2015-12-14: Initial release. @@ -23,6 +24,12 @@ so that you can know which version of iRedMail you're running. For example: 0.9.3 ``` +### Upgrade iRedAdmin (open source edition) to the latest stable release + +Please follow this tutorial to upgrade iRedAdmin open source edition to the +latest stable release: +[Upgrade iRedAdmin to the latest stable release](./migrate.or.upgrade.iredadmin.html) + ### Upgrade iRedAPD (Postfix policy server) to the latest 1.7.0 Please follow below tutorial to upgrade iRedAPD to the latest stable release: @@ -30,6 +37,19 @@ Please follow below tutorial to upgrade iRedAPD to the latest stable release: Detailed release notes are available [here](./iredapd.releases.html). +### Migrate from Cluebringer to iRedAPD + +In iRedMail-0.9.3, Cluebringer has been removed and replaced by iRedAPD. +Cluebringer is not under active development and no new release since 2013 (the +latest stable release doesn't support IPv6). iRedAPD offers greylisting and +throttling supports, please follow tutorial below to migrate greylisting and +throttling settings from Cluebringer to iRedAPD: + +* [Migrate from Cluebringer to iRedAPD](./cluebringer.to.iredapd.html) + +> Note: We also plan to completely remove code of Policyd/Cluebringer support +> in next iRedAdmin-Pro release. + ### Upgrade Roundcube webmail to the latest stable release Please follow Roundcube official tutorial to upgrade Roundcube webmail to the diff --git a/en_US/upgrade/1-iredmail.releases.md b/en_US/upgrade/1-iredmail.releases.md index 3825dbdc..c859b3c4 100644 --- a/en_US/upgrade/1-iredmail.releases.md +++ b/en_US/upgrade/1-iredmail.releases.md @@ -1,5 +1,7 @@ # iRedMail release notes and upgrade tutorials +[TOC] + > iRedMail source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredmail/overview). > Download the [latest iRedMail stable release](../download.html). @@ -10,7 +12,7 @@ * If you plan to migrate to a new iRedMail server someday, migrating iRedMail to another server which runs the same release is the easiest path. -### How upgrading iRedMail works +### How upgrading works * Usually, upgrading iRedMail is just updating some config files to achieve new features or fix bugs, you do __NOT__ need to download the latest iRedMail and diff --git a/html/css/markdown.css b/html/css/markdown.css index 5fd17848..19df47a5 100644 --- a/html/css/markdown.css +++ b/html/css/markdown.css @@ -245,6 +245,9 @@ button::-moz-focus-inner { border: 0; } +/* Customizations */ +h2, h3, h4, h5 { padding-top: 20px; } + pre, code { background: #f5f5f5; border: 1px solid #ccc; @@ -305,5 +308,3 @@ th { font-style: bold; text-align: left; } /* code.bash { background-color: green; color: white; } */ - -blockquote ul { padding-left: 5px; } diff --git a/html/iredmail.releases.html b/html/iredmail.releases.html index 509fa156..d20e4b49 100644 --- a/html/iredmail.releases.html +++ b/html/iredmail.releases.html @@ -11,6 +11,16 @@ // Document Index

iRedMail release notes and upgrade tutorials

+
+ +

iRedMail source code is hosted on BitBucket.

Download the latest iRedMail stable release.

@@ -21,7 +31,7 @@
  • If you plan to migrate to a new iRedMail server someday, migrating iRedMail to another server which runs the same release is the easiest path.
    • -

    How upgrading iRedMail works

    +

    How upgrading works

    @@ -80,10 +83,27 @@ so that you can know which version of iRedMail you're running. For example:

    0.9.3 +

    Upgrade iRedAdmin (open source edition) to the latest stable release

    +

    Please follow this tutorial to upgrade iRedAdmin open source edition to the +latest stable release: +Upgrade iRedAdmin to the latest stable release

    Upgrade iRedAPD (Postfix policy server) to the latest 1.7.0

    Please follow below tutorial to upgrade iRedAPD to the latest stable release: Upgrade iRedAPD to the latest stable release

    Detailed release notes are available here.

    +

    Migrate from Cluebringer to iRedAPD

    +

    In iRedMail-0.9.3, Cluebringer has been removed and replaced by iRedAPD. +Cluebringer is not under active development and no new release since 2013 (the +latest stable release doesn't support IPv6). iRedAPD offers greylisting and +throttling supports, please follow tutorial below to migrate greylisting and +throttling settings from Cluebringer to iRedAPD:

    + +
    +

    Note: We also plan to completely remove code of Policyd/Cluebringer support +in next iRedAdmin-Pro release.

    +

    Upgrade Roundcube webmail to the latest stable release

    Please follow Roundcube official tutorial to upgrade Roundcube webmail to the latest stable release immediately: How to upgrade Roundcube

    diff --git a/html/used.components.html b/html/used.components.html index 8fa1cbdf..bc81aa6b 100644 --- a/html/used.components.html +++ b/html/used.components.html @@ -75,12 +75,6 @@ - -iRedAPD -A very simple postfix policy server developed by iRedMail team -grep '__version__' /opt/iredapd/libs/__init__.py - - Roundcube Webmail (PHP) @@ -105,6 +99,12 @@ + +iRedAPD +A very simple postfix policy server developed by iRedMail team +grep '__version__' /opt/iredapd/libs/__init__.py + +