From 4fce081c5f822f3112d548e6690221b74c788078 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Wed, 30 Sep 2015 10:23:42 +0800
Subject: [PATCH] Typo and fix incorrect URL and file names.
---
en_US/upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md | 6 +++---
en_US/upgrade/0-upgrade.iredmail.0.9.1-0.9.2.md | 15 ++++++++-------
html/upgrade.iredmail.0.9.0-0.9.1.html | 6 +++---
html/upgrade.iredmail.0.9.1-0.9.2.html | 15 ++++++++-------
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md b/en_US/upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md
index 957cdbd3..187d0655 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md
@@ -535,7 +535,7 @@ greylisting on them is helpless.
```
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
```
* Login to MySQL database and import this file:
@@ -654,7 +654,7 @@ greylisting on them is helpless.
```
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
```
* Login to MySQL database and import this file:
@@ -773,7 +773,7 @@ greylisting on them is helpless.
```
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
```
* Switch to PostgreSQL daemon user, then execute SQL commands to import it:
diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.1-0.9.2.md b/en_US/upgrade/0-upgrade.iredmail.0.9.1-0.9.2.md
index a7d1e24e..3e4430d6 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.1-0.9.2.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.1-0.9.2.md
@@ -297,8 +297,9 @@ __Note: this step is required if you're running SOGo on RHEL/CentOS, Debian/Ubun
SOGo team released new stable version v2.3.0 on Jun 2, it requires system
admin to run a shell script to update SQL structure manually if you're currently
-running an old version of SOGo.
-http://www.sogo.nu/files/docs/SOGo%20Installation%20Guide.pdf
+running an old version of SOGo. We suggest you read SOGo official upgrade
+tutorial in `Upgrading` section of
+[Installation Guide](http://www.sogo.nu/files/docs/SOGo%20Installation%20Guide.pdf).
SOGo-2.3.0 ships this update script, please find it with your package management
tool like `yum`, `dpkg`.
@@ -318,23 +319,23 @@ Find the update script shipped in SOGo-2.3.0 and run it:
```
# rpm -ql sogo | grep 'sql-update-2.2.17'
-/usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0-mysql.sh # <- for MySQL
-/usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0.sh # <- for PostgreSQL
+/usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0-mysql.sh # <- for MySQL
+/usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0.sh # <- for PostgreSQL
```
* on Debian/Ubuntu:
```
# dpkg -L sogo | grep 'sql-update-2.2.17'
-/usr/share/doc/sogo/sql-update-2.1.17_to_2.3.0-mysql.sh # <- for MySQL
-/usr/share/doc/sogo/sql-update-2.1.17_to_2.3.0.sh # <- for PostgreSQL
+/usr/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh # <- for MySQL
+/usr/share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh # <- for PostgreSQL
```
Please pick the one for your SQL server. here we use the one for MySQL
backend on CentOS for example:
```
-# bash /usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0-mysql.sh
+# bash /usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0-mysql.sh
Username (root): root
Hostname (127.0.0.1):
Database (root): sogo
diff --git a/html/upgrade.iredmail.0.9.0-0.9.1.html b/html/upgrade.iredmail.0.9.0-0.9.1.html
index b04a09ad..491d6a44 100644
--- a/html/upgrade.iredmail.0.9.0-0.9.1.html
+++ b/html/upgrade.iredmail.0.9.0-0.9.1.html
@@ -515,7 +515,7 @@ greylisting on them is helpless.
Download SQL template file:
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
@@ -612,7 +612,7 @@ greylisting on them is helpless.
- Download SQL template file:
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
@@ -709,7 +709,7 @@ greylisting on them is helpless.
- Download SQL template file:
# cd /tmp
-# wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/cluebringer/greylisting-whitelist.sql
+# wget https://bitbucket.org/zhb/iredmail/raw/40b98d7dde0178d54498e170c8b5165c0316dc96/iRedMail/samples/cluebringer/greylisting-whitelist.sql
diff --git a/html/upgrade.iredmail.0.9.1-0.9.2.html b/html/upgrade.iredmail.0.9.1-0.9.2.html
index ff3d86fe..4c1faee0 100644
--- a/html/upgrade.iredmail.0.9.1-0.9.2.html
+++ b/html/upgrade.iredmail.0.9.1-0.9.2.html
@@ -287,8 +287,9 @@ enable-threads = true
Note: this step is required if you're running SOGo on RHEL/CentOS, Debian/Ubuntu.
SOGo team released new stable version v2.3.0 on Jun 2, it requires system
admin to run a shell script to update SQL structure manually if you're currently
-running an old version of SOGo.
-http://www.sogo.nu/files/docs/SOGo%20Installation%20Guide.pdf
+running an old version of SOGo. We suggest you read SOGo official upgrade
+tutorial in Upgrading
section of
+Installation Guide.
SOGo-2.3.0 ships this update script, please find it with your package management
tool like yum
, dpkg
.
@@ -309,21 +310,21 @@ tool like yum
, dpkg
.
- on RHEL/CentOS:
# rpm -ql sogo | grep 'sql-update-2.2.17'
-/usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0-mysql.sh # <- for MySQL
-/usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0.sh # <- for PostgreSQL
+/usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0-mysql.sh # <- for MySQL
+/usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0.sh # <- for PostgreSQL
# dpkg -L sogo | grep 'sql-update-2.2.17'
-/usr/share/doc/sogo/sql-update-2.1.17_to_2.3.0-mysql.sh # <- for MySQL
-/usr/share/doc/sogo/sql-update-2.1.17_to_2.3.0.sh # <- for PostgreSQL
+/usr/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh # <- for MySQL
+/usr/share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh # <- for PostgreSQL
Please pick the one for your SQL server. here we use the one for MySQL
backend on CentOS for example:
-# bash /usr/share/doc/sogo-2.3.0/sql-update-2.1.17_to_2.3.0-mysql.sh
+# bash /usr/share/doc/sogo-2.3.0/sql-update-2.2.17_to_2.3.0-mysql.sh
Username (root): root
Hostname (127.0.0.1):
Database (root): sogo