summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-10-08 15:21:13 +0200
committerSergei Golubchik <serg@mariadb.org>2016-10-08 15:24:09 +0200
commit0b697c7ca5d7769427f3f0b22092ec582100b63c (patch)
tree87eb9368e383ccdcedaacf352494ecf8b459e5d8
parentd31ce1da3877b3da1b100793c37bc86d3f06b8d0 (diff)
downloadmariadb-git-0b697c7ca5d7769427f3f0b22092ec582100b63c.tar.gz
wip
-rw-r--r--README6
1 files changed, 2 insertions, 4 deletions
diff --git a/README b/README
index a2930a30fc5..cabdc839c54 100644
--- a/README
+++ b/README
@@ -4,9 +4,11 @@ features, new storage engines, fewer bugs, and better performance.
MariaDB is brought to you by the MariaDB Foundation.
Please read the CREDITS file for details about the MariaDB Foundation,
and who is developing MariaDB.
+
MariaDB is developed by many of the original developers of MySQL who
now work for the MariadB Foundation and the MariaDB Corporation, and by many people in
the community.
+
MySQL, which is the base of MariaDB, is a product and trademark of Oracle
Corporation, Inc. For a list of developers and other contributors,
see the Credits appendix. You can also run 'SHOW authors' to get a
@@ -25,9 +27,7 @@ http://dev.mysql.com/doc is generally applicable.
More help is available from the Maria Discuss mailing list
https://launchpad.net/~maria-discuss
and the #maria IRC channel on Freenode.
-
***************************************************************************
-
NOTE:
MariaDB is specifically available only under version 2 of the GNU
@@ -39,7 +39,6 @@ License information can be found in the COPYING, COPYING.LESSER,
and COPYING.thirdparty files.
***************************************************************************
-
IMPORTANT:
Bug and/or error reports regarding MariaDB should be submitted at
@@ -49,5 +48,4 @@ Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
The code for MariaDB, including all revision history, can be found at:
https://github.com/MariaDB/server
-
***************************************************************************