From 2a211c38516dbf0b0aab65f1d7a7b75588e82bc2 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Fri, 15 May 2015 18:37:54 +0800
Subject: [PATCH] Sync iRedAdmin-Pro release notes.

---
 html/iredadmin-pro.releases.html    | 18 ++++++++++++++----
 upgrade/2-iredadmin-pro.releases.md | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/html/iredadmin-pro.releases.html b/html/iredadmin-pro.releases.html
index a9300394..4f7d4975 100644
--- a/html/iredadmin-pro.releases.html
+++ b/html/iredadmin-pro.releases.html
@@ -18,8 +18,7 @@
 <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>
-<li><a href="#iredadmin-pro-mysql-for-mysqlmariadb-backend">iRedAdmin-Pro-MySQL (for MySQL/MariaDB backend)</a></li>
-<li><a href="#iredadmin-pro-pgsql-for-postgresql-backend">iRedAdmin-Pro-PGSQL (for PostgreSQL backend)</a></li>
+<li><a href="#iredadmin-pro-sql-for-mysql-mariadb-postgresql-backends">iRedAdmin-Pro-SQL (For MySQL, MariaDB, PostgreSQL backends)</a></li>
 </ul>
 </li>
 </ul>
@@ -40,6 +39,10 @@ this tutorial with just one shell command:
 <h2 id="release-notes">Release Notes</h2>
 <h3 id="iredadmin-pro-ldap-for-openldap-backend">iRedAdmin-Pro-LDAP (for OpenLDAP backend)</h3>
 <ul>
+<li><a href="http://www.iredmail.org/forum/topic9145.html">2.3.0</a>, May 15, 2015. Provides some basic hooks (hook is just like plugin).</li>
+</ul>
+<hr />
+<ul>
 <li><a href="http://www.iredmail.org/forum/topic8635.html">2.2.2</a>, Feb 2, 2015. bugfix release.</li>
 <li><a href="http://www.iredmail.org/forum/topic8447.html">2.2.0</a>, Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.</li>
 <li><a href="http://www.iredmail.org/forum/topic6925-news-announcements-bug-fixes-iredadminproldap212-has-been-released.html">2.1.2</a>, 2014-05-16</li>
@@ -60,7 +63,13 @@ this tutorial with just one shell command:
 <li><a href="http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/LDAP/1.2.0">1.2.0</a>, 2010-06-18</li>
 <li>[1.0], 2009-11-01</li>
 </ul>
-<h3 id="iredadmin-pro-mysql-for-mysqlmariadb-backend">iRedAdmin-Pro-MySQL (for MySQL/MariaDB backend)</h3>
+<h3 id="iredadmin-pro-sql-for-mysql-mariadb-postgresql-backends">iRedAdmin-Pro-SQL (For MySQL, MariaDB, PostgreSQL backends)</h3>
+<ul>
+<li><a href="http://www.iredmail.org/forum/topic9146.html">2.0</a>, May 15, 2015.</li>
+</ul>
+<hr />
+<p>iRedAdmin-Pro-MySQL and iRedAdmin-Pro-PGSQL were merged into one edition:
+iRedAdmin-Pro-SQL. Below are changelog of old iRedAdmin-Pro-MySQL editions.</p>
 <ul>
 <li><a href="http://www.iredmail.org/forum/topic8636.html">1.9.2</a>, Feb 2, 2015. bugfix release.</li>
 <li><a href="http://www.iredmail.org/forum/topic8448.html">1.9.0</a>, Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.</li>
@@ -78,7 +87,8 @@ this tutorial with just one shell command:
 <li><a href="http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/MySQL/1.1.0">1.1.0</a>, 2011-05-03</li>
 <li><a href="http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/MySQL/1.0">1.0</a>, 2011-02-01</li>
 </ul>
-<h3 id="iredadmin-pro-pgsql-for-postgresql-backend">iRedAdmin-Pro-PGSQL (for PostgreSQL backend)</h3>
+<p>iRedAdmin-Pro-MySQL and iRedAdmin-Pro-PGSQL were merged into one edition:
+iRedAdmin-Pro-SQL. Below are changelog of old iRedAdmin-Pro-PGSQL editions.</p>
 <ul>
 <li><a href="http://www.iredmail.org/forum/topic8637.html">1.9.2</a>, Feb 2, 2015. bugfix release.</li>
 <li><a href="http://www.iredmail.org/forum/topic8449.html">1.5.0</a>, Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.</li>
diff --git a/upgrade/2-iredadmin-pro.releases.md b/upgrade/2-iredadmin-pro.releases.md
index f673f431..90244a32 100644
--- a/upgrade/2-iredadmin-pro.releases.md
+++ b/upgrade/2-iredadmin-pro.releases.md
@@ -19,6 +19,10 @@ this tutorial with just one shell command:
 
 ### iRedAdmin-Pro-LDAP (for OpenLDAP backend)
 
+* [2.3.0](http://www.iredmail.org/forum/topic9145.html), May 15, 2015. Provides some basic hooks (hook is just like plugin).
+
+----
+
 * [2.2.2](http://www.iredmail.org/forum/topic8635.html), Feb 2, 2015. bugfix release.
 * [2.2.0](http://www.iredmail.org/forum/topic8447.html), Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.
 * [2.1.2](http://www.iredmail.org/forum/topic6925-news-announcements-bug-fixes-iredadminproldap212-has-been-released.html), 2014-05-16
@@ -39,7 +43,14 @@ this tutorial with just one shell command:
 * [1.2.0](http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/LDAP/1.2.0), 2010-06-18
 * [1.0], 2009-11-01
 
-### iRedAdmin-Pro-MySQL (for MySQL/MariaDB backend)
+### iRedAdmin-Pro-SQL (For MySQL, MariaDB, PostgreSQL backends)
+
+* [2.0](http://www.iredmail.org/forum/topic9146.html), May 15, 2015.
+
+----
+
+iRedAdmin-Pro-MySQL and iRedAdmin-Pro-PGSQL were merged into one edition:
+iRedAdmin-Pro-SQL. Below are changelog of old iRedAdmin-Pro-MySQL editions.
 
 * [1.9.2](http://www.iredmail.org/forum/topic8636.html), Feb 2, 2015. bugfix release.
 * [1.9.0](http://www.iredmail.org/forum/topic8448.html), Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.
@@ -57,7 +68,8 @@ this tutorial with just one shell command:
 * [1.1.0](http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/MySQL/1.1.0), 2011-05-03
 * [1.0](http://www.iredmail.org/wiki/index.php?title=Release.Notes/iRedAdmin-Pro/MySQL/1.0), 2011-02-01
 
-### iRedAdmin-Pro-PGSQL (for PostgreSQL backend)
+iRedAdmin-Pro-MySQL and iRedAdmin-Pro-PGSQL were merged into one edition:
+iRedAdmin-Pro-SQL. Below are changelog of old iRedAdmin-Pro-PGSQL editions.
 
 * [1.9.2](http://www.iredmail.org/forum/topic8637.html), Feb 2, 2015. bugfix release.
 * [1.5.0](http://www.iredmail.org/forum/topic8449.html), Jan 1, 2015. self-service, deeper Amavisd integration, SSHA512/BCRYPT password hashes support.