From d653eb0e2d02bfc953c2c80c5cb7f75e2991a07b Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 25 Apr 2005 22:07:37 +0000 Subject: [PATCH] detangled the license and the sponsoring page git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@435 a5681a0c-68f1-0310-ab6d-d61299d08faa --- website/license.wml | 26 +++----------------------- website/sponsor.wml | 27 +++++++++++++++++++++------ 2 files changed, 24 insertions(+), 29 deletions(-) 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.

Give Credit

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.

+publication, pointing to the RRDtool homepage. Best is to include one of the RRD +TOOL logos on the page.

  

- -

Make Tobi happy

- -

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 media wishlist. Please put your eMail 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 here. -

-

-remember, information is not knowledge,
- knowledge is not wisdom
- wisdom is not truth
- truth is not beauty
- beauty is not love
- love is not music
- music is the best
--- frank zappa

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.

2005 - Cablecom GmbH, Switzerland - sponsored the publication of RRDtool version 1.2.

-

1999 - CAIDA, USA - three month carte blanche to publish RRDtool 1.0

+

1999 - CAIDA, USA - gave me three months carte blanche to finsh writing RRDtool 1.0.

-

you could be next

+

since 1995 - ISG.EE, ETH Zürich, Switzerland - provided me with webspace for hosting all my OpenSource tools.

-

Hosting

+

you could be next

-

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.

+

Other means for makeing Tobi happy

+ +

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 media +wishlist. Please put your eMail 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 here.

+ +

remember, information is not knowledge,
+ knowledge is not wisdom
+ wisdom is not truth
+ truth is not beauty
+ beauty is not love
+ love is not music
+ music is the best
+-- frank zappa

-- 2.30.2