removed mscv defines to confignt/config.h completely -- Guenter Knauf

[rrdtool-all.git] / website / license.wml

diff --git a/website/license.wml b/website/license.wml
index bfe1d7e4252932c501118cace01c876ecefdca13..ac45ae76514f432cea73104bfcff9792269b4223 100644 (file)
--- a/website/license.wml
+++ b/website/license.wml
@@ -11,33 +11,19 @@ This means you can do most things you want with this software as long as you
 do not claim you created the software and don't sell it (or modified version
 of it) under a license other than the GNU GPL.</P>
 
+<p>If you want to use RRDtool with an opensouce tool that has a GPL
+incompatible license, you may be able to get around the problem thanks to
+the <a
+href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool-trac/browser/branches/1.2/program/COPYRIGHT">FLOSS
+License Exception</a> in the RRDtool license.</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>