summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-09-23 20:27:37 +0300
committerMichael Widenius <monty@askmonty.org>2013-09-23 20:27:37 +0300
commit9081c4dc6bbc22f627f96077d36e5d55d6696acb (patch)
tree3270efd1b6d999bac800aba0bc574e686faad558 /README
parent26474cd20409589b10e3c5be9aa3fd1050727f31 (diff)
downloadmariadb-git-9081c4dc6bbc22f627f96077d36e5d55d6696acb.tar.gz
Added information about the MariaDB foundation
Updated information in SHOW AUTHORS and SHOW CONTRIBUTORS SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore. CMakeLists.txt: Install TODO and CREDITS files CREDITS: Information about the MariaDB foundation README: Updated to include the MariaDB foundation mysql-test/r/contributors.result: Updated contributors mysql-test/r/show_check.result: SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore. scripts/make_binary_distribution.sh: Added TODO and CREDITS sql/authors.h: Updated list of active authors sql/contributors.h: Updated list of active contributors and members of the MariaDB foundation sql/sql_show.cc: Extend comment lengths sql/sql_yacc.yy: SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore
Diffstat (limited to 'README')
-rw-r--r--README18
1 files changed, 12 insertions, 6 deletions
diff --git a/README b/README
index 7daeec0495f..f18b2673943 100644
--- a/README
+++ b/README
@@ -3,9 +3,13 @@ This is a release of MariaDB.
MariaDB is designed as a drop-in replacement of MySQL(R) with more
features, new storage engines, fewer bugs, and better performance.
-MariaDB is brought to you by many of the original developers of MySQL
-who now work for Monty Program Ab, and by many people in the
-community.
+MariaDB is brought to you by the MariaDB foundation.
+Please read the file CREDITS 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 MariadB foundation and SkySQL Ab, 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,
@@ -13,9 +17,11 @@ see the Credits appendix. You can also do 'SHOW authors' to get a
list of active contributors.
A description of the MariaDB project and a manual can be found at:
-http://kb.askmonty.org/
-http://kb.askmonty.org/en/mariadb-versus-mysql-features/
-http://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/
+http://mariadb.org/
+https://mariadb.com/kb/en/
+https://mariadb.com/kb/en/mariadb-vs-mysql-features/
+https://mariadb.com/kb/en/mariadb-versus-mysql-features/
+https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
As MariaDB is a full replacement of MySQL, the MySQL manual at
http://dev.mysql.com/doc is generally applicable.