4 Sep
2011
4 Sep
'11
3:29 p.m.
The branch, master has been updated
via e2864a383efd0b2c18c7c0967e315f07ccf5cf96 (commit)
via 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 (commit)
via 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 (commit)
via 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit)
from 2dba1449bdeb6ebf52ee2b2a52cf3ce914e21c1a (commit)
- Log -----------------------------------------------------------------
commit e2864a383efd0b2c18c7c0967e315f07ccf5cf96
Merge: 2dba144 2694b3d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Sep 4 08:27:20 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 35863f5..e4e8bca 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2262,6 +2262,10 @@ setfacl -d -m "g:www-data:rwx" tmp
that users can't set through user preferences. For possible values, refer
to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
+ <dt
id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab']
boolean</dt>
+ <dd>Activates in the user preferences a tab containing options for
+ developers of phpMyAdmin.</dd>
+
<dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt>
<dt id="cfg_TitleDatabase">$cfg['TitleDatabase']
string</dt>
<dt id="cfg_TitleServer">$cfg['TitleServer']
string</dt>
hooks/post-receive
--
phpMyAdmin