Skip to content

Commit

Permalink
Merge pull request #222 from grooverdan/10.2-README-markdown
Browse files Browse the repository at this point in the history
Markdown README for a prettier github representation
  • Loading branch information
Sergey Vojtovich committed Aug 31, 2016
2 parents 4ca7b22 + 8cbc96b commit c650a73
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 16 additions & 1 deletion README → README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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)

0 comments on commit c650a73

Please sign in to comment.