From 901ba598d5ad5e606d5f05cab0181c6cd903b400 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Wed, 3 Dec 2014 22:51:42 +0800
Subject: [PATCH] Typo.

---
 html/migrate.or.upgrade.iredadmin.html     |  5 ++--
 html/upgrade.iredmail.0.8.6-0.8.7.html     | 35 ++++++++++++++--------
 html/upgrade.iredmail.0.8.7-0.9.0.html     |  6 +++-
 migrations/migrate.or.upgrade.iredadmin.md |  5 ++--
 upgrade/upgrade.iredmail.0.8.6-0.8.7.md    | 23 +++++++-------
 upgrade/upgrade.iredmail.0.8.7-0.9.0.md    |  6 +++-
 6 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/html/migrate.or.upgrade.iredadmin.html b/html/migrate.or.upgrade.iredadmin.html
index 6083f5b9..4169c212 100644
--- a/html/migrate.or.upgrade.iredadmin.html
+++ b/html/migrate.or.upgrade.iredadmin.html
@@ -21,8 +21,9 @@
 </li>
 </ul>
 </div>
-<p>This tutorial describes how to migrate iRedAdmin open source edition or old
-iRedAdmin-Pro release to the latest iRedAdmin-Pro (full-featured edition).</p>
+<p>This tutorial describes how to update or migrate iRedAdmin (either open source
+edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again,
+either open source edition or iRedAdmin-Pro).</p>
 <h2 id="requirements">Requirements</h2>
 <ul>
 <li>You <strong>MUST</strong> have iRedAdmin open source edition or old iRedAdmin-Pro release
diff --git a/html/upgrade.iredmail.0.8.6-0.8.7.html b/html/upgrade.iredmail.0.8.6-0.8.7.html
index 15804524..8512cf90 100644
--- a/html/upgrade.iredmail.0.8.6-0.8.7.html
+++ b/html/upgrade.iredmail.0.8.6-0.8.7.html
@@ -45,9 +45,10 @@ so that you can know which version of iRedMail you're running. For example:</p>
 latest stable release immediately: <a href="http://trac.roundcube.net/wiki/Howto_Upgrade">How to upgrade Roundcube</a></p>
 <h3 id="upgrade-iredapd-postfix-policy-server-to-the-latest-143">Upgrade iRedAPD (Postfix policy server) to the latest 1.4.3</h3>
 <p>Please follow below tutorial to upgrade iRedAPD to the latest stable release:
-* <a href="http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD">How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.3</a></p>
-<h3 id="upgrade-iredadmin-open-source-edition-to-the-latest-033">Upgrade iRedAdmin (open source edition) to the latest 0.3.3</h3>
-<p>Please follow this tutorial to upgrade iRedAdmin open source edition to the latest stable release: [[IRedMail/FAQ/Upgrade.iRedAdmin.Open.Source.Edition |How to upgrade iRedAdmin (open source edition) to the latest stable release]]</p>
+<a href="http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD">How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.3</a></p>
+<h3 id="upgrade-iredadmin-open-source-edition-to-the-latest-stable-release">Upgrade iRedAdmin (open source edition) to the latest stable release</h3>
+<p>Please follow this tutorial to upgrade iRedAdmin open source edition to the
+latest stable release: <a href="./migrate.or.upgrade.iredadmin.html">Upgrade iRedAdmin to the latest stable release</a></p>
 <h3 id="upgrade-phpmyadmin-to-the-latest-stable-release">Upgrade phpMyAdmin to the latest stable release</h3>
 <p>Please follow this short tutorial to upgrade phpMyAdmin to the latest stable
 release: http://docs.phpmyadmin.net/en/latest/setup.html#upgrading-from-an-older-version</p>
@@ -67,11 +68,13 @@ Postfix service.</p>
 </code></pre>
 
 <p>After this change, you have to update Roundcube config file to use SMTP service
-over TLS. For example:
-<em> On RHEL/CentOS, it's /var/www/roundcubemail/config/main.inc.php (or config.inc.php)
-</em> On Debian/Ubuntu, it's /usr/share/apache2/roundcubemail/config/main.inc.php (or config.inc.php)
-<em> On FreeBSD, it's /usr/local/www/roundcubemail/config/main.inc.php (or config.inc.php)
-</em> On OpenBSD, it's /var/www/roundcubemail/config/main.inc.php (or config.inc.php)</p>
+over TLS. For example:</p>
+<ul>
+<li>On RHEL/CentOS, it's <code>/var/www/roundcubemail/config/main.inc.php</code> (or <code>config.inc.php</code>)</li>
+<li>On Debian/Ubuntu, it's <code>/usr/share/apache2/roundcubemail/config/main.inc.php</code> (or <code>config.inc.php</code>)</li>
+<li>On FreeBSD, it's <code>/usr/local/www/roundcubemail/config/main.inc.php</code> (or <code>config.inc.php</code>)</li>
+<li>On OpenBSD, it's <code>/var/www/roundcubemail/config/main.inc.php</code> (or <code>config.inc.php</code>)</li>
+</ul>
 <pre><code># Part of Roundcube config file: config.inc.php
 
 // OLD settings
