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:
authorMichal Čihař <mcihar@suse.cz>2012-11-14 16:27:16 +0400
committerMichal Čihař <mcihar@suse.cz>2012-11-14 16:27:16 +0400
commit9e6f4351fce9f1509b2fb0f45cb6d2fe758f22e0 (patch)
treecf4b3fdd4291126ee48465e10bf73386e19c620f /doc/require.rst
parentc7d78f7503f5902cc6135f20839d9a0a52ddea65 (diff)
Better placement of see also links
Diffstat (limited to 'doc/require.rst')
-rw-r--r--doc/require.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/require.rst b/doc/require.rst
index 2c7fe12563..1452ee34ff 100644
--- a/doc/require.rst
+++ b/doc/require.rst
@@ -12,9 +12,8 @@ web server (such as Apache, :term:`IIS`) to install phpMyAdmin's files into.
PHP
---
-* You need PHP 5.2.0 or newer, with ``session`` support (see
- :ref:`faq1_31`) , the Standard PHP Library (SPL) extension and JSON
- support.
+* You need PHP 5.2.0 or newer, with ``session`` support, the Standard PHP Library
+ (SPL) extension and JSON support.
* To support uploading of ZIP files, you need the PHP ``zip`` extension.
@@ -24,7 +23,7 @@ PHP
* You need GD2 support in PHP to display inline thumbnails of JPEGs
("image/jpeg: inline") with their original aspect ratio.
-* When using the cookie :ref:`authentication_modes`, the `mcrypt
+* When using the cookie authentication (the default), the `mcrypt
<http://www.php.net/mcrypt>`_ extension is strongly suggested for most
users and is **required** for 64–bit machines. Not using mcrypt will
cause phpMyAdmin to load pages significantly slower.
@@ -35,6 +34,8 @@ PHP
5.2.17 or newer and the `libxml <http://www.php.net/libxml>`_
extension.
+.. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`
+
Database
--------