Merge authors: Daniel Bartholomew (dbart) Related merge proposals: https://code.launchpad.net/~dbart/maria/maria-5.1-docmods/+merge/14679 proposed by: Daniel Bartholomew (dbart) ------------------------------------------------------------ revno: 2773 [merge] committer: [email protected] branch nick: work-5.1 timestamp: Tue 2009-12-01 08:42:58 +0100 message: Automerge Daniel's README fixes. modified: README
-- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.
=== modified file 'README' --- README 2009-10-23 16:48:54 +0000 +++ README 2009-11-03 04:59:48 +0000 @@ -1,60 +1,57 @@ -This is a release of MariaDB, a branch of MySQL. - -MariaDB is a drop-in replacement of MySQL, with more features, less -bugs and better performance. - -MariaDB is brought to you by many of the original developers of MySQL, -that now work for Monty Program Ab, and by many people in the +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. -MySQL, which is the base of MariaDB, is brought to you by Sun. - -License information can be found in these files: -- For GPL (free) distributions, see the COPYING file and - the EXCEPTIONS-CLIENT file. - -A description of the MariaDB project can be found at: +MySQL, which is the base of MariaDB, is a product and trademark of Sun +Microsystems, Inc. For a list of developers and other contributors, +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://askmonty.org/wiki/index.php/MariaDB - -GPLv2 Disclaimer -For the avoidance of doubt, except that if any license choice -other than GPL or LGPL is available it will apply instead, Sun -elects to use only the General Public License version 2 (GPLv2) -at this time for any software where a choice of GPL license versions -is made available with the language indicating that GPLv2 or any -later version may be used, or where a choice of which version of -the GPL is applied is otherwise unspecified. - -The differences between MariaDB and MySQL can be found at: http://askmonty.org/wiki/index.php/MariaDB_versus_MySQL - -Documentation about MySQL can be found at: -http://dev.mysql.com/doc - -For further information about MySQL documentation, see: -- The current MySQL documentation: - -Some manual sections of special interest: - - - -- For a list of developers and other contributors, see the Credits - appendix. - -A local copy of the MySQL Reference Manual can be found in the Docs -directory in GNU Info format. You can also browse the manual online or -download it in any of several formats from -http://dev.mysql.com/doc - -************************************************************ +http://askmonty.org/wiki/index.php/Manual:Contents + +As MariaDB is a full replacement of MySQL, the MySQL manual at +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 +General Public License (GPLv2). (I.e. Without the "any later version" +clause.) This is inherited from MySQL. Please see the README file in +the MySQL distribution for more information. + +License information can be found in the COPYING file and the +EXCEPTIONS-CLIENT file. + +*************************************************************************** IMPORTANT: -Bug or error reports regarding MariaDB should be sent to +Bug and/or error reports regarding MariaDB should be submitted at https://bugs.launchpad.net/maria -Bugs in the MySQL code can also be sent to http://bugs.mysql.com -*************************************************************************** - + +Bugs in the MySQL code can also be submitted at http://bugs.mysql.com + +*************************************************************************** + + + + + +*************************************************************************** %%The following software may be included in this product: Fred Fish's Dbug Library
_______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