@@ -175,20 +178,28 @@ protocol lmtp {
 </code></pre>
 
 <ul>
-<li>Enable logrotate service for this newly created log file:
-** on Linux, please append this new log file name in <code>/etc/logrotate.d/dovecot</code> like below:</li>
+<li>
+<p>Enable logrotate service for this newly created log file:</p>
+<ul>
+<li>on Linux, please append this new log file name in <code>/etc/logrotate.d/dovecot</code> like below:</li>
+</ul>
+</li>
 </ul>
 <pre><code># Part of file: /etc/logrotate.d/dovecot
 
 /var/log/dovecot.log /var/log/dovecot-lmtp.log {
 </code></pre>
 
-<p>** on FreeBSD, please append below line in file <code>/etc/newsyslog.conf</code>:</p>
+<ul>
+<li>on FreeBSD, please append below line in file <code>/etc/newsyslog.conf</code>:</li>
+</ul>
 <pre><code># Part of file: /etc/newsyslog.conf
 /var/log/dovecot-lmtp.log    vmail:vmail   600  7     *    24    Z    /var/run/dovecot/master.pid
 </code></pre>
 
-<p>** on OpenBSD, please append below line in file <code>/etc/newsyslog.conf</code>:</p>
+<ul>
+<li>on OpenBSD, please append below line in file <code>/etc/newsyslog.conf</code>:</li>
+</ul>
 <pre><code># Part of file: /etc/newsyslog.conf
 
 /var/log/dovecot-lmtp.log    vmail:vmail   600  7     *    24    Z &quot;/usr/local/bin/doveadm log reopen&quot;
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 c13995c3..405bd854 100644
--- a/html/upgrade.iredmail.0.8.7-0.9.0.html
+++ b/html/upgrade.iredmail.0.8.7-0.9.0.html
@@ -19,6 +19,7 @@
 <li><a href="#update-etciredmail-release-with-iredmail-version-number">Update /etc/iredmail-release with iRedMail version number</a></li>
 <li><a href="#upgrade-roundcube-webmail-to-the-latest-stable-release">Upgrade Roundcube webmail to the latest stable release</a></li>
 <li><a href="#upgrade-iredapd-postfix-policy-server-to-the-latest-144">Upgrade iRedAPD (Postfix policy server) to the latest 1.4.4</a></li>
+<li><a href="#upgrade-iredadmin-open-source-edition-to-the-latest-stable-release">Upgrade iRedAdmin (open source edition) to the latest stable release</a></li>
 <li><a href="#fix-improper-postfix-setting-in-both-maincf-and-mastercf">Fix improper Postfix setting in both main.cf and master.cf</a></li>
 <li><a href="#fix-improper-file-permission-of-amavisd-config-file">Fix improper file permission of Amavisd config file</a></li>
 <li><a href="#fix-incorrect-setting-to-enable-daily-cron-job-to-update-spamassassin-rules">Fix incorrect setting to enable daily cron job to update SpamAssassin rules</a></li>
@@ -76,7 +77,10 @@ latest stable release immediately: <a href="http://trac.roundcube.net/wiki/Howto
 <p>iRedAPD-1.4.4 brings several new plugins, and works with Postfix parameter
 <code>smtpd_end_of_data_restrictions</code> (protocol state <code>END-OF-MESSAGE</code>).</p>
 <p>Please follow below tutorial to upgrade iRedAPD to the latest stable release:
-* <a href="http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD">How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.4</a></p>
+<a href="http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD">How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.4</a></p>
+<h3 id="upgrade-iredadmin-open-source-edition-to-the-latest-stable-release">Upgrade iRedAdmin (open source edition) to the latest stable release</h3>
+<p>Please follow this tutorial to upgrade iRedAdmin open source edition to the
+latest stable release: <a href="./migrate.or.upgrade.iredadmin.html">Upgrade iRedAdmin to the latest stable release</a></p>
 <h3 id="fix-improper-postfix-setting-in-both-maincf-and-mastercf">Fix improper Postfix setting in both main.cf and master.cf</h3>
 <p>Currently, we don't have Postfix parameter <code>receive_override_options=</code> set in
 <code>/etc/postfix/main.cf</code>, instead, we have it in transport <code>127.0.0.1:10025</code>
diff --git a/migrations/migrate.or.upgrade.iredadmin.md b/migrations/migrate.or.upgrade.iredadmin.md
index c29cc086..24acaa5a 100644
--- a/migrations/migrate.or.upgrade.iredadmin.md
+++ b/migrations/migrate.or.upgrade.iredadmin.md
@@ -2,8 +2,9 @@
 
 [TOC]
 
-This tutorial describes how to migrate iRedAdmin open source edition or old
-iRedAdmin-Pro release to the latest iRedAdmin-Pro (full-featured edition).
+This tutorial describes how to update or migrate iRedAdmin (either open source
+edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again,
+either open source edition or iRedAdmin-Pro).
 
 ## Requirements
 
diff --git a/upgrade/upgrade.iredmail.0.8.6-0.8.7.md b/upgrade/upgrade.iredmail.0.8.6-0.8.7.md
index be1a89a0..405faaa5 100644
--- a/upgrade/upgrade.iredmail.0.8.6-0.8.7.md
+++ b/upgrade/upgrade.iredmail.0.8.6-0.8.7.md
@@ -38,11 +38,12 @@ latest stable release immediately: [How to upgrade Roundcube](http://trac.roundc
 ### Upgrade iRedAPD (Postfix policy server) to the latest 1.4.3
 
 Please follow below tutorial to upgrade iRedAPD to the latest stable release:
-* [How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.3](http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD)
+[How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.3](http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD)
 
-### Upgrade iRedAdmin (open source edition) to the latest 0.3.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: [[IRedMail/FAQ/Upgrade.iRedAdmin.Open.Source.Edition |How to 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 phpMyAdmin to the latest stable release
 
@@ -69,10 +70,11 @@ Postfix service.
 
 After this change, you have to update Roundcube config file to use SMTP service
 over TLS. For example:
-* On RHEL/CentOS, it's /var/www/roundcubemail/config/main.inc.php (or config.inc.php)
-* On Debian/Ubuntu, it's /usr/share/apache2/roundcubemail/config/main.inc.php (or config.inc.php)
-* On FreeBSD, it's /usr/local/www/roundcubemail/config/main.inc.php (or config.inc.php)
-* On OpenBSD, it's /var/www/roundcubemail/config/main.inc.php (or config.inc.php)
+
+* On RHEL/CentOS, it's `/var/www/roundcubemail/config/main.inc.php` (or `config.inc.php`)
+* On Debian/Ubuntu, it's `/usr/share/apache2/roundcubemail/config/main.inc.php` (or `config.inc.php`)
+* On FreeBSD, it's `/usr/local/www/roundcubemail/config/main.inc.php` (or `config.inc.php`)
+* On OpenBSD, it's `/var/www/roundcubemail/config/main.inc.php` (or `config.inc.php`)
 
 ```
 # Part of Roundcube config file: config.inc.php
@@ -183,7 +185,8 @@ __NOTE__: For OpenBSD users, please replace `user = postfix` by
 ```
 
 * Enable logrotate service for this newly created log file:
-** on Linux, please append this new log file name in `/etc/logrotate.d/dovecot` like below:
+
+    * on Linux, please append this new log file name in `/etc/logrotate.d/dovecot` like below:
 
 ```
 # Part of file: /etc/logrotate.d/dovecot
@@ -191,14 +194,14 @@ __NOTE__: For OpenBSD users, please replace `user = postfix` by
 /var/log/dovecot.log /var/log/dovecot-lmtp.log {
 ```
 
-** on FreeBSD, please append below line in file `/etc/newsyslog.conf`:
+* on FreeBSD, please append below line in file `/etc/newsyslog.conf`:
 
 ```
 # Part of file: /etc/newsyslog.conf
 /var/log/dovecot-lmtp.log    vmail:vmail   600  7     *    24    Z    /var/run/dovecot/master.pid
 ```
 
-** on OpenBSD, please append below line in file `/etc/newsyslog.conf`:
+* on OpenBSD, please append below line in file `/etc/newsyslog.conf`:
 
 ```
 # Part of file: /etc/newsyslog.conf
diff --git a/upgrade/upgrade.iredmail.0.8.7-0.9.0.md b/upgrade/upgrade.iredmail.0.8.7-0.9.0.md
index 8ea54070..460fd5c0 100644
--- a/upgrade/upgrade.iredmail.0.8.7-0.9.0.md
+++ b/upgrade/upgrade.iredmail.0.8.7-0.9.0.md
@@ -43,8 +43,12 @@ iRedAPD-1.4.4 brings several new plugins, and works with Postfix parameter
 `smtpd_end_of_data_restrictions` (protocol state `END-OF-MESSAGE`).
 
 Please follow below tutorial to upgrade iRedAPD to the latest stable release:
-* [How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.4](http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD)
+[How to upgrade iRedAPD-1.4.1 or later versions to iRedAPD-1.4.4](http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Upgrade.iRedAPD)
 
+### 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)
 
 ### Fix improper Postfix setting in both main.cf and master.cf