elmau
/
iredmail-doc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Typo: addition xxx -> additional xxx.

This commit is contained in:
Zhang Huangbin 2015-01-05 00:17:26 +08:00
parent 8b9c8b5e06
commit d6ab9dd942
13 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
USAGE.md
View File

@ -5,12 +5,12 @@
complex/unnecessary way to order them.
* Chapter title is defined in file `_title.md` under chapter folder.
* Chapter summary is defined in file `_summary.md` under chapter folder.
* Addition links stored in file `_links.md` will be appended to chapter.
* Additional links stored in file `_links.md` will be appended to chapter.
```
- chapter_name_1/
|- _title.md: Chapter title. REQUIRED
|- _links.md: Addition links, will be appended to chapter. OPTIONAL
|- _links.md: Additional links, will be appended to chapter. OPTIONAL
|- _summary.md: Summary text of this chapter, will be displayed under
chapter title. OPTIONAL
|- what_is_iredmail.md

4
faq/file.locations.md
View File

@ -81,7 +81,7 @@ Main config files are `nginx.conf` and `default.conf`.
Main config file is `dovecot.conf`. It contains most configurations.
Addition config files:
Additional config files:
* `dovecot-ldap.conf`: used to query mail users and passwords. LDAP backends only.
* `dovecot-mysql.conf`: used to query mail users and passwords. MySQL/MariaDB backends only.
@ -104,7 +104,7 @@ Addition config files:
* on RHEL/CentOS: it's `/etc/amavisd/amavisd.conf`.
* on Debian/Ubuntu: it's `/etc/amavis/conf.d/50-user`.
Debian/Ubuntu have some addition config files under `/etc/amavis/conf.d/`,
Debian/Ubuntu have some additional config files under `/etc/amavis/conf.d/`,
but you can always override them in `/etc/amavis/conf.d/50-user`.
When we mention `amavisd.conf` in other documents, it always means `50-user`
on Debian/Ubuntu.

8
howto/ldap.add.alias.domain.md
View File

@ -28,11 +28,11 @@ show detailed LDAP attributes/values of this domain in right panel.
* Add a new LDAP attribute `domainAliasName` to this domain account, set value
to the alias domain (e.g. `domain.com`). Save your change.
Now you should add addition mail address for all mail users, lists, aliases.
For example, if you have mail user `user@example.com`, you should add addition
Now you should add additional mail address for all mail users, lists, aliases.
For example, if you have mail user `user@example.com`, you should add additional
email address `user@domain.ltd` for this user. Steps:
* Find the LDAP object of mail account which you want to add addition email
* Find the LDAP object of mail account which you want to add additional email
address in left panel of phpLDAPadmin, for example, user `user@example.com`,
click the ldap object, phpLDAPadmin will show detailed LDAP attributes/values
in right panel.
@ -44,4 +44,4 @@ original email address.
* Save your change.
If you have several mail accounts (mail users, lists, aliases), you have to
add addition email address for them all.
add additional email address for them all.

3
howto/ldap.user.mail.forwarding.md
View File

@ -34,5 +34,6 @@ value to first forwarding address `forward@domain.ltd`.
Now all emails sent to `user@domain.ltd` will be forwarded to both
`forward@domain.ltd` and `user@gmail.com`.
If you want to save a copy of forwarded email, please add 'user@domain.ltd' as addition value of LDAP attribute 'mailForwardingAddress'.
If you want to save a copy of forwarded email, please add `user@domain.ltd` as
additional value of LDAP attribute `mailForwardingAddress`.

2
installation/3-install.iredmail.on.freebsd.md
View File

@ -17,7 +17,7 @@ and it may be not working as expected.
To install iRedMail on FreeBSD, you need:
* A __FRESH__, minimal, working FreeBSD system, no addition ports or binary
* A __FRESH__, minimal, working FreeBSD system, no additional ports or binary
packages were installed. Supported releases are listed on
[Download](../download.html) page.
* At least `1 GB` of memory is required for low traffic production server.

2
migrations/migrate.to.new.iredmail.server.md
View File

@ -27,7 +27,7 @@ programs (e.g. Outlook, Thunderbird) to use TLS connection.
* For IMAP service, use port `143` with `STARTTLS` (or `TLS`).
* For POP3 service, use port `110` with `STARTTLS` (or `TLS`).
Addition notes:
Additional notes:
* If you want to enable smtp authentication on port `25` (again, not
recommended), please comment out Postfix parameter `smtpd_tls_auth_only = yes`

2
upgrade/0-migrate.or.upgrade.iredadmin.md
View File

@ -56,7 +56,7 @@ example, please replace x.y.z by the real file name. For example,
That's all. If it doesn't work for you, please post a new topic in our
[online support forum](http://www.iredmail.org/forum/).
## Addition steps
## Additional steps
* To quarantine SPAM/Virus into SQL database and manage them with
iRedAdmin-Pro, please follow this tutorial to update Amavisd settings:

2
upgrade/0-upgrade.iredmail.0.5.0-0.5.1.md
View File

@ -72,7 +72,7 @@ NOTE: Policyd database name is `policyd` (on RHEL/CentOS) or `postfixpolicyd`
```
NOTE: New LDAP schema provides several new attributes, but it's backwards
compatibility, it's __SAFE__ to replace the old one without addition operations.
compatibility, it's __SAFE__ to replace the old one without additional operations.
### Use proxymap to improve performance and reliability under high load.

