Merge pull request #155 from iangilfillan/10.0

Documentation fixes

CREDITS

-MariaDB is brought to you by the MariaDB foundation, a USA non profit
-organization.
+MariaDB is brought to you by the MariaDB Foundation, a non profit
+organization registered in the USA.
 
-The current main members and sponsors of the MariaDB foundation are:
+The current main members and sponsors of the MariaDB Foundation are:
 
-Automattic      http://automattic.com  (2014)
-SkySQL Ab	http://www.skysql.com  (2013, 2014)
-Booking.com	http://www.booking.com (2013)
-Parallels       http://www.parallels.com/products/plesk  (2013)
+MariaDB Corporation	http://www.mariadb.com  (2013 - 2016)
+Booking.com		http://www.booking.com (2013 - 2016)
+Parallels       	http://www.parallels.com/products/plesk  (2013 - 2016)
+Automattic              http://automattic.com  (2014 - 2016)
+Verkkokauppa.com	http://verkkokauppa.com (2015 - 2016)
+Visma			http://visma.com/ (2015 - 2016)
+Webyog			http://webyog.com (2015 - 2016)
+Wikimedia Foundation    http://wikimedia.org (2015 - 2016)
+Acronis			http://acronis.com (2016)
 
 For a full list of supporters and sponsors see
-https://mariadb.org/en/supporters/
+https://mariadb.org/about/supporters/
 
-You can also do this by doing SHOW CONTRIBUTORS.
+You can also do this by running SHOW CONTRIBUTORS.
 
 For all corporate memberships and sponsorships please contact the
-MariaDB foundation Board via foundation@mariadb.org.
+MariaDB Foundation Board via foundation@mariadb.org.
 
-The MariaDB foundation is responsible for the MariaDB source
+The MariaDB Foundation is responsible for the MariaDB source
 repository, the official MariaDB binaries and http://mariadb.org.
 
-The MariaDB foundation provides also, among other things, the
+The MariaDB Foundation also provides, among other things, the
 following services to the MariaDB community:
 
 - Code reviews and applying patches for MariaDB
@@ -28,17 +33,19 @@ following services to the MariaDB community:
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
 - Maintaining http://mariadb.org
+- Documenting MariaDB in the MariaDB Knowledge Base http://mariadb.com/kb
 
-To be able to do the above we need help from cooperations and individuals!
+To be able to do the above we need help from corporations and individuals!
 
-You can help support MariaDB by be becoming a MariaDB developer or a
-member or sponsor of the MariaDB foundation!
+You can help support MariaDB by becoming a MariaDB developer or a
+member or sponsor of the MariaDB Foundation. To donate or sponsor, 
+go to https://mariadb.org/donate/
 
-You can get a list of all main authors of MariaDB / MySQL by doing
+You can get a list of all the main authors of MariaDB / MySQL by running 
 SHOW AUTHORS;
 
-You can get a list sponsors and contributors by doing
+You can get a list sponsors and contributors by running 
 SHOW CONTRIBUTORS;
 
-You can read more about the MariaDB foundation at:
-https://mariadb.org/en/foundation/
+You can read more about the MariaDB Foundation at:
+https://mariadb.org/about/

README

@@ -3,17 +3,17 @@ 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 the MariaDB foundation.
-Please read the file CREDITS for details about the MariaDB foundation,
+MariaDB is brought to you by the MariaDB Foundation.
+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 MariadB foundation and SkySQL Ab, and by many people in
+now work for the MariadB Foundation and the MariaDB Corporation, 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,
-see the Credits appendix.  You can also do 'SHOW authors' to get a
+see the Credits appendix.  You can also run 'SHOW authors' to get a
 list of active contributors.
 
 A description of the MariaDB project and a manual can be found at:
@@ -52,7 +52,7 @@ http://mariadb.org/jira
 Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
 
 The code for MariaDB, including all revision history, can be found at:
-https://code.launchpad.net/maria
+https://github.com/MariaDB/server
 
 ***************************************************************************
 

sql/authors.h

@@ -56,7 +56,7 @@ struct show_table_authors_st show_table_authors[]= {
     "Unicode and character sets" },
   { "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",
     "GIS extensions, embedded server, precision math"},
-  { "Daniel Bartholomew", "Raleigh, USA", "MariaDB documentation"},
+  { "Daniel Bartholomew", "Raleigh, USA", "MariaDB documentation, Buildbot, releases"},
   { "Colin Charles", "Selangor, Malesia", "MariaDB documentation, talks at a LOT of conferences"},
   { "Sergey Vojtovich", "Izhevsk, Russia",
     "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[]= {
   { "Pavel Ivanov", "USA", "Some patches and bug fixes"},
   { "Konstantin Osipov", "Moscow, Russia",
     "Prepared statements (4.1), Cursors (5.0), GET_LOCK (10.0)" },
+  { "Ian Gilfillan", "South Africa", "MariaDB documentation"},
+  { "Federico Razolli", "Italy", "MariaDB documentation Italian translation"},
 
   /* People working on MySQL code base (not NDB) */
   { "Guilhem Bichot", "Bordeaux, France", "Replication (since 4.0)" },

sql/contributors.h

@@ -37,18 +37,16 @@ struct show_table_contributors_st {
 
 struct show_table_contributors_st show_table_contributors[]= {
   /* MariaDB foundation members, in contribution, size , time order */
-  {"Booking.com", "http://www.booking.com", "Founding member of the MariaDB foundation"},
-  {"SkySQL Ab", "http://www.skysql.com", "Founding member of the MariaDB foundation"},
-  {"Auttomatic", "http://automattic.com", "Member of the MariaDB foundation"},  
-  {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB foundation"},
+  {"Booking.com", "http://www.booking.com", "Founding member of the MariaDB Foundation"},
+  {"MariaDB Corporation", "https://mariadb.com", "Founding member of the MariaDB Foundation"},
+  {"Auttomattic", "http://automattic.com", "Member of the MariaDB Foundation"},  
+  {"Parallels", "http://www.parallels.com/products/plesk", "Founding member of the MariaDB Foundation"},
+  {"Acronis", "http://www.acronis.com", "Member of the MariaDB Foundation"},
 
   /* Smaller sponsors, newer per year */
-  {"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB foundation"},
-  {"Webyog", "Bangalor", "Sponsor of the MariaDB foundation"},
-  {"Percona", "USA", "Sponsor of the MariaDB foundation"},
-  {"Jelastic.com", "Russia", "Sponsor of the MariaDB foundation"},
-  {"Planetta.net", "Finland", "Sponsor of the MariaDB foundation"},
-  {"Open query", "Australia", "Sponsor of the MariaDB foundation"},
+  {"Verkkokauppa.com", "Finland", "Sponsor of the MariaDB Foundation"},
+  {"Webyog", "Bangalore", "Sponsor of the MariaDB Foundation"},
+  {"Wikimedia Foundation", "USA", "Sponsor of the MariaDB Foundation"},
 
   /* Sponsors of important features */
   {"Google", "USA", "Sponsoring parallel replication and GTID" },