From de7bf09ecafcda69138d09186bee6ab836a1a6f8 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sun, 23 Jun 2013 01:47:17 +0200 Subject: [PATCH] improved readme & license --- license.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ license.txt | 61 ----------------------------------------------------- readme.md | 18 ++++++++++++++++ readme.txt | 31 --------------------------- 4 files changed, 75 insertions(+), 92 deletions(-) create mode 100644 license.md delete mode 100644 license.txt create mode 100644 readme.md delete mode 100644 readme.txt diff --git a/license.md b/license.md new file mode 100644 index 00000000..edb9974d --- /dev/null +++ b/license.md @@ -0,0 +1,57 @@ +Licenses +======== + +Good news! You may use Dibi under the terms of either the New BSD License +or the GNU General Public License (GPL) version 2 or 3. + +The BSD License is recommended for most projects. It is easy to understand and it +places almost no restrictions on what you can do with the framework. If the GPL +fits better to your project, you can use the framework under this license. + +You don't have to notify anyone which license you are using. You can freely +use Dibi in commercial projects as long as the copyright header +remains intact. + + + +New BSD License +--------------- + +Copyright (c) 2004, 2013 David Grudl (http://davidgrudl.com) +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of "Dibi" nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +This software is provided by the copyright holders and contributors "as is" and +any express or implied warranties, including, but not limited to, the implied +warranties of merchantability and fitness for a particular purpose are +disclaimed. In no event shall the copyright owner or contributors be liable for +any direct, indirect, incidental, special, exemplary, or consequential damages +(including, but not limited to, procurement of substitute goods or services; +loss of use, data, or profits; or business interruption) however caused and on +any theory of liability, whether in contract, strict liability, or tort +(including negligence or otherwise) arising in any way out of the use of this +software, even if advised of the possibility of such damage. + + + +GNU General Public License +-------------------------- + +GPL licenses are very very long, so instead of including them here we offer +you URLs with full text: + +- [GPL version 2](http://www.gnu.org/licenses/gpl-2.0.html) +- [GPL version 3](http://www.gnu.org/licenses/gpl-3.0.html) diff --git a/license.txt b/license.txt deleted file mode 100644 index fc19aec7..00000000 --- a/license.txt +++ /dev/null @@ -1,61 +0,0 @@ -Licenses -======== - -Good news! You may use Dibi under the terms of either the New BSD License -or the GNU General Public License (GPL) version 2 or 3. - -The BSD License is recommended for most projects. It is easy to understand and it -places almost no restrictions on what you can do with the library. If the GPL -fits better to your project, you can use the Dibi under this license. - -You don't have to notify anyone which license you are using. You can freely -use Dibi in commercial projects as long as the copyright header -remains intact. - -Please do not use word "Dibi" in the name of your project or top-level domain, -and choose a name that stands on its own merits. If your stuff is good, -it will not take long to establish a reputation for yourselves. - - - -New BSD License ---------------- - -Copyright (c) 2005, 2012 David Grudl (http://davidgrudl.com) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name of "Dibi" nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -GNU General Public License --------------------------- - -GPL licenses are very very long, so instead of including them here we offer -you URLs with full text: - -- GPL version 2: http://www.gnu.org/licenses/gpl-2.0.html -- GPL version 3: http://www.gnu.org/licenses/gpl-3.0.html diff --git a/readme.md b/readme.md new file mode 100644 index 00000000..82d395bb --- /dev/null +++ b/readme.md @@ -0,0 +1,18 @@ +[Dibi](http://dibiphp.com) - smart database layer for PHP +========================================================= + +Database access functions in PHP are not standardised. This library +hides the differences between them, a above all, it gives you a very handy interface. + +The best way how to install Dibi is to use a [Composer](http://getcomposer.org/download): + + php composer.phar require dibi/dibi + +Or you can download a latest package from http://dibiphp.com. In this +package is also `Dibi.minified`, shrinked single-file version of whole Dibi, +useful when you don't want to modify library, but just use it. + +Refer to the `examples` directory for examples. Dibi documentation is +available on the [homepage](http://dibiphp.com). + +Dibi requires PHP 5.2.0 or later. It has been tested with PHP 5.5 too. diff --git a/readme.txt b/readme.txt deleted file mode 100644 index 9c4ab5fe..00000000 --- a/readme.txt +++ /dev/null @@ -1,31 +0,0 @@ -Introduction ------------- - -Thank you for downloading Dibi! - -Database access functions in PHP are not standardised. This is class library -to hide the differences between the different databases access. - - -Documentation and Examples --------------------------- - -Refer to the 'examples' directory for examples. Dibi documentation is -available on the homepage: - -http://dibiphp.com - - -Dibi.minified -------------- - -This is shrinked single-file version of whole Dibi, useful when you don't -want to modify library, but just use it. - -This is exactly the same as normal version, just only comments and -whitespaces are removed. - - ------ -For more information, visit the author's weblog (in czech language): -http://phpfashion.com