===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Attic/spamd.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/etc/Attic/spamd.conf	2005/06/05 13:51:39	1.14
--- src/etc/Attic/spamd.conf	2005/06/06 16:03:33	1.15
***************
*** 1,4 ****
! # $OpenBSD: spamd.conf,v 1.14 2005/06/05 13:51:39 jmc Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
--- 1,4 ----
! # $OpenBSD: spamd.conf,v 1.15 2005/06/06 16:03:33 jmc Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
***************
*** 66,79 ****
  	:method=http:\
  	:file=www.openbsd.org/spamd/koreacidr.txt.gz:
  
- # Whitelists are done like this, and must be added to "all" after each
- # blacklist from which you want the addresses in the whitelist removed.
- #
- #whitelist:\
- #	:white:\
- #	:method=file:\
- #	:file=/var/mail/whitelist.txt:
- 
  #relaydb-black:\
  #	:black:\
  #	:msg="SPAM. Your address %A is in my relaydb list.":\
--- 66,71 ----
***************
*** 84,86 ****
--- 76,86 ----
  #	:white:\
  #	:method=exec:\
  #	:file=relaydb -4lw:
+ 
+ # Whitelists are done like this, and must be added to "all" after each
+ # blacklist from which you want the addresses in the whitelist removed.
+ #
+ #whitelist:\
+ #	:white:\
+ #	:method=file:\
+ #	:file=/var/mail/whitelist.txt: