* develop-olympus:
[ticket/11951] Add MariaDB to platforms we test on.
[ticket/11951] Add MariaDB to supported DBMSes in requirement section.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
* develop-olympus:
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
[ticket/10865] Phrase change for visiting with browser
[ticket/10865] Grammar corrections for the entire document
[ticket/10865] Typo and phrasing change
[ticket/10865] Updates and additions to /docs/INSTALL.html
Conflicts:
phpBB/docs/INSTALL.html
* p/ticket/10865:
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
[ticket/10865] Phrase change for visiting with browser
[ticket/10865] Grammar corrections for the entire document
[ticket/10865] Typo and phrasing change
[ticket/10865] Updates and additions to /docs/INSTALL.html
Added anti-spam section.
Changed www.mydomain.com/tld to www.example.com.
Updated update section to mention third party styles.
Reworded several sentences for clarity.
Made file name/path formatting more consistent.
Corrected update archive type availabilities.
Changed PHP version listing to be less redundant.
PHPBB3-10865
PHPBB3-10918
* develop-olympus:
[develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.10-RC1
[develop-olympus] Bump version numbers for 3.0.10-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
Conflicts:
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
* github-igorw/ticket/10258:
[ticket/10258] Remove the meta charset tag
[ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
[ticket/10258] Remove copyright meta tag from docs
[ticket/10258] Remove resource-type and distribution meta tags
[ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
[ticket/10258] Change the DOCTYPE to HTML5
It fails HTML5 validation and we already have a 'copyright and
disclaimer' section in all of those documents. We can always represent
the copyright more semantically later (such as the HTML5 <copyright>
tag).
PHPBB3-10258