diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-20 16:03:23 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-20 16:03:23 -0700 |
| commit | a5eaaa10dcb84ab98312dcebf90930da581d7165 (patch) | |
| tree | c4b0864f05b1c2e2dc7c47432487ab74b0716db8 | |
| parent | 16ab35c1b50f191299d49e1c8d3ffe74a4051dd3 (diff) | |
| parent | 7df35a288a639102fa0f908f052d3eb06a1728b6 (diff) | |
| download | forums-a5eaaa10dcb84ab98312dcebf90930da581d7165.tar forums-a5eaaa10dcb84ab98312dcebf90930da581d7165.tar.gz forums-a5eaaa10dcb84ab98312dcebf90930da581d7165.tar.bz2 forums-a5eaaa10dcb84ab98312dcebf90930da581d7165.tar.xz forums-a5eaaa10dcb84ab98312dcebf90930da581d7165.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus
* github-bantu/ticket/11951:
[ticket/11951] Add MariaDB to platforms we test on.
[ticket/11951] Add MariaDB to supported DBMSes in requirement section.
| -rw-r--r-- | phpBB/docs/INSTALL.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/README.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 3fa0597fc8..74c017ecff 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -139,6 +139,7 @@ <li>A SQL database system, <strong>one of</strong>: <ul> <li>MySQL 3.23 or above (MySQLi supported)</li> + <li>MariaDB 5.1 or above</li> <li>PostgreSQL 7.3+</li> <li>SQLite 2.8.2+ (SQLite 3 is not supported)</li> <li>Firebird 2.1+</li> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 89f573de04..d54c58eca6 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -329,7 +329,7 @@ <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> - <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p> + <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p> <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3> |