From 8101c20401f2ae1c39255ad21c034b74b9fe863b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Sun, 17 Aug 2014 13:15:37 +0200 Subject: [PATCH 1/2] Rename the readme to for redering it in github The text already is in ReStructuredText format, but github doesn't render it if the extension is't what it expects. See also https://github.com/github/markup --- README.rst | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 66 -------------------------------------------------------------- 2 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 README.rst delete mode 100644 README.txt diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..a4c973d --- /dev/null +++ b/README.rst @@ -0,0 +1,66 @@ +========================== +MySQL Connector/Python 2.0 +========================== + +MySQL Connector/Python +Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. + +License information can be found in the LICENSE.txt file. + + +Documentation & Examples +======================== + +Documentation for all Connector/Python versions can be found online here: + + http://dev.mysql.com/doc/connector-python/en/index.html + +The source distribution of Connector/Python also contains example scripts. +They can be found in the examples/ directory. + + +License +======= + +This is a release of MySQL Connector/Python, Oracle's dual- +license Python Driver for MySQL. For the avoidance of +doubt, this particular copy of the software is released +under the version 2 of the GNU General Public License. +MySQL Connector/Python is brought to you by Oracle. + +Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. + +License information can be found in the LICENSE.txt file. + +MySQL FOSS License Exception +We want free and open source software applications under +certain licenses to be able to use the GPL-licensed MySQL +Connector/Python (specified GPL-licensed MySQL client libraries) +despite the fact that not all such FOSS licenses are +compatible with version 2 of the GNU General Public License. +Therefore there are special exceptions to the terms and +conditions of the GPLv2 as applied to these client libraries, +which are identified and described in more detail in the +FOSS License Exception at + + +This software is OSI Certified Open Source Software. +OSI Certified is a certification mark of the Open Source Initiative. + +This distribution may include materials developed by third +parties. For license and attribution notices for these +materials, please refer to the documentation that accompanies +this distribution (see the "Licenses for Third-Party Components" +appendix) or view the online documentation at + +A copy of the license/notices is also reproduced below. + +GPLv2 Disclaimer +For the avoidance of doubt, except that if any license choice +other than GPL or LGPL is available it will apply instead, +Oracle elects to use only the General Public License version 2 +(GPLv2) at this time for any software where a choice of GPL +license versions is made available with the language indicating +that GPLv2 or any later version may be used, or where a choice +of which version of the GPL is applied is otherwise unspecified. + diff --git a/README.txt b/README.txt deleted file mode 100644 index a4c973d..0000000 --- a/README.txt +++ /dev/null @@ -1,66 +0,0 @@ -========================== -MySQL Connector/Python 2.0 -========================== - -MySQL Connector/Python -Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. - -License information can be found in the LICENSE.txt file. - - -Documentation & Examples -======================== - -Documentation for all Connector/Python versions can be found online here: - - http://dev.mysql.com/doc/connector-python/en/index.html - -The source distribution of Connector/Python also contains example scripts. -They can be found in the examples/ directory. - - -License -======= - -This is a release of MySQL Connector/Python, Oracle's dual- -license Python Driver for MySQL. For the avoidance of -doubt, this particular copy of the software is released -under the version 2 of the GNU General Public License. -MySQL Connector/Python is brought to you by Oracle. - -Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. - -License information can be found in the LICENSE.txt file. - -MySQL FOSS License Exception -We want free and open source software applications under -certain licenses to be able to use the GPL-licensed MySQL -Connector/Python (specified GPL-licensed MySQL client libraries) -despite the fact that not all such FOSS licenses are -compatible with version 2 of the GNU General Public License. -Therefore there are special exceptions to the terms and -conditions of the GPLv2 as applied to these client libraries, -which are identified and described in more detail in the -FOSS License Exception at - - -This software is OSI Certified Open Source Software. -OSI Certified is a certification mark of the Open Source Initiative. - -This distribution may include materials developed by third -parties. For license and attribution notices for these -materials, please refer to the documentation that accompanies -this distribution (see the "Licenses for Third-Party Components" -appendix) or view the online documentation at - -A copy of the license/notices is also reproduced below. - -GPLv2 Disclaimer -For the avoidance of doubt, except that if any license choice -other than GPL or LGPL is available it will apply instead, -Oracle elects to use only the General Public License version 2 -(GPLv2) at this time for any software where a choice of GPL -license versions is made available with the language indicating -that GPLv2 or any later version may be used, or where a choice -of which version of the GPL is applied is otherwise unspecified. - From 33031b4408886a4d5167c81f4009315c53d8c9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Sun, 17 Aug 2014 13:30:34 +0200 Subject: [PATCH 2/2] Add bugreport URL --- README.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.rst b/README.rst index a4c973d..175214e 100644 --- a/README.rst +++ b/README.rst @@ -18,6 +18,13 @@ Documentation for all Connector/Python versions can be found online here: The source distribution of Connector/Python also contains example scripts. They can be found in the examples/ directory. +Bug reports and feature requests +================================ + +Please report bugs and submit feature requests at + + http://bugs.mysql.com + License =======