[Spambayes-checkins] spambayes/spambayes Options.py,1.125,1.126

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7716/spambayes

Modified Files:
	Options.py 
Log Message:
Handle setting notate options to none.

Fix typo.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** Options.py	14 Nov 2005 22:39:13 -0000	1.125
--- Options.py	15 Nov 2005 00:30:34 -0000	1.126
***************
*** 734,743 ****
       spam messages; simply tick the boxes of the classifications take
       should be identified in this fashion."""),
!      (_("ham"), _("spam"), _("unsure")), RESTORE),
  
      ("notate_subject", _("Classify in subject: header"), (),
       _("""This option will add the same information as 'Notate To',
       but to the start of the mail subject line."""),
!      (_("ham"), _("spam"), _("unsure")), RESTORE),
    ),
  
--- 734,743 ----
       spam messages; simply tick the boxes of the classifications take
       should be identified in this fashion."""),
!      ((), _("ham"), _("spam"), _("unsure")), RESTORE),
  
      ("notate_subject", _("Classify in subject: header"), (),
       _("""This option will add the same information as 'Notate To',
       but to the start of the mail subject line."""),
!      ((), _("ham"), _("spam"), _("unsure")), RESTORE),
    ),
  
***************
*** 782,786 ****
  
      ("retrieval_timeout", _("Retrieval timeout"), 30,
!      _("""When proxying mesasges, time out after this length of time if
       all the headers have been received.  The rest of the mesasge will
       proxy straight through.  Some clients have a short timeout period,
--- 782,786 ----
  
      ("retrieval_timeout", _("Retrieval timeout"), 30,
!      _("""When proxying messages, time out after this length of time if
       all the headers have been received.  The rest of the mesasge will
       proxy straight through.  Some clients have a short timeout period,
***************
*** 872,875 ****
--- 872,923 ----
    ),
  
+   # imap4proxy settings: The only mandatory option is imap4proxy_servers, eg.
+   # "imap4.my-isp.com:143", or a comma-separated list of those.  The ":143"
+   # is optional.  If you specify more than one server in imap4proxy_servers,
+   # you must specify the same number of ports in imap4proxy_ports.
+   "imap4proxy" : (
+     ("remote_servers", _("Remote Servers"), (),
+      _("""The SpamBayes IMAP4 proxy intercepts incoming email and classifies
+      it before sending it on to your email client.  You need to specify
+      which IMAP4 server(s) you wish it to intercept - a IMAP4 server
+      address typically looks like "mail.myisp.net".  If you use more than
+      one server, simply separate their names with commas.  You can get
+      these server names from your existing email configuration, or from
+      your ISP or system administrator.  If you are using Web-based email,
+      you can't use the SpamBayes IMAP4 proxy (sorry!).  In your email
+      client's configuration, where you would normally put your IMAP4 server
+      address, you should now put the address of the machine running
+      SpamBayes."""),
+      SERVER, DO_NOT_RESTORE),
+ 
+     ("listen_ports", _("SpamBayes Ports"), (),
+      _("""Each IMAP4 server that is being monitored must be assigned to a
+      'port' in the SpamBayes IMAP4 proxy.  This port must be different for
+      each monitored server, and there must be a port for each monitored
+      server.  Again, you need to configure your email client to use this
+      port.  If there are multiple servers, you must specify the same number
+      of ports as servers, separated by commas. If you don't know what to
+      use here, and you only have one server, try 143, or if that doesn't
+      work, try 8143."""),
+      SERVER, DO_NOT_RESTORE),
+ 
+     ("allow_remote_connections", _("Allowed remote IMAP4 connections"), "localhost",
+      _("""Enter a list of trusted IPs, separated by commas. Remote IMAP
+      connections from any of them will be allowed. You can trust any
+      IP using a single '*' as field value. You can also trust ranges of
+      IPs using the '*' character as a wildcard (for instance 192.168.0.*).
+      The localhost IP will always be trusted. Type 'localhost' in the
+      field to trust this only address."""),
+      IP_LIST, RESTORE),
+ 
+     ("use_ssl", "Connect via a secure socket layer", False,
+      """Use SSL to connect to the server. This allows spambayes to connect
+      without sending data in plain text.
+ 
+      Note that this does not check the server certificate at this point in
+      time.""",
+      (False, True, "automatic"), DO_NOT_RESTORE),
+   ),
+ 
    "html_ui" : (
      ("port", _("Port"), 8880,