Skip to content

Commit fbf132b

Browse files
svojsvoj
committed
Merge pull request #155 from iangilfillan/10.0
Documentation fixes
2 parents d859fff + eb752ac commit fbf132b

File tree

4 files changed

+42
-35
lines changed

4 files changed

+42
-35
lines changed

‎CREDITS

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
MariaDB is brought to you by the MariaDB foundation, a USA non profit
2-
organization.
1+
MariaDB is brought to you by the MariaDB Foundation, a non profit
2+
organization registered in the USA.
33

4-
The current main members and sponsors of the MariaDB foundation are:
4+
The current main members and sponsors of the MariaDB Foundation are:
55

6-
Automattic http://automattic.com (2014)
7-
SkySQL Ab http://www.skysql.com (2013, 2014)
8-
Booking.com http://www.booking.com (2013)
9-
Parallels http://www.parallels.com/products/plesk (2013)
6+
MariaDB Corporation http://www.mariadb.com (2013 - 2016)
7+
Booking.com http://www.booking.com (2013 - 2016)
8+
Parallels http://www.parallels.com/products/plesk (2013 - 2016)
9+
Automattic http://automattic.com (2014 - 2016)
10+
Verkkokauppa.com http://verkkokauppa.com (2015 - 2016)
11+
Visma http://visma.com/ (2015 - 2016)
12+
Webyog http://webyog.com (2015 - 2016)
13+
Wikimedia Foundation http://wikimedia.org (2015 - 2016)
14+
Acronis http://acronis.com (2016)
1015

1116
For a full list of supporters and sponsors see
12-
https://mariadb.org/en/supporters/
17+
https://mariadb.org/about/supporters/
1318

14-
You can also do this by doing SHOW CONTRIBUTORS.
19+
You can also do this by running SHOW CONTRIBUTORS.
1520

1621
For all corporate memberships and sponsorships please contact the
17-
MariaDB foundation Board via foundation@mariadb.org.
22+
MariaDB Foundation Board via foundation@mariadb.org.
1823

19-
The MariaDB foundation is responsible for the MariaDB source
24+
The MariaDB Foundation is responsible for the MariaDB source
2025
repository, the official MariaDB binaries and http://mariadb.org.
2126

22-
The MariaDB foundation provides also, among other things, the
27+
The MariaDB Foundation also provides, among other things, the
2328
following services to the MariaDB community:
2429

2530
- Code reviews and applying patches for MariaDB
@@ -28,17 +33,19 @@ following services to the MariaDB community:
2833
- Bug fixing in MariaDB (for bugs that affects a large part of the community)
2934
- Building the official MariaDB binaries
3035
- Maintaining http://mariadb.org
36+
- Documenting MariaDB in the MariaDB Knowledge Base http://mariadb.com/kb
3137

32-
To be able to do the above we need help from cooperations and individuals!
38+
To be able to do the above we need help from corporations and individuals!
3339

34-
You can help support MariaDB by be becoming a MariaDB developer or a
35-
member or sponsor of the MariaDB foundation!
40+
You can help support MariaDB by becoming a MariaDB developer or a
41+
member or sponsor of the MariaDB Foundation. To donate or sponsor,
42+
go to https://mariadb.org/donate/
3643

37-
You can get a list of all main authors of MariaDB / MySQL by doing
44+
You can get a list of all the main authors of MariaDB / MySQL by running
3845
SHOW AUTHORS;
3946

40-
You can get a list sponsors and contributors by doing
47+
You can get a list sponsors and contributors by running
4148
SHOW CONTRIBUTORS;
4249

43-
You can read more about the MariaDB foundation at:
44-
https://mariadb.org/en/foundation/
50+
You can read more about the MariaDB Foundation at:
51+
https://mariadb.org/about/

‎README

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ This is a release of MariaDB.
33
MariaDB is designed as a drop-in replacement of MySQL(R) with more
44
features, new storage engines, fewer bugs, and better performance.
55

6-
MariaDB is brought to you by the MariaDB foundation.
7-
Please read the file CREDITS for details about the MariaDB foundation,
6+
MariaDB is brought to you by the MariaDB Foundation.
7+
Please read the CREDITS file for details about the MariaDB Foundation,
88
and who is developing MariaDB.
99

