From 2fecb60896b2f48fe9d2cfee503dc89425e64e7c Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Wed, 6 Dec 2017 10:14:53 +0800
Subject: [PATCH] Typo.
---
en_US/howto/manage.iredapd.md | 12 ++++++++----
html/manage.iredapd.html | 10 +++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/en_US/howto/manage.iredapd.md b/en_US/howto/manage.iredapd.md
index d055b6df..e3f0b20e 100644
--- a/en_US/howto/manage.iredapd.md
+++ b/en_US/howto/manage.iredapd.md
@@ -177,8 +177,12 @@ White/blacklisting is controlled by plugin `amavisd_wblist` (file
```
# python wblist_admin.py --list --whitelist
# python wblist_admin.py --list --blacklist
-# python wblist_admin.py --add --whitelist 192.168.1.10 user@domain.com
-# python wblist_admin.py --add --blacklist 172.16.1.10 user@domain.com
+
+# Whitelist IP address, email address, entire domain, subdomain (including main domain)
+# python wblist_admin.py --add --whitelist 192.168.1.10 user@domain.com @iredmail.org @.example.com
+
+# Blacklist IP address, email address, entire domain, subdomain (including main domain)
+# python wblist_admin.py --add --blacklist 202.96.134.133 bad-user@domain.com @bad-domain.com @.sub-domain.com
```
* For per-user or per-domain whitelists and blacklists, please use option
@@ -265,7 +269,7 @@ Greylisting is controlled by plugin `greylisting` (file
--to
Manage greylisting setting from email which is sent from
to .
-
+
Valid formats for both and :
- a single user: username@domain.com
@@ -396,7 +400,7 @@ domain names like above sample.
Since iRedAPD-1.8.0, we have SQL table `iredapd.greylisting_whitelist_domains`
to store these mail domain names. if you run `spf_to_greylist_whitelists.py`
-without any argument, it will fetch all mail domains stored in sql table
+without any argument, it will fetch all mail domains stored in sql table
`greylisting_whitelist_domains` instead of fetching from command line arguments.
```
diff --git a/html/manage.iredapd.html b/html/manage.iredapd.html
index ef58c492..364679d1 100644
--- a/html/manage.iredapd.html
+++ b/html/manage.iredapd.html
@@ -204,8 +204,12 @@ parameter plugins =
:
# python wblist_admin.py --list --whitelist
# python wblist_admin.py --list --blacklist
-# python wblist_admin.py --add --whitelist 192.168.1.10 user@domain.com
-# python wblist_admin.py --add --blacklist 172.16.1.10 user@domain.com
+
+# Whitelist IP address, email address, entire domain, subdomain (including main domain)
+# python wblist_admin.py --add --whitelist 192.168.1.10 user@domain.com @iredmail.org @.example.com
+
+# Blacklist IP address, email address, entire domain, subdomain (including main domain)
+# python wblist_admin.py --add --blacklist 202.96.134.133 bad-user@domain.com @bad-domain.com @.sub-domain.com
@@ -405,7 +409,7 @@ option.
domain names like above sample.
Since iRedAPD-1.8.0, we have SQL table iredapd.greylisting_whitelist_domains
to store these mail domain names. if you run spf_to_greylist_whitelists.py
-without any argument, it will fetch all mail domains stored in sql table
+without any argument, it will fetch all mail domains stored in sql table
greylisting_whitelist_domains
instead of fetching from command line arguments.
# python spf_to_greylist_whitelists.py