[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-7046-g5f837f0

The branch, master has been updated via 5f837f08c982eff232c52ab8f38e53f5d9a83e90 (commit) via a29323a1a6d1a3d4e65d80f0719b4199c18c3f4a (commit) from 0dbb216682fbf7cd6bc42a001ff17c5fde4a82eb (commit) - Log ----------------------------------------------------------------- commit 5f837f08c982eff232c52ab8f38e53f5d9a83e90 Merge: 0dbb216682fbf7cd6bc42a001ff17c5fde4a82eb a29323a1a6d1a3d4e65d80f0719b4199c18c3f4a Author: Michal Čihař &lt;mcihar(a)novell.com&gt; Date: Fri Aug 20 11:02:50 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b6bda7..03d58c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ $Id$ - bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default - bug [doc] Withdraw or edit FAQ entries related to older MySQL or PHP - bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop +- bug #3044189 [doc] Cleared documentation for hide_db. 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/Documentation.html b/Documentation.html index 2238acf..a782847 100644 --- a/Documentation.html +++ b/Documentation.html @@ -849,7 +849,7 @@ since this link provides funding for phpMyAdmin. For example, to hide all databases starting with the letter &#34;a&#34;, use<br /> <pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre> and to hide both &#34;db1&#34; and &#34;db2&#34; use <br /> - <pre>$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';</pre> + <pre>$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';</pre> More information on regular expressions can be found in the <a href="http://php.net/manual/en/reference.pcre.pattern.syntax.php"… PCRE pattern syntax</a> portion of the PHP reference manual. hooks/post-receive -- phpMyAdmin