summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel.black@au.ibm.com>2016-08-24 15:00:59 +1000
committerDaniel Black <daniel.black@au.ibm.com>2016-08-24 15:00:59 +1000
commit8cbc96b2f52fe7c1fde157603bb6c90eb279144c (patch)
treef0d5b1c1287fbe048da0bc2b0ee0ffde4172ad21
parent31a8cf54c8a7913338480a0571feaf32143b5f64 (diff)
downloadmariadb-git-8cbc96b2f52fe7c1fde157603bb6c90eb279144c.tar.gz
Markdown README for a prettier github representation
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md (renamed from README)17
2 files changed, 17 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ace4084acd..a87d08cd1ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -443,7 +443,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
-INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
+INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.LESSER COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
# MDEV-6526 these files are not installed anymore
#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
diff --git a/README b/README.md
index a9413f16b04..f34e6a43b71 100644
--- a/README
+++ b/README.md
@@ -1,3 +1,5 @@
+## MariaDB: drop-in replacement for MySQL
+
MariaDB is designed as a drop-in replacement of MySQL(R) with more
features, new storage engines, fewer bugs, and better performance.
@@ -24,10 +26,17 @@ 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.
+Help:
+-----
+
More help is available from the Maria Discuss mailing list
https://launchpad.net/~maria-discuss
and the #maria IRC channel on Freenode.
+
+License:
+--------
+
***************************************************************************
NOTE:
@@ -42,7 +51,8 @@ and COPYING.thirdparty files.
***************************************************************************
-IMPORTANT:
+Bug Reports:
+------------
Bug and/or error reports regarding MariaDB should be submitted at
http://mariadb.org/jira
@@ -53,3 +63,8 @@ The code for MariaDB, including all revision history, can be found at:
https://github.com/MariaDB/server
***************************************************************************
+
+Code status:
+------------
+
+* [![tests status](https://secure.travis-ci.org/MariaDB/server.png?branch=10.2)](https://travis-ci.org/MariaDB/server) travis-ci.org (10.2 branch)