svn commit: samba-web r1166 - in trunk: .

[tridge at samba.org]

Author: tridge
Date: 2007-12-24 21:18:06 +0000 (Mon, 24 Dec 2007)
New Revision: 1166

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1166

Log:
update donations page

Modified:
   trunk/donations.html


Changeset:
Modified: trunk/donations.html
===================================================================
--- trunk/donations.html	2007-12-23 18:14:18 UTC (rev 1165)
+++ trunk/donations.html	2007-12-24 21:18:06 UTC (rev 1166)
@@ -32,51 +32,34 @@
 
 <pre>
    Samba Team
-   26 Carstensz st
-   Griffith, ACT
-   2603 Australia
+   c/o The Software Freedom Conservancy
+   1995 BROADWAY FL 17
+   NEW YORK NY 10023-5882
 </pre>
 
+Note that the Software Freedom Conservancy is a 501(c)(3) charity in
+the USA, so donations in the USA may be tax-deductible.
+
 <h3>Corporate donations</h3>
 
 <p>If you would like to make a larger corporate donation then we would certainly
 like to discuss that. Please send a email to 
-<a href="mailto:samba-donations at samba.org">samba-donations at samba.org</a> or talk
-to any Samba Team member.</p>
+<a
+href="mailto:conservancy at softwarefreedom.org">conservancy at softwarefreedom.org</a>
+or talk to any Samba Team member.</p>
 
 <h3>Why do we need money?</h3>
 
-<p>You may be wondering why the Samba Team needs money now, when we have
-survived for 10 years without asking for donations. The main expenses that we
-have are travel expenses for team members to the major Samba related conferences
-and expenses for running the main samba.org site.  We occasionally
-have other expenses (eg. small pieces of hardware and books) but that is less
-common.</p>
+<p>You may be wondering why the Samba Team needs money. The main
+expenses that we have are travel expenses for team members to the
+major Samba related conferences and expenses for running the main
+samba.org site.  We occasionally have other expenses (eg. small pieces
+of hardware and books) but that is less common.</p>
 
-<p>A good example of our travel expenses is the <a
-href="http://www.cifs2002.org/">CIFS'2002
-conference</a> in San Jose. We have eleven team members attending this year and
-while most of them are covered by the company they work for, we do need to
-provide international travel and accomodation for 4 people.</p>
+<p>A good example of our travel expenses is the CIFS conference in
+San Jose. We usually have between ten and fifteen team members
+attending each year and while most of them are covered by the company
+they work for, we do need to provide international travel and
+accomodation for some of them.</p>
 
-<p>Our other major expense is the hosting of the main samba.org server. Up till
-now we have used servers generously provided by various vendors, but we are now
-looking at the possibility of moving to a commercial dedicated hosting provider.
-We are evaluating offers from several providers that have offered us very large
-discounts, but even with that it looks like we will need about US$200 a
-month.</p>
-
-<p>We do already have a good cash reserve from the Linus Torvalds/IDG prize we
-received at the 2001 Linuxworld expo, but that won't last forever and is being
-quickly eroded.</p>
-
-<h3>Recent donations</h3>
-
-<p>Thanks very much to everyone that has donated!</p>
-
-<table border="1">
-<tr bgcolor="#cfcfff"><th>Name</th><th>Amount</th></tr>
-<!--#include virtual="donations_list.html" -->
-</table>
-
 <!--#include virtual="/samba/footer.html" -->