From 77fec5e8bcf9847c2431af0a908d65a42cb2d189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 27 Apr 2016 13:45:34 +0200 Subject: [PATCH] Improve sample config description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/config.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/config.rst b/doc/config.rst index ef518fa357..14ea45fc58 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2982,11 +2982,18 @@ See following configuration snippets for usual setups of phpMyAdmin. Basic example +++++++++++++ -This example is distributed with phpMyAdmin as :file:`config.sample.inc.php`: +Example configuration file, which can be copied to :file:`config.inc.php` to +get some core configuration layout, it is distributed with phpMyAdmin as +:file:`config.sample.inc.php`. Please note that it does not contain all +configuration options, only the most frequently used ones. .. literalinclude:: ../config.sample.inc.php :language: php +.. warning:: + + Don't use the controluser 'pma' if not existing yet and don't use 'pmapass' + as password. .. _example-google-ssl: