[Spambayes-checkins] website donations.ht, 1.3, 1.4 faq.txt, 1.24, 1.25 links.h, 1.9, 1.10

Thu Aug 7 00:23:53 EDT 2003

Update of /cvsroot/spambayes/website
In directory sc8-pr-cvs1:/tmp/cvs-serv5472

Modified Files:
	donations.ht faq.txt links.h 
Log Message:
Change the FAQ re donations etc, move a little of Tim's text from the
FAQ into the donations page, and add a 'donate' link to the nav bar.


Index: donations.ht
===================================================================
RCS file: /cvsroot/spambayes/website/donations.ht,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** donations.ht	7 Aug 2003 00:51:39 -0000	1.3
--- donations.ht	7 Aug 2003 06:23:51 -0000	1.4
***************
*** 48,53 ****
  earmarked specifically for the SpamBayes project.  In the future, the PSF
  may make additional funds available for SpamBayes, for some other worthy
! Open Source project, or for some other purpose within its charter.  You
! may like to read the
  <a href="http://www.python.org/psf/mission.html">PSF Mission Statement</a>
  for more details.</p>
--- 48,61 ----
  earmarked specifically for the SpamBayes project.  In the future, the PSF
  may make additional funds available for SpamBayes, for some other worthy
! Open Source project, or for some other purpose within its charter.</p>
! 
! <p>Open Source has a great history of producing fine code,
! but less so when it comes to performing the kinds of research required
! for these kinds of projects (research on statistical algorithms is 
! time-consuming and tedious, and there's no a priori guarantee of success).
! One thing the PSF hopes to do in coming years is fund the core research
! needed to springboard these kinds of projects.</p>
! 
! <p>You may like to read the
  <a href="http://www.python.org/psf/mission.html">PSF Mission Statement</a>
  for more details.</p>

Index: faq.txt
===================================================================
RCS file: /cvsroot/spambayes/website/faq.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** faq.txt	4 Aug 2003 07:51:14 -0000	1.24
--- faq.txt	7 Aug 2003 06:23:51 -0000	1.25
***************
*** 58,61 ****
--- 58,86 ----
  filters (to file away suspected spam into its own mail folder, for example).
  
+ What is the license? How much does it cost? Can I pay anyway?
+ -------------------------------------------------------------
+ 
+ SpamBayes is free and open-source - there is no charge.  The software
+ is released under `the PSA license`_.
+ 
+ If you really feel that your life would be incomplete without giving 
+ something back to the project, you have a few options:
+ 
+ * Donate you time to help improve the project.  This includes many 
+   items that do not require much in the way of technical skills.  See
+   the `I'm not a programmer but still want to help`_ question for more 
+   details.
+ 
+ * Dontate money to the Python Software Foundations.  For more 
+   information, including why you would want to donate to the PSF,
+   please see our `donations page`_.
+ 
+ * Investigate some of the commercial programs based on the SpamBayes code.
+   This should give you some additional benefits like support or greater 
+   ease-of-use.
+ 
+ .. _the PSA license: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spambayes/spambayes/LICENSE.txt
+ .. _I'm not a programmer but still want to help: #i-m-not-a-programmer-but-want-to-help-out-what-can-i-do
+ .. _donations page: donations.html
  
  What online resources are available?
***************
*** 735,766 ****
  numbers (3 and 12) were determined by brute force testing, and produced the
  best overall results (including compared to no upper or lower limits).
- 
- 
- Do I have to pay for SpamBayes?  Can I pay you money if I really want to?
- -------------------------------------------------------------------------
- 
- SpamBayes is free and open-source - there is no charge, and we really
- aren't interested in your money (on the other hand, if you want to donate
- time towards testing, documenting or development - please sign up!).
- 
- If you really feel that your life would be incomplete without giving some
- money towards the project, you have a couple of options.  There are some
- commercial programs that are based on the SpamBayes code, so you could
- purchase one of those; this should give you some additional benefits like
- support or greater ease-of-use as well.
- 
- The employer of one of the project's
- founders (Tim Peters) paid for the initial research and coding on the
- SpamBayes project.  Open source does very well at the latter but not so
- well at the former (research on statistical algorithms is time-consuming
- and tedious, and there's no a priori guarantee of success).  One thing the
- `Python Software Foundation (PSF)`_ hopes to do in coming years is fund
- core research -- but last time they worked out the details, it seemed to
- require some funds first <wink>.  Therefore, if you'd rather contribute
- closer to the SpamBayes source, the PSF would be the most appropriate place
- to invest your life's savings.
- 
- .. _Python Software Foundation (PSF): http://www.python.org/psf/donations.html
- 
  
  I'm not a programmer, but want to help out - what can I do?
--- 760,763 ----

Index: links.h
===================================================================
RCS file: /cvsroot/spambayes/website/links.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** links.h	23 May 2003 03:08:37 -0000	1.9
--- links.h	7 Aug 2003 06:23:51 -0000	1.10
***************
*** 6,9 ****
--- 6,10 ----
  <li><a href="developer.html">Developers</a>
  <li><a href="related.html">Related</a>
+ <li><a href="donations.html">Donate</a>
  <h3>Platforms</h3>
  <li><a href="windows.html">Windows</a>