diff options
| author | Marc Delisle <marc@infomarc.info> | 2013-07-30 16:30:32 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2013-07-30 16:30:32 +0400 |
| commit | 917d8033eb725c1fdfafc6911e889b209907a49f (patch) | |
| tree | d8f224181a15f4be36d3b632dc9d58c88390aba6 /doc/require.rst | |
| parent | 11f0c81d5e25f466e9ba583dbd1acbfbfbe1b862 (diff) | |
| parent | baf3dd9b6a14c74005b3f7123be61536c4dd7e5b (diff) | |
Fix merge conflicts
Diffstat (limited to 'doc/require.rst')
| -rw-r--r-- | doc/require.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/require.rst b/doc/require.rst index e45e8fef8c..35dc229790 100644 --- a/doc/require.rst +++ b/doc/require.rst @@ -13,13 +13,10 @@ PHP --- * You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library - (SPL) extension and JSON support. + (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions. * To support uploading of ZIP files, you need the PHP ``zip`` extension. -* For proper support of multibyte strings (eg. UTF-8, which is currently - the default), you should install the ``mbstring`` and ``ctype`` extensions. - * You need GD2 support in PHP to display inline thumbnails of JPEGs ("image/jpeg: inline") with their original aspect ratio. |