From 49ca3c31de696380343fc1d3f94dbae88523053d Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Wed, 6 Jul 2016 10:31:18 +0800
Subject: [PATCH] Fix incorrect article links in
zh_CN/installation/0-install.iredmail.on*.md
---
en_US/upgrade/1-iredmail.releases.md | 7 ++++---
en_US/upgrade/2-iredadmin-pro.releases.md | 3 ++-
html/install.iredmail.on.debian.ubuntu-zh_CN.html | 2 +-
html/install.iredmail.on.rhel-zh_CN.html | 2 +-
html/iredadmin-pro.releases.html | 6 ++++--
html/iredmail.releases.html | 9 +++++----
.../installation/0-install.iredmail.on.debian.ubuntu.md | 2 +-
zh_CN/installation/0-install.iredmail.on.rhel.md | 2 +-
8 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/en_US/upgrade/1-iredmail.releases.md b/en_US/upgrade/1-iredmail.releases.md
index 4e8bf327..f6f7ee24 100644
--- a/en_US/upgrade/1-iredmail.releases.md
+++ b/en_US/upgrade/1-iredmail.releases.md
@@ -1,6 +1,6 @@
# iRedMail release notes and upgrade tutorials
-!!! note
+!!! attention
* iRedMail source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredmail/src).
* Download the [latest iRedMail stable release](../download.html).
@@ -30,8 +30,9 @@
!!! note "Paid Remote Upgrade Support"
- We offer remote upgrade support if you don't want to get your hands dirty,
- check [the details](../support.html) and [contact us](../contact.html).
+ We offer professional remote upgrade support if you don't want to get your
+ hands dirty, please check [the details](../support.html) and
+ [contact us](../contact.html).
* [0.9.5-1](http://www.iredmail.org/forum/topic11049.html), May 10, 2016. [Upgrade from iRedMail-0.9.5](./upgrade.iredmail.0.9.5-0.9.5-1.html) (Small bug fix release)
* [0.9.5](http://www.iredmail.org/forum/topic10994.html), May 3, 2016. [Upgrade from iRedMail-0.9.4](./upgrade.iredmail.0.9.4-0.9.5.html) (contains SQL/LDAP structure changes)
diff --git a/en_US/upgrade/2-iredadmin-pro.releases.md b/en_US/upgrade/2-iredadmin-pro.releases.md
index 62cafe10..89c9a8cb 100644
--- a/en_US/upgrade/2-iredadmin-pro.releases.md
+++ b/en_US/upgrade/2-iredadmin-pro.releases.md
@@ -6,7 +6,8 @@
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)
+
+* [Migrate or upgrade iRedAdmin](./migrate.or.upgrade.iredadmin.html)
## Install iRedAdmin from scratch
diff --git a/html/install.iredmail.on.debian.ubuntu-zh_CN.html b/html/install.iredmail.on.debian.ubuntu-zh_CN.html
index 937c9a05..4e4961f8 100644
--- a/html/install.iredmail.on.debian.ubuntu-zh_CN.html
+++ b/html/install.iredmail.on.debian.ubuntu-zh_CN.html
@@ -179,7 +179,7 @@ root 用户生成一个随机的强密码,安装完成后可以在 iRedM
如何配置邮件客户端程序
强烈建议获取 SSL 证书以避免每次访问 web 程序时烦人的自签名 SSL 证书警告,
Let's Encrypt 提供免费的 SSL 证书。可根据该文档
- 配置获取的证书:use a SSL certificate.
+ 配置获取的证书:use a SSL certificate.
如果需要批量添加邮件账号,可以参考以下针对不同数据库的批量建账号的文档:
OpenLDAP,
MySQL/MariaDB/PostgreSQL。
diff --git a/html/install.iredmail.on.rhel-zh_CN.html b/html/install.iredmail.on.rhel-zh_CN.html
index b51d75f1..9fe80631 100644
--- a/html/install.iredmail.on.rhel-zh_CN.html
+++ b/html/install.iredmail.on.rhel-zh_CN.html
@@ -191,7 +191,7 @@ root 用户生成一个随机的强密码,安装完成后可以在 iRedM
如何配置邮件客户端程序
强烈建议获取 SSL 证书以避免每次访问 web 程序时烦人的自签名 SSL 证书警告,
Let's Encrypt 提供免费的 SSL 证书。可根据该文档
- 配置获取的证书:use a SSL certificate.
+ 配置获取的证书:use a SSL certificate.
如果需要批量添加邮件账号,可以参考以下针对不同数据库的批量建账号的文档:
OpenLDAP,
MySQL/MariaDB/PostgreSQL。
diff --git a/html/iredadmin-pro.releases.html b/html/iredadmin-pro.releases.html
index e4088193..1e8e625a 100644
--- a/html/iredadmin-pro.releases.html
+++ b/html/iredadmin-pro.releases.html
@@ -32,8 +32,10 @@
Upgrade iRedAdmin
With the latest iRedAdmin, you can simply upgrade old releases by following
-this tutorial with just one shell command:
-Migrate or upgrade iRedAdmin
+this tutorial with just one shell command:
+
Install iRedAdmin from scratch
- Install iRedAdmin on Red Hat Enterprise Linux, CentOS, Scientific Linux
diff --git a/html/iredmail.releases.html b/html/iredmail.releases.html
index 61163211..d06deb10 100644
--- a/html/iredmail.releases.html
+++ b/html/iredmail.releases.html
@@ -16,8 +16,8 @@
iRedMail
// Document IndexiRedMail release notes and upgrade tutorials
-
-
Note
+
+
Attention
- iRedMail source code is hosted on BitBucket.
- Download the latest iRedMail stable release.
@@ -59,8 +59,9 @@
Release notes and upgrade tutorials
Paid Remote Upgrade Support
-
We offer remote upgrade support if you don't want to get your hands dirty,
-check the details and contact us.
+
We offer professional remote upgrade support if you don't want to get your
+hands dirty, please check the details and
+contact us.
- 0.9.5-1, May 10, 2016. Upgrade from iRedMail-0.9.5 (Small bug fix release)
diff --git a/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md b/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
index 42967002..315a172e 100644
--- a/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
+++ b/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
@@ -154,7 +154,7 @@ mx.example.com
* [如何配置邮件客户端程序](../index.html#configure-mail-client-applications)
* 强烈建议获取 SSL 证书以避免每次访问 web 程序时烦人的自签名 SSL 证书警告,
[Let's Encrypt 提供免费的 SSL 证书](https://letsencrypt.org)。可根据该文档
- 配置获取的证书:[use a SSL certificate](../use.a.bought.ssl.certificate.html).
+ 配置获取的证书:[use a SSL certificate](./use.a.bought.ssl.certificate.html).
* 如果需要批量添加邮件账号,可以参考以下针对不同数据库的批量建账号的文档:
[OpenLDAP](../ldap.bulk.create.mail.users.html),
[MySQL/MariaDB/PostgreSQL](../sql.bulk.create.mail.users.html)。
diff --git a/zh_CN/installation/0-install.iredmail.on.rhel.md b/zh_CN/installation/0-install.iredmail.on.rhel.md
index 8d7d9b24..6dc9ae65 100644
--- a/zh_CN/installation/0-install.iredmail.on.rhel.md
+++ b/zh_CN/installation/0-install.iredmail.on.rhel.md
@@ -172,7 +172,7 @@ SELINUX=permissive
* [如何配置邮件客户端程序](../index.html#configure-mail-client-applications)
* 强烈建议获取 SSL 证书以避免每次访问 web 程序时烦人的自签名 SSL 证书警告,
[Let's Encrypt 提供免费的 SSL 证书](https://letsencrypt.org)。可根据该文档
- 配置获取的证书:[use a SSL certificate](../use.a.bought.ssl.certificate.html).
+ 配置获取的证书:[use a SSL certificate](./use.a.bought.ssl.certificate.html).
* 如果需要批量添加邮件账号,可以参考以下针对不同数据库的批量建账号的文档:
[OpenLDAP](../ldap.bulk.create.mail.users.html),
[MySQL/MariaDB/PostgreSQL](../sql.bulk.create.mail.users.html)。