From a75c1e92e57f8e4a75895c1232c41f4af12ce15c Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Sun, 4 Jan 2015 14:21:04 +0800
Subject: [PATCH] Add links to download iRedAdmin in migrate/upgrade tutorial.

---
 TODO.md                                   |  3 +++
 html/iredadmin-pro.releases.html          | 16 +---------------
 html/migrate.or.upgrade.iredadmin.html    | 21 +++++++++++++++++++--
 upgrade/0-migrate.or.upgrade.iredadmin.md | 19 ++++++++++++++++++-
 upgrade/2-iredadmin-pro.releases.md       | 12 ------------
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/TODO.md b/TODO.md
index 24222a26..c02a3b31 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,10 @@
 # TODO
 
+* How to install and configure SOGo groupware
+* How to install and configure Nginx
 * How to custom SpamAssassin scores
 * How to enable DNSBL in Postfix.
+* How to install and configure mlmmj (mailing list management tool)
 
 * http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Send.out.email.from.specified.IP.address
 * http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Backup
diff --git a/html/iredadmin-pro.releases.html b/html/iredadmin-pro.releases.html
index 15256c7a..4ca049ce 100644
--- a/html/iredadmin-pro.releases.html
+++ b/html/iredadmin-pro.releases.html
@@ -14,10 +14,7 @@
 <div class="toc">
 <ul>
 <li><a href="#iredadmin-pro-release-notes-and-upgrade-tutorial">iRedAdmin-Pro release notes and upgrade tutorial</a><ul>
-<li><a href="#upgrade-iredadmin">Upgrade iRedAdmin</a><ul>
-<li><a href="#how-to-download-the-latest-iredadmin-pro">How to download the latest iRedAdmin-Pro</a></li>
-</ul>
-</li>
+<li><a href="#upgrade-iredadmin">Upgrade iRedAdmin</a></li>
 <li><a href="#install-iredadmin-from-scratch">Install iRedAdmin from scratch</a></li>
 <li><a href="#release-notes">Release Notes</a><ul>
 <li><a href="#iredadmin-pro-ldap-for-openldap-backend">iRedAdmin-Pro-LDAP (for OpenLDAP backend)</a></li>
@@ -36,17 +33,6 @@
 <p>With the latest iRedAdmin, you can simply upgrade old releases by following
 this tutorial with just one shell command:
 <a href="./migrate.or.upgrade.iredadmin.html">Migrate or upgrade iRedAdmin</a></p>
-<h4 id="how-to-download-the-latest-iredadmin-pro">How to download the latest iRedAdmin-Pro</h4>
-<p>All customers can get download link of new release by following below steps:</p>
-<ul>
-<li>Login to iRedAdmin-Pro as global admin.</li>
-<li>Click <code>License</code> button on the top-right corner. it will show you basic
-  license info and a <code>Download</code> button if new version is available.</li>
-<li>Click <code>Download</code> button, your mailbox (license owner) will receive an email
-  with download link in a short time. Note: if your mail server has greylisting
-  enabled, it may take longer, please be patient and don't request download
-  link again and again.</li>
-</ul>
 <h2 id="install-iredadmin-from-scratch">Install iRedAdmin from scratch</h2>
 <ul>
 <li><a href="./install.iredadmin.on.rhel.html">Install iRedAdmin on Red Hat Enterprise Linux, CentOS, Scientific Linux</a></li>
diff --git a/html/migrate.or.upgrade.iredadmin.html b/html/migrate.or.upgrade.iredadmin.html
index 1b73d1d7..f66054f8 100644
--- a/html/migrate.or.upgrade.iredadmin.html
+++ b/html/migrate.or.upgrade.iredadmin.html
@@ -15,6 +15,7 @@
 <ul>
 <li><a href="#migrate-or-upgrade-iredadmin">Migrate or upgrade iRedAdmin</a><ul>
 <li><a href="#requirements">Requirements</a></li>
+<li><a href="#download-the-latest-iredadmin">Download the latest iRedAdmin</a></li>
 <li><a href="#upgrade-steps">Upgrade Steps</a></li>
 <li><a href="#addition-steps">Addition steps</a></li>
 </ul>
