The branch, master has been updated via 8e80009897929be9f355512f4bda64b7e8f080a1 (commit) from 269981cbd7a94b0b393301a117a848b04462f135 (commit)

- Log ----------------------------------------------------------------- commit 8e80009897929be9f355512f4bda64b7e8f080a1 Author: Michal Čihař michal@cihar.com Date: Sun Mar 20 11:01:26 2011 +0100

Talk about configuration storage in the sample config

-----------------------------------------------------------------------

Summary of changes: config.sample.inc.php | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config.sample.inc.php b/config.sample.inc.php index 41f6466..0ea16d5 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -35,10 +35,15 @@ $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['AllowNoPassword'] = false;

-/* User for advanced features */ +/* + * phpMyAdmin configuration storage settings. + */ + +/* User used to manipulate with storage */ // $cfg['Servers'][$i]['controluser'] = 'pma'; // $cfg['Servers'][$i]['controlpass'] = 'pmapass'; -/* Advanced phpMyAdmin features */ + +/* Storage database and tables */ // $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; // $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; // $cfg['Servers'][$i]['relation'] = 'pma_relation'; @@ -119,7 +124,7 @@ $cfg['SaveDir'] = ''; * Set to true if you want DB-based query history.If false, this utilizes * JS-routines to display query history (lost by window close) * - * This requires advanced features enabled, see above. + * This requires configuration storage enabled, see above. * default = false */ //$cfg['QueryHistoryDB'] = true;

hooks/post-receive