diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-07-12 16:30:58 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-07-12 16:30:58 +0900 |
| commit | b7cac94e47bbbf18462f02ea57097aaa4f7b9ce7 (patch) | |
| tree | 00d3b5d4774e19498c2d79be92ef971e84e80b00 | |
| parent | 87ea2ac1031e2f871235f77b716bde1b71f3204b (diff) | |
| parent | 7714812f387346277d6cf10e2ff50488347421a4 (diff) | |
| download | mailman2-b7cac94e47bbbf18462f02ea57097aaa4f7b9ce7.tar.gz mailman2-b7cac94e47bbbf18462f02ea57097aaa4f7b9ce7.tar.xz mailman2-b7cac94e47bbbf18462f02ea57097aaa4f7b9ce7.zip | |
merge lp:mailman/2.1 rev 1792
| -rwxr-xr-x | Mailman/Defaults.py.in | 8 | ||||
| -rwxr-xr-x | messages/ja/doc/Defaults.py.in | 2 |
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) に従います (上記も参照ください)。内容の # 正確な理解のためには、配布物に含まれる原文を参照されることを |