@@ -25,9 +26,25 @@
 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>
+<p>You <strong>MUST</strong> have iRedAdmin open source edition or old iRedAdmin-Pro release
+installed and running on your server before upgrading.</p>
+<h2 id="download-the-latest-iredadmin">Download the latest iRedAdmin</h2>
 <ul>
-<li>You <strong>MUST</strong> have iRedAdmin open source edition or old iRedAdmin-Pro release
-installed and running on your server before upgrading.</li>
+<li>iRedAdmin (open source edition) is available for download <a href="http://www.iredmail.org/yum/misc/">here</a>.</li>
+<li>
+<p>How to download the latest iRedAdmin-Pro</p>
+<p>All customers can get download link of new release by following below steps:</p>
+<ul>
+<li>Login to iRedAdmin-Pro as global admin.</li>
+<li>Click <code>License</code> button on the top-right corner. it will show you basic
+  license info and a <code>Download</code> button if new version is available.</li>
+<li>Click <code>Download</code> button, your mailbox (license owner) will receive an email
+  with download link in a short time. Note: if your mail server has greylisting
+  enabled, it may take longer, please be patient and don't request download
+  link again and again.</li>
+</ul>
+<p>if you cannot download iRedAdmin-Pro for some reason, <a href="../contact.html">contact us</a> directly.</p>
+</li>
 </ul>
 <h2 id="upgrade-steps">Upgrade Steps</h2>
 <ul>
diff --git a/upgrade/0-migrate.or.upgrade.iredadmin.md b/upgrade/0-migrate.or.upgrade.iredadmin.md
index e09c77d8..f6b8e2a0 100644
--- a/upgrade/0-migrate.or.upgrade.iredadmin.md
+++ b/upgrade/0-migrate.or.upgrade.iredadmin.md
@@ -8,9 +8,26 @@ either open source edition or iRedAdmin-Pro).
 
 ## Requirements
 
-* You __MUST__ have iRedAdmin open source edition or old iRedAdmin-Pro release
+You __MUST__ have iRedAdmin open source edition or old iRedAdmin-Pro release
 installed and running on your server before upgrading.
 
+## Download the latest iRedAdmin
+
+* iRedAdmin (open source edition) is available for download [here](http://www.iredmail.org/yum/misc/).
+* How to download the latest iRedAdmin-Pro
+
+    All customers can get download link of new release by following below steps:
+
+    * Login to iRedAdmin-Pro as global admin.
+    * Click `License` button on the top-right corner. it will show you basic
+      license info and a `Download` button if new version is available.
+    * Click `Download` button, your mailbox (license owner) will receive an email
+      with download link in a short time. Note: if your mail server has greylisting
+      enabled, it may take longer, please be patient and don't request download
+      link again and again.
+
+    if you cannot download iRedAdmin-Pro for some reason, [contact us](../contact.html) directly.
+
 ## Upgrade Steps
 
 * Upload or copy the latest iRedAdmin to your server which has iRedAdmin
diff --git a/upgrade/2-iredadmin-pro.releases.md b/upgrade/2-iredadmin-pro.releases.md
index e2a1456e..1d32e0b3 100644
--- a/upgrade/2-iredadmin-pro.releases.md
+++ b/upgrade/2-iredadmin-pro.releases.md
@@ -10,18 +10,6 @@ With the latest iRedAdmin, you can simply upgrade old releases by following
 this tutorial with just one shell command:
 [Migrate or upgrade iRedAdmin](./migrate.or.upgrade.iredadmin.html)
 
-#### How to download the latest iRedAdmin-Pro
-
-All customers can get download link of new release by following below steps:
-
-* Login to iRedAdmin-Pro as global admin.
-* Click `License` button on the top-right corner. it will show you basic
-  license info and a `Download` button if new version is available.
-* Click `Download` button, your mailbox (license owner) will receive an email
-  with download link in a short time. Note: if your mail server has greylisting
-  enabled, it may take longer, please be patient and don't request download
-  link again and again.
-
 ## Install iRedAdmin from scratch
 
 * [Install iRedAdmin on Red Hat Enterprise Linux, CentOS, Scientific Linux](./install.iredadmin.on.rhel.html)