aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xMailman/Defaults.py.in8
-rwxr-xr-xmessages/ja/doc/Defaults.py.in2
2 files changed, 6 insertions, 4 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 63a8e99f..5e158e5b 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -145,12 +145,14 @@ RECAPTCHA_SECRET_KEY = None
# GLOBAL_BAN_LIST = ['xxx@aol\.com', '^yyy.*@gmail\.com$']
GLOBAL_BAN_LIST = []
-# IF the following is set to Yes, and a web subscribe comes from an IPv4
+# If the following is set to Yes, and a web subscribe comes from an IPv4
# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
-# will be blocked.
+# will be blocked. It will work with IPv6 addresses if Python's py2-ipaddress
+# module is installed. The module can be installed via pip if not included
+# in your Python.
BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
-# IF the following is set to Yes, and a subscriper uses a domain that is
+# If the following is set to Yes, and a subscriber uses a domain that is
# listed in the Spamhaus DBL, the subscription will be blocked.
BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE = No
diff --git a/messages/ja/doc/Defaults.py.in b/messages/ja/doc/Defaults.py.in
index dd6fb9ae..e429a1f9 100755
--- a/messages/ja/doc/Defaults.py.in
+++ b/messages/ja/doc/Defaults.py.in
@@ -20,7 +20,7 @@
# [����] ���Υե�����ϡ�Mailman 2.1.27 ����ʪ�˴ޤޤ��
# Mailman/Defaults.py.in (launchpad.net �ǤΥե������ Bazaar
-# ��ӥ����� 1770) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
+# ��ӥ����� 1792) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
# �������ξ��ϸ�ʸ��Ʊ�͡�GNU ���̸������ѵ�������� (GNU
# General Public License) �˽����ޤ� (�嵭�⻲�Ȥ�������)�����Ƥ�
# ���Τ�����Τ���ˤϡ�����ʪ�˴ޤޤ�븶ʸ�򻲾Ȥ���뤳�Ȥ