diff options
Diffstat (limited to 'doc/site/src')
| -rw-r--r-- | doc/site/src/docs/gem_plugin.page | 14 | ||||
| -rw-r--r-- | doc/site/src/license.page | 117 | ||||
| -rw-r--r-- | doc/site/src/news.page | 6 | ||||
| -rw-r--r-- | doc/site/src/plugins.page | 5 |
4 files changed, 76 insertions, 66 deletions
diff --git a/doc/site/src/docs/gem_plugin.page b/doc/site/src/docs/gem_plugin.page index 70debf1..0e2ec96 100644 --- a/doc/site/src/docs/gem_plugin.page +++ b/doc/site/src/docs/gem_plugin.page @@ -41,7 +41,7 @@ package management system to give you: * A simple way to package, distribute, manage, and update your Mongrel plugins. * Dynamic loading based on the gem dependencies and not on specific configurations. -* Segregated extensions for Mongrel in case you want a different license than LGPL. +* Segregated extensions for Mongrel. * All the capabilities of RubyGems. GemPlugin doesn't mess with them at all. * A little generator that starts your project off right similar to how Rails generators work. * The ability to package resources (images, configs, etc.) with your gem and then load them @@ -75,14 +75,10 @@ h2. Your First Plugin Make sure that you have rubygems, mongrel, gem_plugins, and rake all installed and working right. -Yes, this means that you are forced to use RubyGems. -People who really don't like RubyGems are free to take the -core of the Mongrel Server API and re-use it as they wish, -but keep in mind that Mongrel is LGPL so any changes you -make need to come back to me or you have to release your -whole project under LGPL too. Just using Mongrel doesn't -require this return so feel free to use it like crazy -in your commercial software or other licensed project. +Yes, this means that you are forced to use RubyGems. People who really don't +like RubyGems are free to take the core of the Mongrel Server API and re-use it +as they wish. Just using Mongrel doesn't require this return so feel free to +use it like crazy in your commercial software or other licensed project. Once you have all that installed you need to simply find a nice quiet place to generate your initial plugin directory with the *gpgen* diff --git a/doc/site/src/license.page b/doc/site/src/license.page index 8e18782..5382a73 100644 --- a/doc/site/src/license.page +++ b/doc/site/src/license.page @@ -6,51 +6,63 @@ directoryName: Licensing h1. Mongrel Licensing -Mongrel is licensed under the "LGPL":http://www.gnu.org/licenses/lgpl.html and is copyright Zed A. Shaw -as of 2005. If you use Mongrel and are worried about the -licensing status, then you should talk with your legal team -and follow their advice. If you use Mongrel and -are concerned about how that impacts your software, then contact -me about a commercial license or how you can donate to a charity to get a commercial license. - -I don't use "LGPL":http://www.gnu.org/licenses/lgpl.html to force people to also "LGPL":http://www.gnu.org/licenses/lgpl.html license their software, -but rather to make sure that people who modify *Mongrel* give back to -the community. The general rule is that if you treat the -Mongrel RubyGem directory like it's a got an evil firewall -around it then you're good. You can link to it, run your -applications under it, and even write GemPlugins to change -Mongrel without touching the source. - -If you dip into the Mongrel RubyGem directory and change -even one line of source, or copy a portion of the source -into your project, then you have to do the following: - -* E-mail me what you changed and find out if I would include it in Mongrel. Usually I will. -* If I can't or won't include it, then consider taking it out and writing a GemPlugin. -* If you have to have this change in Mongrel and I can't take the patch (since it's specific to your application), - *and* you can't make a GemPlugin, then you'll have to either: -** License your software under the "LGPL":http://www.gnu.org/licenses/lgpl.html and release it. -** Include the changed files in your release and allow the customer to access them, giving proper attribution. -** Contact me for a commercial license. -** Contact me about donating to a charity in exchange for a commercial license. - -I'm not interested in hunting people down who use Mongrel in -commercial products nor am I a GPL zealot. I understand that -folks just want to run their software under Mongrel and might -need to make a few changes. As long as you share those changes -when you make them then I'll be happy and you'll be safe. - - -h2. Non-profit Organizations - -If you're a registered non-profit organization that is using -Mongrel then you don't have to worry about any of the above. -You are free to use Mongrel however you want and I'll even -be willing to help you out in exchange for tax credit or -just to be a good guy. - -I'd appreciate your changes or stories about how you're using -it, but otherwise feel free to use Mongrel however you want. +After much debate and talking with people about Mongrel's potential, I've changed the +licensing of Mongrel from LGPL to Ruby's License: + + + Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw + <zedshaw at zedshaw dot com> You can redistribute it and/or modify it under + either the terms of the GPL or the conditions below: + + 1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + + 2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or by allowing the author to include your + modifications in the software. + + b) use the modified software only within your corporation or + organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided. + + d) make other distribution arrangements with the author. + + 3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: + + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) on where + to get the original distribution. + + b) accompany the distribution with the machine-readable source of the + software. + + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. + + d) make other distribution arrangements with the author. + + 4. You may modify and include the part of the software into any other + software (possibly commercial). But some files in the distribution + are not written by the author, so that they are not under this terms. + + 5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + + 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. h2. GemPlugins @@ -58,16 +70,13 @@ h2. GemPlugins The GemPlugins system is both freely available *and* licensed under the Ruby License. Feel free to use it just like you would Ruby and work it into your projects as you -need. This is done so people can write their own GemPlugins -for Mongrel without having to re-license them under the -"LGPL":http://www.gnu.org/licenses/lgpl.html. - +need. h2. Some Charities To Consider -Any charity that helps children is a good one. My personal -favorite is "The Train Platform Schools":http://www.globalfundforchildren.org/project_profiles/train_schools.htm -in India. They help children who are extremely poor get food, -medical attention, and education by holding small school sessions -on the train platforms in Bhubaneswar, India. +Any charity that helps children is a good one. My personal favorite is +"The Train Platform Schools":http://www.globalfundforchildren.org/project_profiles/train_schools.htm +in India. They help children who are extremely poor get food, medical +attention, and education by holding small school sessions on the train +platforms in Bhubaneswar, India. diff --git a/doc/site/src/news.page b/doc/site/src/news.page index dae4e27..85d020d 100644 --- a/doc/site/src/news.page +++ b/doc/site/src/news.page @@ -7,6 +7,12 @@ ordering: 2 h1. Latest News +h2. Jun 30: Mongrel 0.3.13.3 -- Ruby Licensed Now + +After talking with various people deep inside the Ruby machine, I've decided +to release Mongrel Ruby licensed as of 0.3.13.3. This release should make +quite a few people happy. + h2. Jun 25: Mongrel 0.3.13.2 -- RailsConf 2006 Release This is the release that came out of RailsConf hacking with folks like Rick diff --git a/doc/site/src/plugins.page b/doc/site/src/plugins.page index 8a5fdeb..2dbad3b 100644 --- a/doc/site/src/plugins.page +++ b/doc/site/src/plugins.page @@ -28,6 +28,5 @@ and you'll get hooked up. h2. Licensing -People interested in extending Mongrel and avoiding licensing -problems (Mongrel is LGPL) can use GemPlugins without any -problems since the GemPlugin system is Ruby Licensed. +Mongrel and GemPlugin are both "licensed the same as Ruby":/license.page so +you can use it the same as Ruby. |