Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2013-08-24 14:27:15 +0400
committerMarc Delisle <marc@infomarc.info>2013-08-24 14:27:15 +0400
commiteae2f1bc28ed9750210cc08675289789bbb2c879 (patch)
treece1a3e12b2b2a1939c2a9e49322700ded1c692ff /doc/require.rst
parent220fa37a6f1aa01a5abc8083cbe9eadd3ad09a12 (diff)
parentdd39ca8da0a4de4e8fbbf457651c24f7e6f69066 (diff)
Fix merge conflicts
Diffstat (limited to 'doc/require.rst')
-rw-r--r--doc/require.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/require.rst b/doc/require.rst
index 35dc229790..9d90752e2d 100644
--- a/doc/require.rst
+++ b/doc/require.rst
@@ -13,7 +13,7 @@ PHP
---
* You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library
- (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
+ (SPL) extension, JSON support, and the ``mbstring`` extension.
* To support uploading of ZIP files, you need the PHP ``zip`` extension.
@@ -31,6 +31,8 @@ PHP
with the `libxml <http://www.php.net/libxml>`_
extension.
+* Performance suggestion: install the ``ctype`` extension.
+
.. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`
Database