1010
MariaDB is developed by many of the original developers of MySQL who
11-
now work for MariadB foundation and SkySQL Ab, and by many people in
11+
now work for the MariadB Foundation and the MariaDB Corporation, and by many people in
1212
the community.
1313

1414
MySQL, which is the base of MariaDB, is a product and trademark of Oracle
1515
Corporation, Inc. For a list of developers and other contributors,
16-
see the Credits appendix. You can also do 'SHOW authors' to get a
16+
see the Credits appendix. You can also run 'SHOW authors' to get a
1717
list of active contributors.
1818

1919
A description of the MariaDB project and a manual can be found at:
@@ -52,7 +52,7 @@ http://mariadb.org/jira
5252
Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
5353

5454
The code for MariaDB, including all revision history, can be found at:
55-
https://code.launchpad.net/maria
55+
https://github.com/MariaDB/server
5656

5757
***************************************************************************
5858

‎sql/authors.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct show_table_authors_st show_table_authors[]= {
5656
"Unicode and character sets" },
5757
{ "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",
5858
"GIS extensions, embedded server, precision math"},
59-
{ "Daniel Bartholomew", "Raleigh, USA", "MariaDB documentation"},
59+
{ "Daniel Bartholomew", "Raleigh, USA", "MariaDB documentation, Buildbot, releases"},
6060
{ "Colin Charles", "Selangor, Malesia", "MariaDB documentation, talks at a LOT of conferences"},
6161
{ "Sergey Vojtovich", "Izhevsk, Russia",
6262
"initial implementation of plugin architecture, maintained native storage engines (MyISAM, MEMORY, ARCHIVE, etc), rewrite of table cache"},
@@ -73,6 +73,8 @@ struct show_table_authors_st show_table_authors[]= {
7373
{ "Pavel Ivanov", "USA", "Some patches and bug fixes"},
7474
{ "Konstantin Osipov", "Moscow, Russia",
7575
"Prepared statements (4.1), Cursors (5.0), GET_LOCK (10.0)" },
76+
{ "Ian Gilfillan", "South Africa", "MariaDB documentation"},
77+
{ "Federico Razolli", "Italy", "MariaDB documentation Italian translation"},
7678

7779
/* People working on MySQL code base (not NDB) */
7880
{ "Guilhem Bichot", "Bordeaux, France", "Replication (since 4.0)" },

‎sql/contributors.h

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,16 @@ struct show_table_contributors_st {
3737

3838
struct show_table_contributors_st show_table_contributors[]= {
3939
/* MariaDB foundation members, in contribution, size , time order */
40-
{"Booking.com", "http://www.booking.com", "Founding member of the MariaDB foundation"},
41-
{"SkySQL Ab", "http://www.skysql.com", "Founding member of the MariaDB foundation"},
42-
{"Auttomatic", "http://automattic.com", "Member of the MariaDB foundation"},
43-
{"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB foundation"},
40+
{"Booking.com", "http://www.booking.com", "Founding member of the MariaDB Foundation"},
41+
{"MariaDB Corporation", "https://mariadb.com", "Founding member of the MariaDB Foundation"},
42+
{"Auttomattic", "http://automattic.com", "Member of the MariaDB Foundation"},
43+
{"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB Foundation"},
44+
{"Acronis", "http://www.acronis.com", "Member of the MariaDB Foundation"},
4445

4546
/* Smaller sponsors, newer per year */
46-
{"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB foundation"},
47-
{"Webyog", "Bangalor", "Sponsor of the MariaDB foundation"},
48-
{"Percona", "USA", "Sponsor of the MariaDB foundation"},
49-
{"Jelastic.com", "Russia", "Sponsor of the MariaDB foundation"},
50-
{"Planetta.net", "Finland", "Sponsor of the MariaDB foundation"},
51-
{"Open query", "Australia", "Sponsor of the MariaDB foundation"},
47+
{"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB Foundation"},
48+
{"Webyog", "Bangalore", "Sponsor of the MariaDB Foundation"},
49+
{"Wikimedia Foundation", "USA", "Sponsor of the MariaDB Foundation"},
5250

5351
/* Sponsors of important features */
5452
{"Google", "USA", "Sponsoring parallel replication and GTID" },

0 commit comments

Comments
 (0)