From 73da0309fc9857ae153ef112a8731018ba9e2368 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Tue, 11 Aug 2020 19:34:25 +0800
Subject: [PATCH] Mention '@.com' as top level domain.
---
en_US/howto/manage.iredapd.md | 1 +
en_US/iredmail-easy/8-migrate.to.iredmail.easy.md | 9 ++++-----
html/manage.iredapd.html | 1 +
html/migrate.to.iredmail.easy.html | 9 ++++-----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/en_US/howto/manage.iredapd.md b/en_US/howto/manage.iredapd.md
index dc1dea3e..df16230a 100644
--- a/en_US/howto/manage.iredapd.md
+++ b/en_US/howto/manage.iredapd.md
@@ -152,6 +152,7 @@ White/blacklisting is controlled by plugin `amavisd_wblist` (file
- a single user: username@domain.com
- a single domain: @domain.com
- entire domain and all its sub-domains: @.domain.com
+ - top-level domain: @.com
- anyone: @. (the ending dot is required)
if no '--account' argument, defaults to '@.' (anyone).
diff --git a/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md b/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
index d34079cd..362187ca 100644
--- a/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
+++ b/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
@@ -19,15 +19,14 @@ For more details about iRedMail Easy platform, please
## Requirements
-- A working iRedMail server which was deployed with the downlodable installer
- `iRedMail-1.2`, or has been successfully upgraded to the latest
- iRedMail-1.2 release.
+- A working iRedMail server which was deployed with or upgraded to the latest
+ iRedMail release.
- Your iRedMail server must be running one of supported Linux/OpenBSD
distribution releases:
- - Ubuntu 18.04 LTS
+ - Ubuntu 18.04 LTS, 20.04 LTS
- Debian 9, 10
- CentOS 7, 8
- - OpenBSD 6.6
+ - OpenBSD 6.7
Unfortunately, FreeBSD is not supported by iRedMail Easy platform.
diff --git a/html/manage.iredapd.html b/html/manage.iredapd.html
index c138121c..7f6bd482 100644
--- a/html/manage.iredapd.html
+++ b/html/manage.iredapd.html
@@ -179,6 +179,7 @@ parameter plugins =
:
- a single user: username@domain.com
- a single domain: @domain.com
- entire domain and all its sub-domains: @.domain.com
+ - top-level domain: @.com
- anyone: @. (the ending dot is required)
if no '--account' argument, defaults to '@.' (anyone).
diff --git a/html/migrate.to.iredmail.easy.html b/html/migrate.to.iredmail.easy.html
index 89adcb8f..b5673b97 100644
--- a/html/migrate.to.iredmail.easy.html
+++ b/html/migrate.to.iredmail.easy.html
@@ -57,15 +57,14 @@ iRedMail Team quickly.
check our website.
Requirements
-- A working iRedMail server which was deployed with the downlodable installer
-
iRedMail-1.2
, or has been successfully upgraded to the latest
- iRedMail-1.2 release.
+- A working iRedMail server which was deployed with or upgraded to the latest
+ iRedMail release.
- Your iRedMail server must be running one of supported Linux/OpenBSD
distribution releases:
-- Ubuntu 18.04 LTS
+- Ubuntu 18.04 LTS, 20.04 LTS
- Debian 9, 10
- CentOS 7, 8
-- OpenBSD 6.6
+- OpenBSD 6.7