Merge authors:
  Yasuhito FUTATSUKI at POEM (futatuki)
Related merge proposals:
  https://code.launchpad.net/~futatuki/mailman/fix-Defaults.py/+merge/349388
  proposed by: Yasuhito FUTATSUKI at POEM (futatuki)
------------------------------------------------------------
revno: 1792 [merge]
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Wed 2018-07-11 20:14:02 -0700
message:
  Added a bit of doc and fixed typos in Defaults.py.in.
modified:
  Mailman/Defaults.py.in


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in	2018-06-13 08:22:47 +0000
+++ Mailman/Defaults.py.in	2018-07-12 03:14:02 +0000
@@ -145,12 +145,14 @@
 # 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
 

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to