summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-11-07 13:16:29 +0200
committerMonty <monty@mariadb.org>2018-12-09 20:49:05 +0200
commitc82855d88272f0a1b95d0ad2b7abf804aeff8145 (patch)
treed21118e6caaf2f90e2df0a4a2780d7964caa349e /README.md
parentae58cd6b87bf1f872093816691ebdd46bef50c7f (diff)
downloadmariadb-git-c82855d88272f0a1b95d0ad2b7abf804aeff8145.tar.gz
Changed some MySQL names in messages to MariaDB
- Remove obsolete documentation files - Removed old obsolete information from some documentation files
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 932ad768d62..07e917b039a 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ Code status:
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 the MariaDB Foundation.
+MariaDB is brought to you by the MariaDB Foundation and the MariaDB corporation.
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.
+now work for the MariaDB Corporation, the MariaDB Foundation 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,
@@ -23,14 +23,16 @@ list of active contributors.
A description of the MariaDB project and a manual can be found at:
-https://mariadb.org/
-
https://mariadb.com/kb/en/
https://mariadb.com/kb/en/mariadb-vs-mysql-features/
https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
+https://mariadb.com/kb/en/library/new-and-old-releases/
+
+https://mariadb.org/
+
As MariaDB is a full replacement of MySQL, the MySQL manual at
http://dev.mysql.com/doc is generally applicable.