From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 25 Apr 2005 22:07:37 +0000 (+0000)
Subject: detangled the license and the sponsoring page
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d653eb0e2d02bfc953c2c80c5cb7f75e2991a07b;p=rrdtool-all.git

detangled the license and the sponsoring page


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@435 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/website/license.wml b/website/license.wml
index bfe1d7e4..c05e66f9 100644
--- a/website/license.wml
+++ b/website/license.wml
@@ -14,30 +14,10 @@ of it) under a license other than the GNU GPL.</P>
 <H2>Give Credit</H2>
 
 <P>One of the things I get out of RRDtool is 'Being Known in the Industry'.
-This only works if you give credit to RRDtool. This means that you
+This only works if you give credit. This means that you
 mention RRDtool on webpages and other publications containing graphs
 created with RRDtool. If possible, a link should be included in the
-publication, pointing to the RRDtool homepage. Best is to include the RRD
-TOOL logo on these pages.</P>
+publication, pointing to the RRDtool homepage. Best is to include one of the  RRD
+TOOL logos on the page.</P>
 
 <p><img src="$(ROOT)/inc/rrdtool-logo-dark.png"/>&nbsp;&nbsp;<img src="$(ROOT)/inc/rrdtool-logo-light.png"/></p>
-
-<H2>Make Tobi happy</H2>
-
-<P>I am giving RRDtool away for free. This does not mean, that I don't
-like getting appreciation for my program.  If you like RRDtool and
-want to show me your appreciation, have a look at
-my <A HREF="http://people.ee.ethz.ch/~oetiker/wish">media wishlist</A>. Please put your <B>eMail</B> address into the the Message area, so
-that I can thank you for your present. I do keep a list of People who sent
-me stuff. You can look at it <A
-HREF="http://people.ee.ethz.ch/~oetiker/webtools/appreciators.txt">here</A>. 
-</P>
-<P>
-<I>remember, information is not knowledge,<BR/>
-        knowledge is not wisdom<BR/>
-        wisdom is not truth<BR/>
-        truth is not  beauty<BR/>
-        beauty is not love<BR/>
-        love is not music<BR/>
-        music is the best</I><BR/>
--- frank zappa</p>
diff --git a/website/sponsor.wml b/website/sponsor.wml
index b4c8367c..20b16c21 100644
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -14,13 +14,28 @@ for an offer.</p>
 
 <p>2005 - <b><a href="http://cablecom.com">Cablecom GmbH</a>, Switzerland</b> - sponsored the publication of RRDtool version 1.2.</p>
 
-<p>1999 - <b><a href="http://caida.org">CAIDA</a>, USA</b> - three month carte blanche to publish RRDtool 1.0</p>
+<p>1999 - <b><a href="http://caida.org">CAIDA</a>, USA</b> - gave me three months carte blanche to finsh writing RRDtool 1.0.</p>
 
-<p>you could be next</p>
+<p>since 1995 - <b><a href="http://isg.ee.ethz.ch">ISG.EE</a>, ETH Zürich, Switzerland</b> - provided me with webspace for hosting all my OpenSource tools.</p>
 
-<h2>Hosting</h2>
+<p>you could be next</p>
 
-<p>I would also like to thank the Department of Information Technology and
-Electrical Engineering at the Swiss Federal Institute of Technology who
-allow me to use their network resources to publish RRDtool.</p>
+<H2>Other means for makeing Tobi happy</H2>
+
+<P>I am giving RRDtool away for free. This does not mean, that I don't like
+getting appreciation for my program.  If you like RRDtool and want to show
+me, have a look at my <A HREF="http://people.ee.ethz.ch/oetiker/wish">media
+wishlist</A>. Please put your <B>eMail</B> address into the the Message
+area, so that I can thank you for your present. I do keep a list of People
+who sent me stuff. You can look at it <A
+HREF="http://people.ee.ethz.ch/~oetiker/webtools/appreciators.txt">here</A>.</P>
+
+<P> <I>remember, information is not knowledge,<BR/>
+        knowledge is not wisdom<BR/>
+        wisdom is not truth<BR/>
+        truth is not  beauty<BR/>
+        beauty is not love<BR/>
+        love is not music<BR/>
+        music is the best</I><BR/>
+-- frank zappa</p>