[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-15-ga99858b

[Michal Čihař]

The branch, QA_3_3 has been updated
       via  a99858b16a40bcfceec01667eb2814a1acf45f6d (commit)
       via  b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit)
       via  c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit)
       via  95f6c0a13756c25fa8b98f7153324152a6db4378 (commit)
      from  c9d7a662101b57abe754393ab6424b05ab0e685f (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 070b3e1..8848f90 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
     </dd>
 
+    <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
+    <dd>Whether to display errors from PHP or not.</dd>
+
+    <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
+    <dd>Whether to gather errors from PHP or not.</dd>
+
     <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
     <dd>Defines whether to use a select-based menu and display only the current
         tables in the left frame (smaller page). Only in Non-Lightmode you can
@@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] =
         name of the field. The comment is shown as a tool-tip for that field.
     </dd>
 
-    <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
+    <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
     <dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
 
-    <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
+    <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
     <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
 
-    <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
+    <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
     <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
 
-    <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
+    <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
     <dd>Whether to display a link to validate a query in any SQL Query box.
         See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
 
-    <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
+    <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
     <dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
 
     <dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt>
@@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server.
         <abbr title="PHP Extension and Application Repository">PEAR</abbr>
         coding standards</a>
         on the other hand. Please pay attention to this.</li>
+    <li>Please enable showing PHP errors and warnings by the
+        <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
+        configuration directive.</li>
     <li>Please try to keep up the file-naming conventions. Table-related stuff
         goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
         server-related tools to <i>server_*.php</i> and so on.</li>


hooks/post-receive
-- 
phpMyAdmin