From 76cd29005d26e9125342fd57cbfcf6857658f954 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Thu, 5 May 2016 22:54:51 +0800
Subject: [PATCH] Fix typo in README.md. Code cleanup in upgrade tutorial.
---
README.md | 18 +++++++++++-------
en_US/faq/2-iredadmin-pro.restful.api.md | 2 +-
en_US/integrations/active.directory.md | 22 +++++++++++-----------
en_US/upgrade/0-upgrade.sogo.2.to.3.md | 4 ++--
html/active.directory.html | 22 +++++++++++-----------
html/upgrade.sogo.2.to.3.html | 4 ++--
6 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/README.md b/README.md
index 7a144cad..9558d234 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,16 @@ to read converted documents in HTML format, get support in our forum:
# How to translate and contribute
-* Create a new directory and name it to the short language code. e.g. for
- Germany, please name it `zh_CN`.
-* Add file `zh_CN/_lang.md` with the full name of the language. e.g.
- write `English` in `en_US/_lang.md`, `简体中文` in `zh_CN/_lang.md`.
+* Create a new directory and name it to the short language code. for example:
+ * `de_DE` for `German`
+ * `zh_CN` for `Chinese`
+* Add file `[xx_XX]/_lang.md` with the full name of the language. for example:
+ * `English` in `en_US/_lang.md`
+ * `Deutsch` in `de_DE/_lang.md`
+ * `简体中文` in `zh_CN/_lang.md`.
* Copy the markdown document you want to translate to new language directory,
- create the same sub-directories as original document. For example, to
- translate `en_US/howto/reset.user.password.md`, please create
- `zh_CN/howto/` and copy `reset.user.password.md` to `zh_CN/howto/`.
+ create the same sub-directory as original document. For example, to
+ translate `en_US/howto/reset.user.password.md` to Chinese, please create
+ directory `zh_CN/howto/` and copy `reset.user.password.md` to `zh_CN/howto/`
+ (with same file name).
* Translate the file and send a pull request.
diff --git a/en_US/faq/2-iredadmin-pro.restful.api.md b/en_US/faq/2-iredadmin-pro.restful.api.md
index f106597b..7a77f9be 100644
--- a/en_US/faq/2-iredadmin-pro.restful.api.md
+++ b/en_US/faq/2-iredadmin-pro.restful.api.md
@@ -121,7 +121,7 @@ Parameter Name | Summary | Sample Usage
`cn` | display name | `cn=My List Name`
`accessPolicy` | Defines who can send email to this mail alias account | `accessPolicy=public`
-> Note: `accessPolicy` for mail alias account is available for only SQL backends.
+> Note: `accessPolicy` for mail alias account is only available for SQL backends.
### Throttling
diff --git a/en_US/integrations/active.directory.md b/en_US/integrations/active.directory.md
index 97245d1d..1b6b10bf 100644
--- a/en_US/integrations/active.directory.md
+++ b/en_US/integrations/active.directory.md
@@ -91,24 +91,24 @@ If it prints all users stored in AD server, then it's working as expected.
Disable unused iRedMail special settings:
```shell
-# postconf -e virtual_alias_maps=''
-# postconf -e sender_bcc_maps=''
-# postconf -e recipient_bcc_maps=''
-# postconf -e relay_domains=''
-# postconf -e relay_recipient_maps=''
+postconf -e virtual_alias_maps=''
+postconf -e sender_bcc_maps=''
+postconf -e recipient_bcc_maps=''
+postconf -e relay_domains=''
+postconf -e relay_recipient_maps=''
```
Add your mail domain name in `smtpd_sasl_local_domain` and `virtual_mailbox_domains`:
```shell
-# postconf -e smtpd_sasl_local_domain='example.com'
-# postconf -e virtual_mailbox_domains='example.com'
+postconf -e smtpd_sasl_local_domain='example.com'
+postconf -e virtual_mailbox_domains='example.com'
```
Change transport maps setting:
```
-# postconf -e transport_maps='hash:/etc/postfix/transport'
+postconf -e transport_maps='hash:/etc/postfix/transport'
```
Enable AD query. __Note__: We will create these 3 files later.
@@ -116,19 +116,19 @@ Enable AD query. __Note__: We will create these 3 files later.
* Verify SMTP senders
```shell
-# postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
+postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
```
* Verify local mail users
```shell
-# postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
+postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
```
* Verify local mail lists/groups.
```
-# postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
+postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
```
* Create/edit file: `/etc/postfix/transport`.
diff --git a/en_US/upgrade/0-upgrade.sogo.2.to.3.md b/en_US/upgrade/0-upgrade.sogo.2.to.3.md
index af0f8b4f..89434c8f 100644
--- a/en_US/upgrade/0-upgrade.sogo.2.to.3.md
+++ b/en_US/upgrade/0-upgrade.sogo.2.to.3.md
@@ -15,7 +15,7 @@ below.
* Backup config files first:
```
-mkdir /root/sogo-backup/{sogo,sysconfig}
+mkdir -p /root/sogo-backup/{sogo,sysconfig}
cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/
```
@@ -51,7 +51,7 @@ service sogod restart
* Backup config files first:
```
-mkdir /root/sogo-backup/{sogo,default}
+mkdir -p /root/sogo-backup/{sogo,default}
cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/default/sogo /root/sogo-backup/default/
```
diff --git a/html/active.directory.html b/html/active.directory.html
index 6db4541c..8bbc6ba0 100644
--- a/html/active.directory.html
+++ b/html/active.directory.html
@@ -120,39 +120,39 @@ Enter password: password_of_vmail
If it prints all users stored in AD server, then it's working as expected.
Enable LDAP query with AD in Postfix
Disable unused iRedMail special settings:
-# postconf -e virtual_alias_maps=''
-# postconf -e sender_bcc_maps=''
-# postconf -e recipient_bcc_maps=''
-# postconf -e relay_domains=''
-# postconf -e relay_recipient_maps=''
+postconf -e virtual_alias_maps=''
+postconf -e sender_bcc_maps=''
+postconf -e recipient_bcc_maps=''
+postconf -e relay_domains=''
+postconf -e relay_recipient_maps=''
Add your mail domain name in smtpd_sasl_local_domain
and virtual_mailbox_domains
:
-# postconf -e smtpd_sasl_local_domain='example.com'
-# postconf -e virtual_mailbox_domains='example.com'
+postconf -e smtpd_sasl_local_domain='example.com'
+postconf -e virtual_mailbox_domains='example.com'
Change transport maps setting:
-# postconf -e transport_maps='hash:/etc/postfix/transport'
+postconf -e transport_maps='hash:/etc/postfix/transport'
Enable AD query. Note: We will create these 3 files later.
-# postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
+postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
-# postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
+postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
- Verify local mail lists/groups.
-# postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
+postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
diff --git a/html/upgrade.sogo.2.to.3.html b/html/upgrade.sogo.2.to.3.html
index 94a0a36f..6d61b055 100644
--- a/html/upgrade.sogo.2.to.3.html
+++ b/html/upgrade.sogo.2.to.3.html
@@ -34,7 +34,7 @@ below.
- Backup config files first:
-mkdir /root/sogo-backup/{sogo,sysconfig}
+mkdir -p /root/sogo-backup/{sogo,sysconfig}
cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/
@@ -69,7 +69,7 @@ cp /root/sogo-backup/sysconfig/sogo /etc/sysconfig/
- Backup config files first:
-mkdir /root/sogo-backup/{sogo,default}
+mkdir -p /root/sogo-backup/{sogo,default}
cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/default/sogo /root/sogo-backup/default/