8
upgrade/0-upgrade.iredmail.0.5.1-0.6.0.md
View File

@ -280,7 +280,7 @@ $rcmail_config['plugins'] = array("password", "managesieve",);
### Upgrade phpMyAdmin to 2.11.10
phpMyAdmin doesn't require addition config, you can simply download new version
phpMyAdmin doesn't require additional config, you can simply download new version
and copy old config file into new version.
* Download new version and uncompress it:
@ -331,7 +331,7 @@ and copy old config file into new version.
### Use newest schema file
NOTE: New LDAP schema provides several new attributes, but it's backwards
compatibility, it's __SAFE__ to replace the old one without addition operations.
compatibility, it's __SAFE__ to replace the old one without additional operations.
To use the newest iRedMail ldap schem file, we have to:
* Download the newest iRedMail ldap schema file
@ -419,7 +419,7 @@ index shadowAddress eq,pres,sub
```
If `shadowAddress` already exists in `slapd.conf`, you don't need to do
addition operations. If you add them now, you have to initially index this
additional operations. If you add them now, you have to initially index this
attribute manually now.
* Stop OpenLDAP service first.
@ -639,7 +639,7 @@ $rcmail_config['password_ldap_force_replace'] = false;
### Upgrade phpLDAPadmin to 1.2.0.5
phpLDAPadmin doesn't require addition config, you can simply download new
phpLDAPadmin doesn't require additional config, you can simply download new
version and copy sample config file to make it work.
* Download new version and uncompress it:

6
upgrade/0-upgrade.iredmail.0.8.3-0.8.4.md
View File

@ -186,7 +186,7 @@ query_filter = (&(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s
Restarting Postfix service is required.
### Create addition SQL index for Amavisd database
### Create additional SQL index for Amavisd database
We need one new SQL index for Amavisd database, it's used to speed up
performance of viewing quarantined mails.
@ -240,7 +240,7 @@ Multiple senders/recipients must be separated by comma, for example:
sql> INSERT INTO mailbox SET allowedsenders='@gmail.com,user@example.com';
```
### Create addition SQL index for Amavisd database
### Create additional SQL index for Amavisd database
We need one new SQL index for Amavisd database, it's used to speed up
performance of viewing quarantined mails.
@ -297,7 +297,7 @@ Multiple senders/recipients must be separated by comma, for example:
sql> INSERT INTO mailbox SET allowedsenders='@gmail.com,user@example.com';
```
### Create addition SQL index for Amavisd database
### Create additional SQL index for Amavisd database
We need one new SQL index for Amavisd database, it's used to speed up
performance of viewing quarantined mails.

2
upgrade/0-upgrade.iredmail.0.8.4-0.8.5.md
View File

@ -138,7 +138,7 @@ access to attrs="memberOfGroup,employeeNumber,..."
### Support assigning mail list/alias as member of another mailing list
* Open Postfix ldap lookup file `/etc/postfix/ldap/virtual_group_maps.cf` (or `/usr/local/etc/postfix/ldap/virtual_group_maps.cf` on FreeBSD), update the value of `query_filter` parameter to add addition LDAP objectclasses:
* Open Postfix ldap lookup file `/etc/postfix/ldap/virtual_group_maps.cf` (or `/usr/local/etc/postfix/ldap/virtual_group_maps.cf` on FreeBSD), update the value of `query_filter` parameter to add additional LDAP objectclasses:
```
# Part of file: /etc/postfix/ldap/virtual_group_maps.cf

14
upgrade/0-upgrade.iredmail.0.8.6-0.8.7.md
View File

