[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-202-g4707217

[Marc Delisle]

The branch, master has been updated
       via  47072173b3239cc370230bf9171cb9eeeeebe12b (commit)
       via  7e1e254f4b4789fc1a10414809498f179cbc31b6 (commit)
      from  0ed24fa602fbb772997a6d860292b874c03516b0 (commit)


- Log -----------------------------------------------------------------
commit 47072173b3239cc370230bf9171cb9eeeeebe12b
Merge: 7e1e254 0ed24fa
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jan 11 07:48:09 2012 -0500

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 7e1e254f4b4789fc1a10414809498f179cbc31b6
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jan 11 07:47:47 2012 -0500

    FAQ 5.19 added

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

Summary of changes:
 Documentation.html |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index b28c425..c4f5c96 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3846,6 +3846,12 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
     to <tt>On</tt> on the server. It seems to be a browser-specific problem; 
     meanwhile use the <tt>cookie</tt> authentication mode.</p>
 
+<h4 id="faq5_19">
+<a href="#faq5_19">5.19 I get JavaScript errors in my browser.</a></h4>
+<p> Issues have been reported with some combinations of browser extensions. 
+To troubleshoot, disable all extensions then clear your browser cache
+to see if the problem goes away.</p>
+
 <h3 id="faqusing">Using phpMyAdmin</h3>
 
 <h4 id="faq6_1">


hooks/post-receive
-- 
phpMyAdmin