Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Documentation.html

@@ -1572,7 +1572,7 @@ <h2 id="config">Configuration</h2>
 
     <dt id="cfg_ShowTooltipAliasDB">$cfg['ShowTooltipAliasDB'] boolean</dt>
     <dd>If tool-tips are enabled and a DB comment is set, this will flip the
-        comment and the real name. That means that if you have a table called
+        comment and the real name. That means that if you have a database called
         'user0001' and add the comment 'MyName' on it, you will see the name
         'MyName' used consequently in the left frame and the tool-tip shows
         the real name of the DB.</dd>