@ -12,8 +12,8 @@
* 2014-02-20:
* Enable Dovecot LMTP service for local mail delivery.
* [OpenLDAP] Add new value for existing mail users: enabledService=lmtp.
* [MySQL/PostgreSQL] Create one addition SQL column in vmail database: mailbox.enablelmtp.
* 2014-02-19: Create addition SQL columns in vmail database: mailbox.settings, admin.settings, alias.islist.
* [MySQL/PostgreSQL] Create one additional SQL column in vmail database: mailbox.enablelmtp.
* 2014-02-19: Create additional SQL columns in vmail database: mailbox.settings, admin.settings, alias.islist.
## General (All backends should apply these steps)
@ -114,7 +114,7 @@ Before we go further, there're some questions we have to answer:
Search "dovecot lda vs lmtp" in Google will give you more detailed info and debate.
__NOTE__: On Debian or Ubuntu, you have to install one addition package before
__NOTE__: On Debian or Ubuntu, you have to install one additional package before
we go further: `dovecot-lmtpd`.
```
@ -314,9 +314,9 @@ That's all.
We need 5 new SQL columns in `vmail` database:
* `mailbox.enablelmtp`: used by Dovecot LMTP server.
* `mailbox.settings`: used to store addition per-user settings, default value is empty. Used in iRedAdmin-Pro.
* `mailbox.settings`: used to store additional per-user settings, default value is empty. Used in iRedAdmin-Pro.
* `domain.settings`: used to store per-domain settings, default is empty. Used in iRedAdmin-Pro.
* `admin.settings`: used to store addition per-admin settings, default value is empty. Used in iRedAdmin-Pro.
* `admin.settings`: used to store additional per-admin settings, default value is empty. Used in iRedAdmin-Pro.
* `alias.islist`: used to mark a sql record is a mail list account, default value is `0` (means not a mail list account). This helps avoid complex SQL queries.
Some existing columns in table `vmail.domain` are not needed anymore, they will
@ -367,9 +367,9 @@ mysql> ALTER TABLE domain DROP disableduserprofiles;
We need 5 new SQL columns in `vmail` database:
* `mailbox.enablelmtp`: used by Dovecot LMTP server.
* `mailbox.settings`: used to store addition per-user settings, default value is empty. Used in iRedAdmin-Pro.
* `mailbox.settings`: used to store additional per-user settings, default value is empty. Used in iRedAdmin-Pro.
* `domain.settings`: used to store per-domain settings, default is empty. Used in iRedAdmin-Pro.
* `admin.settings`: used to store addition per-admin settings, default value is empty. Used in iRedAdmin-Pro.
* `admin.settings`: used to store additional per-admin settings, default value is empty. Used in iRedAdmin-Pro.
* `alias.islist`: used to mark a sql record is a mail list account, default value is `0` (means not a mail list account). This helps avoid complex SQL queries.
Some existing columns in table `vmail.domain` are not needed anymore, they will

6
upgrade/0-upgrade.iredmail.0.8.7-0.9.0.md
View File

@ -221,7 +221,7 @@ CRON=1
Please open file `/etc/postfix/ldap/transport_maps_domain.cf` (on Linux/OpenBSD)
or `/usr/local/etc/postfix/ldap/transport_maps_domain.cf` (on FreeBSD), add
addition LDAP filter `(!(domainBackupMX=yes))` in `query =` parameter:
additional LDAP filter `(!(domainBackupMX=yes))` in `query =` parameter:
```
# Part of file: /etc/postfix/ldap/transport_maps_domain.cf
@ -292,7 +292,7 @@ mysql> CREATE INDEX msgs_idx_spam_level ON msgs (spam_level);
Please open file `/etc/postfix/mysql/transport_maps_domain.cf` (on Linux/OpenBSD)
or `/usr/local/etc/postfix/mysql/transport_maps_domain.cf` (on FreeBSD), add
addition SQL statement `AND backupmx=0` in `query =` parameter:
additional SQL statement `AND backupmx=0` in `query =` parameter:
```
# Part of file: /etc/postfix/mysql/transport_maps_domain.cf
@ -335,7 +335,7 @@ mysql> CREATE INDEX msgs_idx_spam_level ON msgs (spam_level);
Please open file `/etc/postfix/pgsql/transport_maps_domain.cf` (on Linux/OpenBSD)
or `/usr/local/etc/postfix/pgsql/transport_maps_domain.cf` (on FreeBSD), add
addition SQL statement `AND backupmx=0` in `query =` parameter:
additional SQL statement `AND backupmx=0` in `query =` parameter:
```
# Part of file: /etc/postfix/pgsql/transport_maps_domain.cf