From eb12fe41a7e7a98b6a76d20978b06b7fa5507e0f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 6 Jun 2013 08:47:59 -0400 Subject: [PATCH] bug #3960 NavigationBarIconic config not honored --- ChangeLog | 1 + doc/config.rst | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52a087075e..c3552b12a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #3961 Avoid Suhosin warning when in simulation mode - bug #3897 Row Statistics and Space usage bugs - bug #3966 Only display "table has no unique column" message when applicable +- bug #3960 NavigationBarIconic config not honored 4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty diff --git a/doc/config.rst b/doc/config.rst index af97c493b8..2b9ced27b8 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1486,9 +1486,9 @@ Browse mode :type: string :default: true - Defines whether navigation bar buttons and the right panel top menu - contain text or symbols only. A value of true displays icons, false - displays text and 'both' displays both icons and text. + Defines whether navigation bar buttons contain text or symbols only. A + value of true displays icons, false displays text and 'both' displays + both icons and text. .. config:option:: $cfg['ShowAll'] @@ -1679,8 +1679,8 @@ Tabs display settings If set to ``true``, will display icons instead of text for db and table properties links (like :guilabel:`Browse`, :guilabel:`Select`, - :guilabel:`Insert`, ...). Can be set to ``'both'`` if you want icons AND - text. When set to ``false``, will only show text. + :guilabel:`Insert`, ...) and for the menu tabs. Can be set to ``'both'`` + if you want icons AND text. When set to ``false``, will only show text. .. config:option:: $cfg['PropertiesNumColumns']