From 9842f01444204b33f85f803b5a81265ddaaa96cd Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sun, 18 Mar 2012 18:04:50 +0100
Subject: [PATCH] Replaced HTML5-obsolete <tt> tags with <code>

---
 Documentation.html             | 582 ++++++++++++++++-----------------
 libraries/common.inc.php       |   2 +-
 libraries/mult_submits.inc.php |   2 +-
 libraries/tcpdf/tcpdf.php      |   2 +-
 po/af.po                       |   4 +-
 po/ar.po                       |   4 +-
 po/az.po                       |   4 +-
 po/be.po                       |   4 +-
 po/be@latin.po                 |   2 +-
 po/bg.po                       |   4 +-
 po/bn.po                       |   4 +-
 po/br.po                       |   4 +-
 po/bs.po                       |   4 +-
 po/ca.po                       |   4 +-
 po/cs.po                       |   4 +-
 po/cy.po                       |   2 +-
 po/da.po                       |   4 +-
 po/de.po                       |  14 +-
 po/el.po                       |   4 +-
 po/en_GB.po                    |   4 +-
 po/es.po                       |   8 +-
 po/et.po                       |   4 +-
 po/eu.po                       |   4 +-
 po/fa.po                       |   2 +-
 po/fi.po                       |   4 +-
 po/fr.po                       |   4 +-
 po/gl.po                       |   4 +-
 po/he.po                       |   2 +-
 po/hi.po                       |   4 +-
 po/hr.po                       |   4 +-
 po/hu.po                       |   4 +-
 po/id.po                       |   4 +-
 po/it.po                       |   4 +-
 po/ja.po                       |   4 +-
 po/ka.po                       |   4 +-
 po/ko.po                       |   4 +-
 po/lt.po                       |   4 +-
 po/lv.po                       |   4 +-
 po/mk.po                       |   4 +-
 po/ml.po                       |   2 +-
 po/mn.po                       |   4 +-
 po/ms.po                       |   4 +-
 po/nb.po                       |   4 +-
 po/nl.po                       |   8 +-
 po/phpmyadmin.pot              |   2 +-
 po/pl.po                       |   4 +-
 po/pt.po                       |   4 +-
 po/pt_BR.po                    |   4 +-
 po/ro.po                       |   4 +-
 po/ru.po                       |   4 +-
 po/si.po                       |   4 +-
 po/sk.po                       |   4 +-
 po/sl.po                       |   4 +-
 po/sq.po                       |   4 +-
 po/sr.po                       |   4 +-
 po/sr@latin.po                 |   4 +-
 po/sv.po                       |   4 +-
 po/ta.po                       |   2 +-
 po/te.po                       |   2 +-
 po/th.po                       |   8 +-
 po/tk.po                       |   2 +-
 po/tr.po                       |   4 +-
 po/tt.po                       |   4 +-
 po/ug.po                       |   4 +-
 po/uk.po                       |   4 +-
 po/ur.po                       |   4 +-
 po/uz.po                       |   4 +-
 po/uz@latin.po                 |   4 +-
 po/zh_CN.po                    |   4 +-
 po/zh_TW.po                    |   4 +-
 server_privileges.php          |  48 +--
 sql.php                        |   2 +-
 test/theme.php                 |   2 +-
 73 files changed, 454 insertions(+), 454 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 9c870ac9ba..976944b72c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -57,12 +57,12 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <h2 id="require">Requirements</h2>
 
 <ul><li><strong>PHP</strong>
-        <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
+        <ul><li>You need PHP 5.2.0 or newer, with <code>session</code> support
                 (<a href="#faq1_31">see
             <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
         , the Standard PHP Library (SPL) extension and JSON support.
                 </li>
-        <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
+        <li>To support uploading of ZIP files, you need the PHP <code>zip</code> extension.</li>
         <li>For proper support of multibyte strings (eg. UTF-8, which is
             currently the default), you should install the mbstring and ctype
             extensions.
@@ -72,7 +72,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
                 original aspect ratio.</li>
             <li>When using the &quot;cookie&quot;
                 <a href="#authentication_modes">authentication method</a>, the
-                <a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> extension
+                <a href="http://www.php.net/mcrypt"><code>mcrypt</code></a> extension
                 is strongly suggested for most users and is <strong>required</strong> for
                 64&#8211;bit machines. Not using mcrypt will cause phpMyAdmin to
                 load pages significantly slower.
@@ -81,7 +81,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
                     <abbr title="Frequently Asked Questions">FAQ</abbr> 2.9</a>.</li>
                 <li>To support XML and Open Document Spreadsheet importing,
                 you need PHP 5.2.17 or newer and the 
-                <a href="http://www.php.net/libxml"><tt>libxml</tt></a> extension.</li>
+                <a href="http://www.php.net/libxml"><code>libxml</code></a> extension.</li>
         </ul>
     </li>
     <li><strong>MySQL</strong> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
@@ -158,9 +158,9 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <p class="footnote" id="footnote_1">
     <sup>1)</sup> phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 formats)
     dumps and <abbr title="comma separated values">CSV</abbr> exports if you use
-    PHP with Zlib support (<tt>--with-zlib</tt>) and/or Bzip2 support
-    (<tt>--with-bz2</tt>). Proper support may also need changes in
-    <tt>php.ini</tt>.</p>
+    PHP with Zlib support (<code>--with-zlib</code>) and/or Bzip2 support
+    (<code>--with-bz2</code>). Proper support may also need changes in
+    <code>php.ini</code>.</p>
 
 <!-- INSTALLATION -->
 <h2 id="setup">Installation</h2>
@@ -188,7 +188,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     So you'll have to resave as in BBEdit to Unix style ALL phpMyAdmin scripts
     before uploading them to your server, as PHP seems not to like
     <acronym title="Apple Macintosh">Mac</acronym>-style end of lines character
-    (&quot;<tt>\r</tt>&quot;).</p>
+    (&quot;<code>\r</code>&quot;).</p>
 
 <h3 id="quick_install">Quick Install</h3>
 <ol><li>Choose an appropriate distribution kit from the phpmyadmin.net
@@ -196,10 +196,10 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     others contain all languages in UTF-8 format (this should be fine
     in most situations), others contain all
     languages and all character sets. We'll assume you chose a kit whose
-    name looks like <tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>.
+    name looks like <code>phpMyAdmin-x.x.x-all-languages.tar.gz</code>.
     </li>
     <li>Untar or unzip the distribution (be sure to unzip the subdirectories):
-        <tt>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</tt> in your webserver's
+        <code>tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz</code> in your webserver's
         document root. If you don't have direct access to your document root,
         put the files in a directory on your local machine, and, after step 4,
         transfer the directory on your web server using, for example, ftp.</li>
@@ -212,18 +212,18 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
         1.26</a> for suggestions.</li>
     <li>Now you must configure your installation. There are two methods that
         can be used. Traditionally, users have hand-edited a copy of
-    <tt>config.inc.php</tt>, but now a wizard-style setup script is
+    <code>config.inc.php</code>, but now a wizard-style setup script is
     provided for those who prefer a graphical installation. Creating a
-    <tt>config.inc.php</tt> is still a quick way to get started and needed for some advanced features.
+    <code>config.inc.php</code> is still a quick way to get started and needed for some advanced features.
         <ul><li>To manually create the file, simply use your text editor to
-                create the file <tt>config.inc.php</tt> (you can copy
-                <tt>config.sample.inc.php</tt> to get minimal configuration
+                create the file <code>config.inc.php</code> (you can copy
+                <code>config.sample.inc.php</code> to get minimal configuration
                 file) in the main (top-level) phpMyAdmin directory (the one
-                that contains <tt>index.php</tt>).  phpMyAdmin first loads
-                <tt>libraries/config.default.php</tt> and then overrides those
-                values with anything found in <tt>config.inc.php</tt>. If the
+                that contains <code>index.php</code>).  phpMyAdmin first loads
+                <code>libraries/config.default.php</code> and then overrides those
+                values with anything found in <code>config.inc.php</code>. If the
                 default value is okay for a particular setting, there is no
-                need to include it in <tt>config.inc.php</tt>.  You'll need a
+                need to include it in <code>config.inc.php</code>.  You'll need a
                 few directives to get going, a simple configuration may look
                 like this:
 <pre>
@@ -249,9 +249,9 @@ $cfg['Servers'][$i]['auth_type']     = 'config';
                 For a full explanation of possible configuration values, see the
                 <a href="#config">Configuration Section</a> of this document.</li>
             <li id="setup_script">Instead of manually editing
-                <tt>config.inc.php</tt>, you can use the
+                <code>config.inc.php</code>, you can use the
                 <a href="setup/">Setup Script</a>. First you must
-                manually create a folder <tt>config</tt> in the phpMyAdmin
+                manually create a folder <code>config</code> in the phpMyAdmin
                 directory. This is a security measure. On a Linux/Unix system you
                 can use the following commands:
 <pre>
@@ -268,19 +268,19 @@ chmod o+w config/config.inc.php     # give it world writable permissions
                 web server has read and write access to it. <a href="#faq1_26">FAQ
                 1.26</a> can help with this.<br /><br />
 
-                Next, open <tt><a href="setup/">setup/</a>
-                </tt>in your browser. Note that <strong>changes are not saved to
-                disk until explicitly choose <tt>Save</tt></strong> from the
+                Next, open <code><a href="setup/">setup/</a>
+                </code>in your browser. Note that <strong>changes are not saved to
+                disk until explicitly choose <code>Save</code></strong> from the
                 <em>Configuration</em> area of the screen. Normally the script saves
-                the new config.inc.php to the <tt>config/</tt> directory, but if
+                the new config.inc.php to the <code>config/</code> directory, but if
                 the webserver does not have the proper permissions you may see the
-                error "Cannot load or save configuration." Ensure that the <tt>
-                config/</tt> directory exists and has the proper permissions -
-                or use the <tt>Download</tt> link to save the config file locally
+                error "Cannot load or save configuration." Ensure that the <code>
+                config/</code> directory exists and has the proper permissions -
+                or use the <code>Download</code> link to save the config file locally
                 and upload (via FTP or some similar means) to the proper location.<br /><br />
 
-                Once the file has been saved, it must be moved out of the <tt>
-                config/</tt> directory and the permissions must be reset, again
+                Once the file has been saved, it must be moved out of the <code>
+                config/</code> directory and the permissions must be reset, again
                 as a security measure:
 <pre>
 mv config/config.inc.php .         # move file to current directory
@@ -291,13 +291,13 @@ rm -rf config                      # remove not needed directory
                 the file with your favorite editor, if you prefer to set some
                 advanced options which the setup script does not provide.</li></ul></li>
     <li>If you are using the
-        <tt>auth_type</tt> &quot;config&quot;, it is suggested that you
+        <code>auth_type</code> &quot;config&quot;, it is suggested that you
         protect the phpMyAdmin installation directory because using
         config does not require a user to
         enter a password to access the phpMyAdmin installation. Use of an alternate
         authentication method is recommended, for example with
         HTTP&#8211;AUTH in a <a href="#glossary"><em>.htaccess</em></a> file or switch to using
-        <tt>auth_type</tt> cookie or http. See the
+        <code>auth_type</code> cookie or http. See the
         <a href="#faqmultiuser"> multi&#8211;user sub&#8211;section</a> of this
         <abbr title="Frequently Asked Questions">FAQ</abbr> for additional
         information, especially <a href="#faq4_4">
@@ -307,8 +307,8 @@ rm -rf config                      # remove not needed directory
         and your databases, or a login dialog if using
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode.</li>
-    <li>You should deny access to the <tt>./libraries</tt> and
-        <tt>./setup/lib</tt> subfolders in your webserver configuration. For
+    <li>You should deny access to the <code>./libraries</code> and
+        <code>./setup/lib</code> subfolders in your webserver configuration. For
         Apache you can use supplied <a href="#glossary"><em>.htaccess</em></a> file in that folder, for other
         webservers, you should configure this yourself.  Such configuration
         prevents from possible path exposure and cross side scripting
@@ -333,7 +333,7 @@ rm -rf config                      # remove not needed directory
     multi-user installation (this database would then be accessed by the
     controluser, so no other user should have rights to it).</p>
 
-<p> Please look at your <tt>./examples/</tt> directory, where you should find a
+<p> Please look at your <code>./examples/</code> directory, where you should find a
     file called <em>create_tables.sql</em>. (If you are using a Windows server, pay
     special attention to <a href="#faq1_23">
     <abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
@@ -359,19 +359,19 @@ rm -rf config                      # remove not needed directory
 <p> Simply copy <em>./config.inc.php</em> from your previous installation into the newly
     unpacked one. Configuration files from old versions may
     require some tweaking as some options have been changed or removed; in
-    particular, the definition of <tt>$cfg['AttributeTypes']</tt> has changed
+    particular, the definition of <code>$cfg['AttributeTypes']</code> has changed
     so you better remove it from your file and just use the default one.
-    For compatibility with PHP 6, remove a <tt>set_magic_quotes_runtime(0);</tt>
+    For compatibility with PHP 6, remove a <code>set_magic_quotes_runtime(0);</code>
     statement that you might find near the end of your configuration file.</p>
 
-<p> You should <strong>not</strong> copy <tt>libraries/config.default.php</tt>
-    over <tt>config.inc.php</tt> because the default configuration file
+<p> You should <strong>not</strong> copy <code>libraries/config.default.php</code>
+    over <code>config.inc.php</code> because the default configuration file
     is version-specific.</p>
 
 <p> If you have upgraded your MySQL server from a version previous to 4.1.2 to
     version 5.x or newer and if you use the phpMyAdmin configuration storage,
     you should run the <abbr title="structured query language">SQL</abbr> script
-    found in <tt>examples/upgrade_tables_mysql_4_1_2+.sql</tt>.</p>
+    found in <code>examples/upgrade_tables_mysql_4_1_2+.sql</code>.</p>
 
 <h3 id="authentication_modes">Using authentication modes</h3>
 
@@ -396,26 +396,26 @@ rm -rf config                      # remove not needed directory
         algorithm, in a temporary cookie.</li>
 
     <li id="pmausr">Note: this section is only applicable if
-        your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
+        your MySQL server is running with <code>--skip-show-database</code>.<br /><br />
 
         For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
         modes, phpMyAdmin needs a controluser that has <strong>only</strong> the
-        <tt>SELECT</tt> privilege on the <em>`mysql`.`user` (all columns except
+        <code>SELECT</code> privilege on the <em>`mysql`.`user` (all columns except
         `Password`)</em>, <em>`mysql`.`db` (all columns)</em>, <em>`mysql`.`host`
         (all columns)</em> and <em>`mysql`.`tables_priv` (all columns except
         `Grantor` and `Timestamp`)</em> tables.<br /> You must specify the details
-        for the <a href="#controluser">controluser</a> in the <tt>config.inc.php</tt>
+        for the <a href="#controluser">controluser</a> in the <code>config.inc.php</code>
         file under the
-        <tt><a href="#cfg_Servers_controluser" class="configrule">
-            $cfg['Servers'][$i]['controluser']</a></tt> and
-        <tt><a href="#cfg_Servers_controlpass" class="configrule">
-            $cfg['Servers'][$i]['controlpass']</a></tt> settings.<br />
-        The following example assumes you want to use <tt>pma</tt> as the
-        controluser and <tt>pmapass</tt> as the controlpass, but <strong>this is
+        <code><a href="#cfg_Servers_controluser" class="configrule">
+            $cfg['Servers'][$i]['controluser']</a></code> and
+        <code><a href="#cfg_Servers_controlpass" class="configrule">
+            $cfg['Servers'][$i]['controlpass']</a></code> settings.<br />
+        The following example assumes you want to use <code>pma</code> as the
+        controluser and <code>pmapass</code> as the controlpass, but <strong>this is
         only an example: use something else in your file!</strong> Input these
         statements from the phpMyAdmin <abbr title="structured query language">SQL
         </abbr> Query window or mysql command&#8211;line client.<br />
-        Of course you have to replace <tt>localhost</tt> with the webserver's host
+        Of course you have to replace <code>localhost</code> with the webserver's host
         if it's not the same as the MySQL server's one.
 
         <pre>
@@ -495,7 +495,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
         <a href="#AllowArbitraryServer" class="configrule">
         $cfg['AllowArbitraryServer']</a> directive.</li>
     <li>As mentioned in the <a href="#require">requirements</a> section, having
-        the <tt>mcrypt</tt> extension will speed up access considerably, but is
+        the <code>mcrypt</code> extension will speed up access considerably, but is
         not required.</li>
 </ul>
 
@@ -547,16 +547,16 @@ When Swekey authentication is activated, phpMyAdmin requires the
 users's Swekey to be plugged before entering the login page (currently
 supported for cookie authentication mode only). Swekey Authentication is 
 disabled by default.<br /><br />
-To enable it, add the following line to <tt>config.inc.php</tt>:
+To enable it, add the following line to <code>config.inc.php</code>:
 </p>
 <pre>
 $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey.conf';
 </pre>
 <p>
-You then have to create the <tt>swekey.conf</tt> file that will associate
+You then have to create the <code>swekey.conf</code> file that will associate
 each user with their Swekey Id. It is important to place this file outside
-of your web server's document root (in the example, it is located in <tt>/etc</tt>). A self documented sample file is provided 
-in the <tt>examples</tt> directory. Feel free to use it with your own 
+of your web server's document root (in the example, it is located in <code>/etc</code>). A self documented sample file is provided 
+in the <code>examples</code> directory. Feel free to use it with your own 
 users' information.<br /><br />
 If you want to purchase a Swekey please visit
 <a href="http://phpmyadmin.net/auth_key">http://phpmyadmin.net/auth_key</a>
@@ -568,26 +568,26 @@ since this link provides funding for phpMyAdmin.
 <p> <span class="important">Warning for <acronym title="Apple Macintosh">Mac</acronym>
     users:</span> PHP does not seem to like
     <acronym title="Apple Macintosh">Mac</acronym> end of lines character
-    (&quot;<tt>\r</tt>&quot;). So ensure you choose the option that allows to use
-    the *nix end of line character (&quot;<tt>\n</tt>&quot;) in your text editor
+    (&quot;<code>\r</code>&quot;). So ensure you choose the option that allows to use
+    the *nix end of line character (&quot;<code>\n</code>&quot;) in your text editor
     before saving a script you have modified.</p>
 
 <p> <span class="important">Configuration note:</span>
-    Almost all configurable data is placed in <tt>config.inc.php</tt>. If this file
+    Almost all configurable data is placed in <code>config.inc.php</code>. If this file
     does not exist, please refer to the <a href="#setup">Quick install</a>
     section to create one. This file only needs to contain the parameters you want to
     change from their corresponding default value in
-    <tt>libraries/config.default.php</tt>.</p>
+    <code>libraries/config.default.php</code>.</p>
 
 <p> The parameters which relate to design (like colors) are placed in
-    <tt>themes/themename/layout.inc.php</tt>. You might also want to create
+    <code>themes/themename/layout.inc.php</code>. You might also want to create
     <em>config.footer.inc.php</em> and <em>config.header.inc.php</em> files to add
     your site specific code to be included on start and end of each page.</p>
 
 <dl><dt id="cfg_PmaAbsoluteUri">$cfg['PmaAbsoluteUri'] string</dt>
     <dd>Sets here the complete <abbr title="Uniform Resource Locator">URL</abbr>
         (with full path) to your phpMyAdmin installation's directory.
-        E.g. <tt>http://www.your_web.net/path_to_your_phpMyAdmin_directory/</tt>.
+        E.g. <code>http://www.your_web.net/path_to_your_phpMyAdmin_directory/</code>.
         Note also that the <abbr title="Uniform Resource Locator">URL</abbr> on
         some web servers are case&#8211;sensitive.
         Don&#8217;t forget the trailing slash at the end.<br /><br />
@@ -612,24 +612,24 @@ since this link provides funding for phpMyAdmin.
         use it. You will find a link that will analyze why those features have
         been disabled.<br />
         If you do not want to use those features set this variable to
-        <tt>TRUE</tt> to stop this message from appearing.</dd>
+        <code>TRUE</code> to stop this message from appearing.</dd>
 
     <dt id="cfg_SuhosinDisableWarning">$cfg['SuhosinDisableWarning'] boolean</dt>
     <dd>A warning is displayed on the main page if Suhosin is detected.
-    You can set this parameter to <tt>TRUE</tt> to stop this message 
+    You can set this parameter to <code>TRUE</code> to stop this message 
     from appearing.</dd>
 
     <dt id="cfg_McryptDisableWarning">$cfg['McryptDisableWarning'] boolean</dt>
     <dd>Disable the default warning that is displayed if mcrypt is missing for
     cookie authentication.
-    You can set this parameter to <tt>TRUE</tt> to stop this message 
+    You can set this parameter to <code>TRUE</code> to stop this message 
     from appearing.</dd>
 
     <dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt>
     <dd>Show warning about incomplete translations on certain threshold.</dd>
 
     <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt>
-    <dd>Setting this to <tt>true</tt> allows a page located on a different
+    <dd>Setting this to <code>true</code> allows a page located on a different
     domain to call phpMyAdmin inside a frame, and is a potential security
     hole allowing cross-frame scripting attacks.</dd>
 
@@ -656,9 +656,9 @@ since this link provides funding for phpMyAdmin.
         contains the hostname of the first server, the second
         <a href="#cfg_Servers_host" class="configrule">$cfg['Servers'][$i]['host']</a>
         the hostname of the second server, etc. In
-        <tt>./libraries/config.default.php</tt>, there is only one section for
+        <code>./libraries/config.default.php</code>, there is only one section for
         server definition, however you can put as many as you need in
-        <tt>./config.inc.php</tt>, copy that block or needed parts (you don't
+        <code>./config.inc.php</code>, copy that block or needed parts (you don't
         have to define all settings, just those you need to change).</dd>
 
     <dt id="cfg_Servers_host">$cfg['Servers'][$i]['host'] string</dt>
@@ -677,7 +677,7 @@ since this link provides funding for phpMyAdmin.
     <dt id="cfg_Servers_socket">$cfg['Servers'][$i]['socket'] string</dt>
     <dd>The path to the socket to use. Leave blank for default.<br />
         To determine the correct socket, check your MySQL configuration or, using the
-        <tt>mysql</tt> command&#8211;line client, issue the <tt>status</tt> command.
+        <code>mysql</code> command&#8211;line client, issue the <code>status</code> command.
         Among the resulting information displayed will be the socket used.</dd>
 
     <dt id="cfg_Servers_ssl">$cfg['Servers'][$i]['ssl'] boolean</dt>
@@ -686,7 +686,7 @@ since this link provides funding for phpMyAdmin.
 
     <dt id="cfg_Servers_connect_type">$cfg['Servers'][$i]['connect_type'] string</dt>
     <dd>What type connection to use with the MySQL server. Your options are
-        <tt>'socket'</tt> and <tt>'tcp'</tt>. It defaults to 'tcp' as that
+        <code>'socket'</code> and <code>'tcp'</code>. It defaults to 'tcp' as that
         is nearly guaranteed to be available on all MySQL servers, while
         sockets are not supported on some platforms.<br /><br />
 
@@ -697,10 +697,10 @@ since this link provides funding for phpMyAdmin.
     <dd>What php MySQL extension to use for the connection. Valid options are:
         <br /><br />
 
-        <tt><em>mysql</em></tt> :
+        <code><em>mysql</em></code> :
         The classic MySQL extension.<br /><br />
 
-        <tt><em>mysqli</em></tt> :
+        <code><em>mysqli</em></code> :
         The improved MySQL extension. This extension became available
         with PHP 5.0.0 and is the recommended way to connect to a server
         running MySQL 4.1.x or newer.</dd>
@@ -723,14 +723,14 @@ since this link provides funding for phpMyAdmin.
         all relational features (see
         <a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
         and, for a MySQL server running with
-        <tt>--skip-show-database</tt>, to enable a multi-user installation
+        <code>--skip-show-database</code>, to enable a multi-user installation
         (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode).<br /><br />
 
         When using <abbr title="HyperText Transfer Protocol">HTTP</abbr> or
         cookie authentication modes (or 'config'
         authentication mode since phpMyAdmin 2.2.1), you need to supply the
-        details of a MySQL account that has <tt>SELECT</tt> privilege on the
+        details of a MySQL account that has <code>SELECT</code> privilege on the
         <em>mysql.user (all columns except &quot;Password&quot;)</em>,
         <em>mysql.db (all columns)</em> and <em>mysql.tables_priv (all columns
         except &quot;Grantor&quot; and &quot;Timestamp&quot;) </em>tables.
@@ -743,26 +743,26 @@ since this link provides funding for phpMyAdmin.
         &quot;stduser/stdpass&quot;.</dd>
 
     <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string
-        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt>
+        <code>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</code></dt>
     <dd>Whether config or cookie or
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> or signon authentication
         should be used for this server.
-        <ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>)
+        <ul><li>'config' authentication (<code>$auth_type&nbsp;=&nbsp;'config'</code>)
                 is the plain old way: username and password are stored in
                 <em>config.inc.php</em>.</li>
             <li>'cookie' authentication mode
-                (<tt>$auth_type&nbsp;=&nbsp;'cookie'</tt>) as introduced in
+                (<code>$auth_type&nbsp;=&nbsp;'cookie'</code>) as introduced in
                 2.2.3 allows you to log in as any valid MySQL user with the
                 help of cookies. Username and password are stored in
                 cookies during the session and password is deleted when it
                 ends. This can also allow you to log in in arbitrary server if
-                <tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled.
+                <code><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></code> enabled.
             </li>
             <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in previous versions and can be written also as 'http')
-                (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
+                (<code>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</code>) as introduced in 1.3.0
                 allows you to log in as any valid MySQL user via HTTP-Auth.</li>
             <li>'signon' authentication mode
-                (<tt>$auth_type&nbsp;=&nbsp;'signon'</tt>)
+                (<code>$auth_type&nbsp;=&nbsp;'signon'</code>)
                 as introduced in 2.10.0 allows you to log in from prepared PHP
                 session data or using supplied PHP script. This is useful for implementing single signon
                 from another application.
@@ -828,8 +828,8 @@ since this link provides funding for phpMyAdmin.
         will be shown to the user. Since phpMyAdmin 2.2.1, this/these
         database(s) name(s) may contain MySQL wildcards characters
         (&quot;_&quot; and &quot;%&quot;): if you want to use literal instances
-        of these characters, escape them (I.E. use <tt>'my\_db'</tt> and not
-        <tt>'my_db'</tt>).<br />
+        of these characters, escape them (I.E. use <code>'my\_db'</code> and not
+        <code>'my_db'</code>).<br />
         This setting is an efficient way to lower the server load since the
         latter does not need to send MySQL requests to build the available
         database list. But <span class="important">it does not replace the
@@ -839,14 +839,14 @@ since this link provides funding for phpMyAdmin.
         <br /><br />
 
         An example of using more that one database:
-        <tt>$cfg['Servers'][$i]['only_db'] = array('db1', 'db2');</tt>
+        <code>$cfg['Servers'][$i]['only_db'] = array('db1', 'db2');</code>
         <br /><br />
 
         As of phpMyAdmin 2.5.5 the order inside the array is used for sorting the
         databases in the left frame, so that you can individually arrange your databases.<br />
         If you want to have certain databases at the top, but don't care about the others, you do not
         need to specify all other databases. Use:
-        <tt>$cfg['Servers'][$i]['only_db'] = array('db3', 'db4', '*');</tt>
+        <code>$cfg['Servers'][$i]['only_db'] = array('db3', 'db4', '*');</code>
         instead to tell phpMyAdmin that it should display db3 and db4 on top, and the rest in alphabetic
         order.</dd>
 
@@ -887,7 +887,7 @@ since this link provides funding for phpMyAdmin.
         If you are the only user of this phpMyAdmin installation, you can
         use your current database to store those special tables; in this
         case, just put your current database name in
-        <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation,
+        <code>$cfg['Servers'][$i]['pmadb']</code>. For a multi-user installation,
         set this parameter to the name of your central database containing
         the phpMyAdmin configuration storage.</dd>
 
@@ -900,7 +900,7 @@ since this link provides funding for phpMyAdmin.
         To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>enter the table name in
-                <tt>$cfg['Servers'][$i]['bookmarktable']</tt></li>
+                <code>$cfg['Servers'][$i]['bookmarktable']</code></li>
         </ul>
     </dd>
 
@@ -937,7 +937,7 @@ since this link provides funding for phpMyAdmin.
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin 
                 configuration storage</li>
             <li>put the relation table name in
-                <tt>$cfg['Servers'][$i]['relation']</tt></li>
+                <code>$cfg['Servers'][$i]['relation']</code></li>
             <li>now as normal user open phpMyAdmin and for each one of your
                 tables where you want to use this feature, click
                 &quot;Structure/Relation view/&quot; and choose foreign
@@ -945,8 +945,8 @@ since this link provides funding for phpMyAdmin.
                 </li>
         </ul>
 
-        Please note that in the current version, <tt>master_db</tt>
-        must be the same as <tt>foreign_db</tt>. Those columns have been put in
+        Please note that in the current version, <code>master_db</code>
+        must be the same as <code>foreign_db</code>. Those columns have been put in
         future development of the cross-db relations.
     </dd>
 
@@ -961,7 +961,7 @@ since this link provides funding for phpMyAdmin.
         table. To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the table name in
-                <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
+                <code>$cfg['Servers'][$i]['table_info']</code> (e.g.
                 'pma_table_info')</li>
             <li>then for each table where you want to use this feature,
                 click &quot;Structure/Relation view/Choose column to display&quot;
@@ -988,8 +988,8 @@ since this link provides funding for phpMyAdmin.
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the correct table names in
-                <tt>$cfg['Servers'][$i]['table_coords']</tt> and
-                <tt>$cfg['Servers'][$i]['pdf_pages']</tt></li>
+                <code>$cfg['Servers'][$i]['table_coords']</code> and
+                <code>$cfg['Servers'][$i]['pdf_pages']</code></li>
         </ul>
 
         Usage tips: <a href="#faqpdf"><abbr title="Portable Document Format">PDF</abbr> output</a>.
@@ -1019,7 +1019,7 @@ since this link provides funding for phpMyAdmin.
         To allow the usage of this functionality:
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
             <li>put the table name in
-                <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
+                <code>$cfg['Servers'][$i]['column_info']</code> (e.g.
                 'pma_column_info')</li>
             <li>to update your PRE-2.5.0 Column_comments Table use this:
 
@@ -1032,8 +1032,8 @@ ALTER TABLE `pma_column_comments`
 
                 and remember that the Variable in <em>config.inc.php</em> has been
                 renamed from<br />
-                <tt>$cfg['Servers'][$i]['column_comments']</tt> to
-                <tt>$cfg['Servers'][$i]['column_info']</tt></li>
+                <code>$cfg['Servers'][$i]['column_comments']</code> to
+                <code>$cfg['Servers'][$i]['column_info']</code></li>
         </ul>
     </dd>
 
@@ -1058,7 +1058,7 @@ ALTER TABLE `pma_column_comments`
         To allow the usage of this functionality:
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
+            <li>put the table name in <code>$cfg['Servers'][$i]['history']</code>
             (e.g. 'pma_history')
                 </li>
         </ul>
@@ -1083,7 +1083,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. 'pma_recent')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['recent']</code> (e.g. 'pma_recent')</li>
         </ul>
     </dd>
 
@@ -1102,7 +1102,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. 'pma_table_uiprefs')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['table_uiprefs']</code> (e.g. 'pma_table_uiprefs')</li>
         </ul>
     </dd>
 
@@ -1132,7 +1132,7 @@ ALTER TABLE `pma_column_comments`
 
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['tracking']</code> (e.g. 'pma_tracking')</li>
         </ul>
     </dd>
 
@@ -1210,7 +1210,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         <ul>
             <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin
             configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li>
+            <li>put the table name in <code>$cfg['Servers'][$i]['userconfig']</code></li>
         </ul>
     </dd>
 
@@ -1224,7 +1224,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         To allow the usage of this functionality:
 
         <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
-            <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
+            <li>put the table name in <code>$cfg['Servers'][$i]['designer_coords']</code> (e.g. 'pma_designer_coords')
                 </li>
         </ul>
     </dd>
@@ -1242,7 +1242,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     </dt>
     <dd>Because release 2.5.0 introduced the new MIME-transformation support, the
         column_info table got enhanced with three new columns. If the above variable
-        is set to <tt>TRUE</tt> (default) phpMyAdmin will check if you have the
+        is set to <code>TRUE</code> (default) phpMyAdmin will check if you have the
         latest table structure available. If not, it will emit a warning to the
         superuser.<br /><br />
 
@@ -1258,7 +1258,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dt><span id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span>
         boolean</dt>
     <dd>Whether to allow logins without a password. The default
-    value of <tt>false</tt> for this parameter prevents unintended access 
+    value of <code>false</code> for this parameter prevents unintended access 
     to a MySQL server with was left with an empty password for root or
     on which an anonymous (blank) user is defined.
     </dd>
@@ -1268,12 +1268,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr>
         authorization is disabled.<br /><br />
 
-        If your rule order is set to <tt>'deny,allow'</tt> then the system applies
+        If your rule order is set to <code>'deny,allow'</code> then the system applies
         all deny rules followed by allow rules. Access is allowed by default. Any
         client which does not match a Deny command or does match an Allow command
         will be allowed access to the server. <br /><br />
 
-        If your rule order is set to <tt>'allow,deny'</tt> then the system
+        If your rule order is set to <code>'allow,deny'</code> then the system
         applies all allow rules followed by deny rules. Access is denied by
         default.  Any client which does not match an Allow directive or does
         match a Deny directive will be denied access to the server.<br /><br />
@@ -1299,7 +1299,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 &lt;'allow' | 'deny'&gt; &lt;username&gt; [from] &lt;ipmask&gt;
 </pre>
 
-        If you wish to match all users, it is possible to use a <tt>'%'</tt> as
+        If you wish to match all users, it is possible to use a <code>'%'</code> as
         a wildcard in the <em>username</em> field.<br />
         There are a few shortcuts you can use in the <em>ipmask</em> field as
         well (please note that those containing SERVER_ADDRESS might not be
@@ -1313,28 +1313,28 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 </pre>
 
         Having an empty rule list is equivalent to either using
-        <tt>'allow % from all'</tt> if your rule order is set to
-        <tt>'deny,allow'</tt> or <tt>'deny % from all'</tt> if your rule order
-        is set to <tt>'allow,deny'</tt> or <tt>'explicit'</tt>.<br /><br />
+        <code>'allow % from all'</code> if your rule order is set to
+        <code>'deny,allow'</code> or <code>'deny % from all'</code> if your rule order
+        is set to <code>'allow,deny'</code> or <code>'explicit'</code>.<br /><br />
 
         For the <abbr title="Internet Protocol">IP</abbr> matching system, the
         following work:<br />
-        <tt>xxx.xxx.xxx.xxx</tt>        (an exact <abbr title="Internet Protocol">IP</abbr> address)<br />
-        <tt>xxx.xxx.xxx.[yyy-zzz]</tt>  (an <abbr title="Internet Protocol">IP</abbr> address range)<br />
-        <tt>xxx.xxx.xxx.xxx/nn</tt>     (CIDR, Classless Inter-Domain Routing type <abbr title="Internet Protocol">IP</abbr> addresses)<br />
+        <code>xxx.xxx.xxx.xxx</code>        (an exact <abbr title="Internet Protocol">IP</abbr> address)<br />
+        <code>xxx.xxx.xxx.[yyy-zzz]</code>  (an <abbr title="Internet Protocol">IP</abbr> address range)<br />
+        <code>xxx.xxx.xxx.xxx/nn</code>     (CIDR, Classless Inter-Domain Routing type <abbr title="Internet Protocol">IP</abbr> addresses)<br />
         But the following does not work:<br />
-        <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial
+        <code>xxx.xxx.xxx.xx[yyy-zzz]</code> (partial
         <abbr title="Internet Protocol">IP</abbr> address range)<br />
         Also IPv6 addresses are not supported.
     </dd>
     <dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span> boolean</dt>
-    <dd>Disable using <tt>INFORMATION_SCHEMA</tt> to retrieve information (use <tt>SHOW</tt> commands instead), because of speed issues when many databases are present. Currently used in some parts of the code, more to come.
+    <dd>Disable using <code>INFORMATION_SCHEMA</code> to retrieve information (use <code>SHOW</code> commands instead), because of speed issues when many databases are present. Currently used in some parts of the code, more to come.
     </dd>
     <dt><span id="cfg_Servers_ShowDatabasesCommand">$cfg['Servers'][$i]['ShowDatabasesCommand']</span> string</dt>
-    <dd>On a server with a huge number of databases, the default <tt>SHOW
-        DATABASES</tt> command used to fetch the name of available databases will
+    <dd>On a server with a huge number of databases, the default <code>SHOW
+        DATABASES</code> command used to fetch the name of available databases will
     probably be too slow, so it can be replaced by faster commands (see
-    <tt>libraries/config.default.php</tt> for examples).
+    <code>libraries/config.default.php</code> for examples).
     </dd>
     <dt><span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span> boolean</dt>
     <dd>Whether to count the number of tables for each database when preparing the list of databases for the navigation frame.
@@ -1367,10 +1367,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 
     <dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt>
     <dd>If you have more than one server configured, you can set
-        <tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to
+        <code>$cfg['ServerDefault']</code> to any one of them to autoconnect to
         that server when phpMyAdmin is started, or set it to 0 to be given a
         list of servers without logging in.<br />
-        If you have only one server configured, <tt>$cfg['ServerDefault']</tt>
+        If you have only one server configured, <code>$cfg['ServerDefault']</code>
         MUST be set to that server.</dd>
 
     <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] boolean</dt>
@@ -1476,7 +1476,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         authentication mode.<br /><br />
 
         This is automatically disabled if you do not have configured 
-        <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>.
+        <code><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></code>.
         </dd>
 
     <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] integer [number of seconds]</dt>
@@ -1508,7 +1508,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Define whether phpMyAdmin will output the results of each query of a
         multi-query statement embedded into the
         <abbr title="structured query language">SQL</abbr> output as inline
-        comments. Defaults to <tt>TRUE</tt>.</dd>
+        comments. Defaults to <code>TRUE</code>.</dd>
     <dt id="AllowArbitraryServer">
         <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> boolean</dt>
     <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and permits to specify servers of your choice in the Synchronize dialog.
@@ -1583,22 +1583,22 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
 
     <dt id="cfg_LeftDisplayLogo">$cfg['LeftDisplayLogo'] boolean</dt>
     <dd>Defines whether or not to display the phpMyAdmin logo at the top of the left frame.
-        Defaults to <tt>TRUE</tt>.</dd>
+        Defaults to <code>TRUE</code>.</dd>
     <dt id="cfg_LeftLogoLink">$cfg['LeftLogoLink'] string</dt>
     <dd>Enter <abbr title="Uniform Resource Locator">URL</abbr> where logo in the navigation frame will point to.
     For use especially with self made theme which changes this.
-    The default value for this is <tt>main.php</tt>.</dd>
+    The default value for this is <code>main.php</code>.</dd>
 
     <dt id="cfg_LeftLogoLinkWindow">$cfg['LeftLogoLinkWindow'] string</dt>
-    <dd>Whether to open the linked page in the main window (<tt>main</tt>)
-    or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are
-    linking to <tt>phpmyadmin.net</tt>.</dd>
+    <dd>Whether to open the linked page in the main window (<code>main</code>)
+    or in a new one (<code>new</code>). Note: use <code>new</code> if you are
+    linking to <code>phpmyadmin.net</code>.</dd>
 
     <dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum']
     integer</dt>
     <dd>Defines the minimum number of tables to display a JavaScript filter box above the
     list of tables in the left frame.
-    Defaults to <tt>30</tt>. To disable the filter completely some high number
+    Defaults to <code>30</code>. To disable the filter completely some high number
     can he used (e.g. 9999)</dd>
 
     <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
@@ -1628,7 +1628,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dt><span id="cfg_ShowServerInfo">$cfg['ShowServerInfo'] </span>boolean</dt>
     <dd>Defines whether to display detailed server information on main page.
         You can additionally hide more information by using
-        <tt><a href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></tt>.
+        <code><a href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></code>.
         </dd>
 
     <dt><span id="cfg_ShowPhpInfo">$cfg['ShowPhpInfo'] </span>boolean<br />
@@ -1670,10 +1670,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Number of rows displayed when browsing a result set and no LIMIT
     clause is used. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.</dd>
 
-    <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt>
-    <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order,
-        in descending (<tt>DESC</tt>) order or in a &quot;smart&quot;
-        (<tt>SMART</tt>) order - I.E. descending order for columns of type TIME,
+    <dt id="cfg_Order">$cfg['Order'] string [<code>DESC</code>|<code>ASC</code>|<code>SMART</code>]</dt>
+    <dd>Defines whether columns are displayed in ascending (<code>ASC</code>) order,
+        in descending (<code>DESC</code>) order or in a &quot;smart&quot;
+        (<code>SMART</code>) order - I.E. descending order for columns of type TIME,
         DATE, DATETIME and TIMESTAMP, ascending order else- by default.</dd>
 
     <dt id="cfg_DisplayBinaryAsHex">$cfg['DisplayBinaryAsHex'] boolean </dt>
@@ -1681,12 +1681,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     option is ticked by default.</dd>
 
     <dt id="cfg_ProtectBinary">$cfg['ProtectBinary'] boolean or string</dt>
-    <dd>Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> columns are protected
+    <dd>Defines whether <code>BLOB</code> or <code>BINARY</code> columns are protected
         from editing when browsing a table's content. Valid values are:
-        <ul><li><tt>FALSE</tt> to allow editing of all columns;</li>
-            <li><tt>'blob'</tt> to allow editing of all columns except <tt>BLOBS</tt>;</li>
-            <li><tt>'all'</tt> to disallow editing of all <tt>BINARY</tt> or
-                <tt>BLOB</tt> columns.</li>
+        <ul><li><code>FALSE</code> to allow editing of all columns;</li>
+            <li><code>'blob'</code> to allow editing of all columns except <code>BLOBS</code>;</li>
+            <li><code>'all'</code> to disallow editing of all <code>BINARY</code> or
+                <code>BLOB</code> columns.</li>
         </ul>
     </dd>
 
@@ -1751,14 +1751,14 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         normal programs handle this correctly.</dd>
 
     <dt id="cfg_LightTabs">$cfg['LightTabs'] boolean</dt>
-    <dd>If set to <tt>TRUE</tt>, use less graphically intense tabs on the top of the
+    <dd>If set to <code>TRUE</code>, use less graphically intense tabs on the top of the
         mainframe.</dd>
 
     <dt id="cfg_PropertiesIconic">$cfg['PropertiesIconic'] string</dt>
-    <dd>If set to <tt>TRUE</tt>, will display icons instead of text for db and table
+    <dd>If set to <code>TRUE</code>, will display icons instead of text for db and table
         properties links (like 'Browse', 'Select', 'Insert', ...).<br /> Can be
-        set to <tt>'both'</tt> if you want icons AND text.<br />
-        When set to <tt>FALSE</tt>, will only show text.</dd>
+        set to <code>'both'</code> if you want icons AND text.<br />
+        When set to <code>FALSE</code>, will only show text.</dd>
 
     <dt id="cfg_PropertiesNumColumns">$cfg['PropertiesNumColumns'] integer</dt>
     <dd>How many columns will be utilized to display the tables on the
@@ -1842,7 +1842,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         Enabled charset conversion activates a pull-down menu
         in the Export and Import pages, to choose the character set when 
         exporting a file. The default value in this menu comes from 
-        <tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
+        <code>$cfg['Export']['charset']</code> and <code>$cfg['Import']['charset']</code>.
         </dd>
 
     <dt id="cfg_IconvExtraParams">$cfg['IconvExtraParams'] string</dt>
@@ -1864,7 +1864,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         want to use rules for IP addresses behind proxy.<br /><br />
 
         The following example specifies that phpMyAdmin should trust a
-        HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy 1.2.3.4:
+        HTTP_X_FORWARDED_FOR (<code>X-Forwarded-For</code>) header coming from the proxy 1.2.3.4:
 <pre>
 $cfg['TrustedProxies'] =
      array('1.2.3.4' =&gt; 'HTTP_X_FORWARDED_FOR');
@@ -1890,7 +1890,7 @@ $cfg['TrustedProxies'] =
     it's not world writable. However, phpMyAdmin could be installed on
     a NTFS filesystem mounted on a non-Windows server, in which case the
     permissions seems wrong but in fact cannot be detected. In this case
-    a sysadmin would set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>.
+    a sysadmin would set this parameter to <code>FALSE</code>. Default is <code>TRUE</code>.
     </dd>
 
     <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] integer</dt>
@@ -1912,39 +1912,39 @@ $cfg['TrustedProxies'] =
     </dd>
 
     <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt>
-    <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>Navi frame width in pixels. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS color for background]<br />
         <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS color for background]
     </dt>
     <dd>The background styles used for both the frames.
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br />
         <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS color]</dt>
     <dd>The style used for the pointer in the navi frame.
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt>
-    <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight
-        is <tt>FALSE</tt>).</dd>
+    <dd>A value of <code>TRUE</code> activates the navi pointer (when LeftFrameLight
+        is <code>FALSE</code>).</dd>
 
     <dt id="cfg_Border">$cfg['Border'] integer</dt>
-    <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The size of a table's border. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br />
         <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt>
     <dd>The style used for table headers. See
-        <tt>themes/themename/layout.inc.php</tt>.</dd>
+        <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt>
-    <dd>The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The color (HTML) #1 for table rows. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt>
-    <dd>The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
+    <dd>The color (HTML) #2 for table rows. See <code>themes/themename/layout.inc.php</code>.
     </dd>
 
     <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] </span>string [CSS color]<br />
@@ -1957,18 +1957,18 @@ $cfg['TrustedProxies'] =
         and the latter lets you visually mark/unmark rows by clicking on
         them. Highlighting / marking a column is done by hovering over /
         clicking the column's header (outside of the text).<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
 
     <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt>
     <dd>You put here a valid CSS font family value, for example
-    <tt>arial, sans-serif</tt>.<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+    <code>arial, sans-serif</code>.<br />
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] string</dt>
     <dd>You put here a valid CSS font family value, for example
-    <tt>monospace</tt>. This one is used in textarea.<br />
-        See <tt>themes/themename/layout.inc.php</tt>.</dd>
+    <code>monospace</code>. This one is used in textarea.<br />
+        See <code>themes/themename/layout.inc.php</code>.</dd>
 
     <dt id="cfg_BrowsePointerEnable">$cfg['BrowsePointerEnable'] boolean</dt>
     <dd>Whether to activate the browse pointer or not.</dd>
@@ -2034,7 +2034,7 @@ $cfg['TrustedProxies'] =
     <dt id="cfg_ShowBrowseComments">$cfg['ShowBrowseComments'] boolean<br />
         <span id="cfg_ShowPropertyComments">$cfg['ShowPropertyComments'] </span>boolean
     </dt>
-    <dd>By setting the corresponding variable to <tt>TRUE</tt> you can enable the
+    <dd>By setting the corresponding variable to <code>TRUE</code> you can enable the
         display of column comments in Browse or Property display. In browse
         mode, the comments are shown inside the header. In property mode,
         comments are displayed using a CSS-formatted dashed-line below the
@@ -2052,7 +2052,7 @@ $cfg['TrustedProxies'] =
 
     <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>
+        See also <code><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></code>.</dd>
 
     <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>
@@ -2107,18 +2107,18 @@ $cfg['TrustedProxies'] =
 
         This is needed for importing ESRI Shapefiles, see
         <a href="#faq6_30"><abbr title="Frequently Asked Questions">FAQ</abbr>
-        6.30</a> and to work around limitations of <tt>open_basedir</tt> for uploaded
+        6.30</a> and to work around limitations of <code>open_basedir</code> for uploaded
         files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
         1.11</a>.
         <br /><br />
 
     If the directory where phpMyAdmin is installed is subject to an
-    <tt>open_basedir</tt> restriction, you need to create a
+    <code>open_basedir</code> restriction, you need to create a
         temporary directory in some directory accessible by the web
         server. However for security reasons, this directory should be outside
         the tree published by webserver. If you cannot avoid having this
         directory published by webserver, place at least an empty
-        <tt>index.html</tt> file there, so that directory listing is not
+        <code>index.html</code> file there, so that directory listing is not
         possible.
         <br /><br />
 
@@ -2158,9 +2158,9 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
         <ul>
-        <li><tt>quick</tt> to display the minimum number of options to configure</li>
-        <li><tt>custom</tt> to display every available option to configure</li>
-        <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the option of using quick export</li>
+        <li><code>quick</code> to display the minimum number of options to configure</li>
+        <li><code>custom</code> to display every available option to configure</li>
+        <li><code>custom-no-form</code> same as <code>custom</code> but does not display the option of using quick export</li>
         </ul>
     </dd>
 
@@ -2195,19 +2195,19 @@ setfacl -d -m "g:www-data:rwx" tmp
         <span id="cfg_QueryHistoryMax">$cfg['QueryHistoryMax'] </span>integer
     </dt>
     <dd>
-        All those variables affect the query window feature. A <tt><abbr title="structured query language">SQL</abbr></tt> link
+        All those variables affect the query window feature. A <code><abbr title="structured query language">SQL</abbr></code> link
         or icon is always displayed on the left panel. If JavaScript is enabled in
         your browser, a click on this opens a distinct query window, which is
         a direct interface to enter <abbr title="structured query language">SQL</abbr> queries. Otherwise, the right panel
         changes to display a query box.<br /><br />
 
         The size of this query window can be customized with
-        <tt>$cfg['QueryWindowWidth']</tt> and <tt>$cfg['QueryWindowHeight']</tt>
+        <code>$cfg['QueryWindowWidth']</code> and <code>$cfg['QueryWindowHeight']</code>
         - both integers for the size in pixels. Note that normally, those
-        parameters will be modified in <tt>layout.inc.php</tt> for the
+        parameters will be modified in <code>layout.inc.php</code> for the
         theme you are using.<br /><br />
 
-        If <tt>$cfg['EditInWindow']</tt> is set to true, a click on [Edit]
+        If <code>$cfg['EditInWindow']</code> is set to true, a click on [Edit]
         from the results page (in the &quot;Showing Rows&quot; section)
         opens the query window and puts the current query
         inside it.  If set to false, clicking on the link puts the <abbr title="structured query language">SQL</abbr>
@@ -2219,7 +2219,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         use that feature. It currently is only tested with Internet Explorer 6
         and Mozilla 1.x.
         <br /><br />
-        If <tt>$cfg['QueryHistoryDB']</tt> is set to <tt>TRUE</tt>, all your Queries are logged
+        If <code>$cfg['QueryHistoryDB']</code> is set to <code>TRUE</code>, all your Queries are logged
         to a table, which has to be created by you (see <a
         href="#history" class="configrule">$cfg['Servers'][$i]['history']</a>).  If set to FALSE,
         all your queries will be appended to the form, but only as long as
@@ -2237,11 +2237,11 @@ setfacl -d -m "g:www-data:rwx" tmp
         uncheck the button whenever you definitely want the query window to
         get updated even though you have made alterations.
         <br /><br />
-        If <tt>$cfg['QueryHistoryDB']</tt> is set to <tt>TRUE</tt> you can specify the amount of
-        saved history items using <tt>$cfg['QueryHistoryMax']</tt>.
+        If <code>$cfg['QueryHistoryDB']</code> is set to <code>TRUE</code> you can specify the amount of
+        saved history items using <code>$cfg['QueryHistoryMax']</code>.
         <br /><br />
         The query window also has a custom tabbed look to group the features.
-        Using the variable <tt>$cfg['QueryWindowDefTab']</tt> you can specify the
+        Using the variable <code>$cfg['QueryWindowDefTab']</code> you can specify the
         default tab to be used when opening the query window. It can be set to
         either 'sql', 'files', 'history' or 'full'.</dd>
 
@@ -2269,14 +2269,14 @@ setfacl -d -m "g:www-data:rwx" tmp
         and in Database view, for the table list.</dd>
 
     <dt id="cfg_InitialSlidersState">$cfg['InitialSlidersState'] string</dt>
-    <dd>If set to <tt>'closed'</tt>, the visual sliders are initially in a
-    closed state. A value of <tt>'open'</tt> does the reverse. To completely 
-    disable all visual sliders, use <tt>'disabled'</tt>.</dd>
+    <dd>If set to <code>'closed'</code>, the visual sliders are initially in a
+    closed state. A value of <code>'open'</code> does the reverse. To completely 
+    disable all visual sliders, use <code>'disabled'</code>.</dd>
 
     <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] array</dt>
-    <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array)
+    <dd>Contains names of configuration options (keys in <code>$cfg</code> array)
         that users can't set through user preferences. For possible values, refer
-        to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
+        to <code>libraries/config/user_preferences.forms.php</code>.</dd>
 
     <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt>
     <dd>Activates in the user preferences a tab containing options for 
@@ -2309,7 +2309,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         <abbr title="Frequently Asked Questions">FAQ</abbr> 2.7</a>.</dd>
 
     <dt id="cfg_ThemeDefault">$cfg['ThemeDefault'] string</dt>
-    <dd>The default theme (a subdirectory under <tt>cfg['ThemePath']</tt>).</dd>
+    <dd>The default theme (a subdirectory under <code>cfg['ThemePath']</code>).</dd>
 
     <dt id="cfg_ThemePerServer">$cfg['ThemePerServer'] boolean</dt>
     <dd>Whether to allow different theme for each server.</dd>
@@ -2322,19 +2322,19 @@ setfacl -d -m "g:www-data:rwx" tmp
         <a href="#faq6_27">format string expansion</a>.
         </dd>
 
-    <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<tt>html</tt>|<tt>none</tt>]</dt>
+    <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<code>html</code>|<code>none</code>]</dt>
     <dd>
         The main use of the new <abbr title="structured query language">SQL</abbr> Parser is to pretty-print <abbr title="structured query language">SQL</abbr> queries. By
         default we use HTML to format the query, but you can disable this by
-        setting this variable to <tt>'none'</tt>.
+        setting this variable to <code>'none'</code>.
     </dd>
 
     <dt id="cfg_SQP_fmtInd">$cfg['SQP']['fmtInd'] float<br />
-        <span id="cfg_SQP">$cfg['SQP']['fmtIndUnit']</span> string [<tt>em</tt>|<tt>px</tt>|<tt>pt</tt>|<tt>ex</tt>]</dt>
+        <span id="cfg_SQP">$cfg['SQP']['fmtIndUnit']</span> string [<code>em</code>|<code>px</code>|<code>pt</code>|<code>ex</code>]</dt>
     <dd>For the pretty-printing of <abbr title="structured query language">SQL</abbr> queries, under some cases the part of a
         query inside a bracket is indented. By changing
-        <tt>$cfg['SQP']['fmtInd']</tt> you can change the amount of this indent.
-        <br />Related in purpose is <tt>$cfg['SQP']['fmtIndUnit']</tt> which
+        <code>$cfg['SQP']['fmtInd']</code> you can change the amount of this indent.
+        <br />Related in purpose is <code>$cfg['SQP']['fmtIndUnit']</code> which
         specifies the units of the indent amount that you specified. This is
         used via stylesheets.</dd>
 
@@ -2347,30 +2347,30 @@ setfacl -d -m "g:www-data:rwx" tmp
         You should not alter the class names, only the colour strings.<br />
         <strong>Class name key:</strong>
         <ul><li><strong>comment</strong> Applies to all comment sub-classes</li>
-            <li><strong>comment_mysql</strong> Comments as <tt>"#...\n"</tt></li>
-            <li><strong>comment_ansi</strong> Comments as <tt>"-- ...\n"</tt></li>
-            <li><strong>comment_c</strong> Comments as <tt>"/*...*/"</tt></li>
+            <li><strong>comment_mysql</strong> Comments as <code>"#...\n"</code></li>
+            <li><strong>comment_ansi</strong> Comments as <code>"-- ...\n"</code></li>
+            <li><strong>comment_c</strong> Comments as <code>"/*...*/"</code></li>
             <li><strong>digit</strong> Applies to all digit sub-classes</li>
             <li><strong>digit_hex</strong> Hexadecimal numbers</li>
             <li><strong>digit_integer</strong> Integer numbers</li>
             <li><strong>digit_float</strong> Floating point numbers</li>
             <li><strong>punct</strong> Applies to all punctuation sub-classes</li>
-            <li><strong>punct_bracket_open_round</strong> Opening brackets<tt>"("</tt></li>
-            <li><strong>punct_bracket_close_round</strong> Closing brackets <tt>")"</tt></li>
-            <li><strong>punct_listsep</strong> List item Separator <tt>","</tt></li>
-            <li><strong>punct_qualifier</strong> Table/Column Qualifier <tt>"."</tt> </li>
-            <li><strong>punct_queryend</strong> End of query marker <tt>";"</tt></li>
+            <li><strong>punct_bracket_open_round</strong> Opening brackets<code>"("</code></li>
+            <li><strong>punct_bracket_close_round</strong> Closing brackets <code>")"</code></li>
+            <li><strong>punct_listsep</strong> List item Separator <code>","</code></li>
+            <li><strong>punct_qualifier</strong> Table/Column Qualifier <code>"."</code> </li>
+            <li><strong>punct_queryend</strong> End of query marker <code>";"</code></li>
             <li><strong>alpha</strong> Applies to all alphabetic classes</li>
             <li><strong>alpha_columnType</strong> Identifiers matching a column type</li>
             <li><strong>alpha_columnAttrib</strong> Identifiers matching a database/table/column attribute</li>
             <li><strong>alpha_functionName</strong> Identifiers matching a MySQL function name</li>
             <li><strong>alpha_reservedWord</strong> Identifiers matching any other reserved word</li>
-            <li><strong>alpha_variable</strong> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <tt>"@foo"</tt></li>
+            <li><strong>alpha_variable</strong> Identifiers matching a <abbr title="structured query language">SQL</abbr> variable <code>"@foo"</code></li>
             <li><strong>alpha_identifier</strong> All other identifiers</li>
             <li><strong>quote</strong> Applies to all quotation mark classes</li>
-            <li><strong>quote_double</strong> Double quotes <tt>"</tt></li>
-            <li><strong>quote_single</strong> Single quotes <tt>'</tt></li>
-            <li><strong>quote_backtick</strong> Backtick quotes <tt>`</tt></li>
+            <li><strong>quote_double</strong> Double quotes <code>"</code></li>
+            <li><strong>quote_single</strong> Single quotes <code>'</code></li>
+            <li><strong>quote_backtick</strong> Backtick quotes <code>`</code></li>
         </ul>
     </dd>
 
@@ -2386,7 +2386,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
             <dt id="cfg_SQLValidator_username">$cfg['SQLValidator']['username'] string<br />
                 <span id="cfg_SQLValidator_password">$cfg['SQLValidator']['password']</span> string</dt>
-            <dd>The SOAP service allows you to log in with <tt>anonymous</tt>
+            <dd>The SOAP service allows you to log in with <code>anonymous</code>
                 and any password, so we use those by default. Instead, if
                 you have an account with them, you can put your login details
                 here, and it will be used in place of the anonymous login.</dd>
@@ -2441,7 +2441,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <h3 id="transformationsintro">1. Introduction</h3>
 
-<p> To enable transformations, you have to setup the <tt>column_info</tt> table
+<p> To enable transformations, you have to setup the <code>column_info</code> table
     and the proper directives. Please see the <a href="#config">Configuration
     section</a> on how to do so.</p>
 
@@ -2535,7 +2535,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 
 <ol><li>A mimetype+subtype transform:<br /><br />
 
-        <tt>[mimetype]_[subtype]__[transform].inc.php</tt><br /><br />
+        <code>[mimetype]_[subtype]__[transform].inc.php</code><br /><br />
 
         Please not that mimetype and subtype are separated via '_', which shall
         not be contained in their names. The transform function/filename may
@@ -2543,16 +2543,16 @@ setfacl -d -m "g:www-data:rwx" tmp
         well as the PHP function naming convention.<br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_[mimetype]_[subtype]__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text_html__formatted.inc.php</tt><br />
-        <tt>PMA_transform_text_html__formatted()</tt></li>
+        <code>text_html__formatted.inc.php</code><br />
+        <code>PMA_transform_text_html__formatted()</code></li>
 
     <li>A mimetype (w/o subtype) transform:<br /><br />
 
-        <tt>[mimetype]__[transform].inc.php</tt><br /><br />
+        <code>[mimetype]__[transform].inc.php</code><br /><br />
 
         Please note that there are no single '_' characters.
         The transform function/filename may contain only characters which cause
@@ -2560,16 +2560,16 @@ setfacl -d -m "g:www-data:rwx" tmp
         convention.<br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_[mimetype]__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_[mimetype]__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text__formatted.inc.php</tt><br />
-        <tt>PMA_transform_text__formatted()</tt></li>
+        <code>text__formatted.inc.php</code><br />
+        <code>PMA_transform_text__formatted()</code></li>
 
     <li>A mimetype+subtype without specific transform function<br /><br />
 
-        <tt>[mimetype]_[subtype].inc.php</tt><br /><br />
+        <code>[mimetype]_[subtype].inc.php</code><br /><br />
 
         Please note that there are no '__' characters in the filename. Do not
         use special characters in the filename causing problems with the file
@@ -2579,12 +2579,12 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text_plain.inc.php</tt><br />
+        <code>text_plain.inc.php</code><br />
         (No function)</li>
 
     <li>A mimetype (w/o subtype) without specific transform function<br /><br />
 
-        <tt>[mimetype].inc.php</tt><br /><br />
+        <code>[mimetype].inc.php</code><br /><br />
 
         Please note that there are no '_' characters in the filename. Do not use
         special characters in the filename causing problems with the file system.
@@ -2594,20 +2594,20 @@ setfacl -d -m "g:www-data:rwx" tmp
 
         <strong>Example:</strong><br /><br />
 
-        <tt>text.inc.php</tt><br />
+        <code>text.inc.php</code><br />
         (No function)</li>
 
     <li>A global transform function with no specific mimetype<br /><br />
 
-        <tt>global__[transform].inc.php</tt><br /><br />
+        <code>global__[transform].inc.php</code><br /><br />
 
         The transform function will the be called
-        '<tt>PMA_transform_global__[transform]()</tt>'.<br /><br />
+        '<code>PMA_transform_global__[transform]()</code>'.<br /><br />
 
         <strong>Example:</strong><br /><br />
 
-        <tt>global__formatted</tt><br />
-        <tt>PMA_transform_global__formatted()</tt></li>
+        <code>global__formatted</code><br />
+        <code>PMA_transform_global__formatted()</code></li>
 </ol>
 
 <p> So generally use '_' to split up mimetype and subtype, and '__' to provide a
@@ -2621,9 +2621,9 @@ setfacl -d -m "g:www-data:rwx" tmp
     without a transform function.</p>
 
 <p> To create a new transform function please see
-    <tt>libraries/transformations/template_generator.sh</tt>.
+    <code>libraries/transformations/template_generator.sh</code>.
     To create a new, empty mimetype please see
-    <tt>libraries/transformations/template_generator_mimetype.sh</tt>.</p>
+    <code>libraries/transformations/template_generator_mimetype.sh</code>.</p>
 
 <p> A transform function always gets passed three variables:</p>
 
@@ -2681,8 +2681,8 @@ setfacl -d -m "g:www-data:rwx" tmp
     cryptic characters to my browser, what can I do?</a></h4>
 
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a>
-    directive to <tt>FALSE</tt> in your <em>config.inc.php</em> file and the
-    <tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php
+    directive to <code>FALSE</code> in your <em>config.inc.php</em> file and the
+    <code>zlib.output_compression</code> directive to <code>Off</code> in your php
     configuration file.<br /></p>
 
 <h4 id="faq1_2">
@@ -2726,7 +2726,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <a href="#faq1_6">1.6 I can't use phpMyAdmin on PWS: nothing is displayed!</a></h4>
 
 <p> This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
-    time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
+    time there is no better fix): remove or comment the <code>DOCTYPE</code>
     declarations (2 lines) from the scripts <em>libraries/header.inc.php</em>,
     <em>libraries/header_printview.inc.php</em>, <em>index.php</em>,
     <em>navigation.php</em> and <em>libraries/common.lib.php</em>.</p>
@@ -2736,26 +2736,26 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="comma separated values">CSV</abbr> export? It does not seem to
     work.</a></h4>
 
-<p> These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</tt>
+<p> These features are based on the <code>gzencode()</code> and <code>bzcompress()</code>
     PHP functions to be more independent of the platform (Unix/Windows, Safe Mode
     or not, and so on). So, you must have Zlib/Bzip2
-    support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p>
+    support (<code>--with-zlib</code> and <code>--with-bz2</code>).<br /></p>
 
 <h4 id="faq1_8">
     <a href="#faq1_8">1.8 I cannot insert a text file in a table, and I get
     an error about safe mode being in effect.</a></h4>
 
 <p> Your uploaded file is saved by PHP in the &quot;upload dir&quot;, as
-    defined in <em>php.ini</em> by the variable <tt>upload_tmp_dir</tt> (usually
+    defined in <em>php.ini</em> by the variable <code>upload_tmp_dir</code> (usually
     the system default is <em>/tmp</em>).<br />
     We recommend the following setup for Apache servers running in safe mode,
     to enable uploads of files while being reasonably secure:</p>
 
-<ul><li>create a separate directory for uploads: <tt>mkdir /tmp/php</tt></li>
+<ul><li>create a separate directory for uploads: <code>mkdir /tmp/php</code></li>
     <li>give ownership to the Apache server's user.group:
-        <tt>chown apache.apache /tmp/php</tt></li>
-    <li>give proper permission: <tt>chmod 600 /tmp/php</tt></li>
-    <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <em>php.ini</em></li>
+        <code>chown apache.apache /tmp/php</code></li>
+    <li>give proper permission: <code>chmod 600 /tmp/php</code></li>
+    <li>put <code>upload_tmp_dir = /tmp/php</code> in <em>php.ini</em></li>
     <li>restart Apache</li>
 </ul>
 
@@ -2801,8 +2801,8 @@ setfacl -d -m "g:www-data:rwx" tmp
     <a href="#faq1_15">1.15 I have problems with <em>mysql.user</em> column names.</a>
 </h4>
 
-<p> In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns 
-    were named <tt>user</tt> and <tt>password</tt>. Please modify your column 
+<p> In previous MySQL versions, the <code>User</code> and <code>Password</code>columns 
+    were named <code>user</code> and <code>password</code>. Please modify your column 
     names to align with current standards.</p>
 
 <h4 id="faq1_16">
@@ -2815,12 +2815,12 @@ setfacl -d -m "g:www-data:rwx" tmp
     to take advantage of the new import features.</p>
 
 <p> The first things to check (or ask your host provider to check) are the
-    values of <tt>upload_max_filesize</tt>, <tt>memory_limit</tt> and
-    <tt>post_max_size</tt> in the <em>php.ini</em> configuration file.
+    values of <code>upload_max_filesize</code>, <code>memory_limit</code> and
+    <code>post_max_size</code> in the <em>php.ini</em> configuration file.
     All of these three settings limit the maximum size of data that can be
     submitted and handled by PHP. One user also said that
-    <tt>post_max_size</tt>
-    and <tt>memory_limit</tt> need to be larger than <tt>upload_max_filesize</tt>.<br /> <br />
+    <code>post_max_size</code>
+    and <code>memory_limit</code> need to be larger than <code>upload_max_filesize</code>.<br /> <br />
 
     There exist several workarounds if your upload is too big or your
     hosting provider is unwilling to change the settings:</p>
@@ -2837,7 +2837,7 @@ setfacl -d -m "g:www-data:rwx" tmp
         with it.</li>
     <li>If you have shell (command line) access, use MySQL to import the files
         directly. You can do this by issuing the &quot;source&quot; command from
-        within MySQL: <tt>source <em>filename.sql</em></tt>.</li>
+        within MySQL: <code>source <em>filename.sql</em></code>.</li>
 </ul>
 
 <h4 id="faq1_17">
@@ -2911,23 +2911,23 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="Common Gateway Interface">CGI</abbr> version of PHP under Unix,
     and I cannot log in using cookie auth.</a></h4>
 
-<p> In <em>php.ini</em>, set <tt>mysql.max_links</tt> higher than 1.</p>
+<p> In <em>php.ini</em>, set <code>mysql.max_links</code> higher than 1.</p>
 
 <h4 id="faq1_22">
     <a href="#faq1_22">1.22 I don't see the &quot;Location of text file&quot; field,
     so I cannot upload.</a></h4>
 
-<p> This is most likely because in <em>php.ini</em>, your <tt>file_uploads</tt>
+<p> This is most likely because in <em>php.ini</em>, your <code>file_uploads</code>
     parameter is not set to &quot;on&quot;.</p>
 
 <h4 id="faq1_23">
     <a href="#faq1_23">1.23 I'm running MySQL on a Win32 machine. Each time I create
     a new table the table and column names are changed to lowercase!</a></h4>
 
-<p> This happens because the MySQL directive <tt>lower_case_table_names</tt>
-    defaults to 1 (<tt>ON</tt>) in the Win32 version of MySQL. You can change
-    this behavior by simply changing the directive to 0 (<tt>OFF</tt>):<br />
-    Just edit your <tt>my.ini</tt> file that should be located in your Windows
+<p> This happens because the MySQL directive <code>lower_case_table_names</code>
+    defaults to 1 (<code>ON</code>) in the Win32 version of MySQL. You can change
+    this behavior by simply changing the directive to 0 (<code>OFF</code>):<br />
+    Just edit your <code>my.ini</code> file that should be located in your Windows
     directory and add the following line to the group [mysqld]:</p>
 
 <pre>set-variable = lower_case_table_names=0</pre>
@@ -2982,7 +2982,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     message 'Errorcode: 13'. What does this mean?</a></h4>
 
 <p> This can happen due to a MySQL bug when having database / table names with
-    upper case characters although <tt>lower_case_table_names</tt> is set to 1.
+    upper case characters although <code>lower_case_table_names</code> is set to 1.
     To fix this, turn off this directive, convert all database and table names
     to lower case and turn it on again. Alternatively, there's a bug-fix
     available starting with MySQL&nbsp;3.23.56 / 4.0.11-gamma.</p>
@@ -3007,9 +3007,9 @@ SetInputFilter PHP
 <pre>AddType application/x-httpd-php .php</pre>
 
 <p> In the case we saw, one set of directives was in
-    <tt>/etc/httpd/conf/httpd.conf</tt>, while
-    the other set was in <tt>/etc/httpd/conf/addon-modules/php.conf</tt>.<br />
-    The recommended way is with <tt>AddType</tt>, so just comment out
+    <code>/etc/httpd/conf/httpd.conf</code>, while
+    the other set was in <code>/etc/httpd/conf/addon-modules/php.conf</code>.<br />
+    The recommended way is with <code>AddType</code>, so just comment out
     the first set of lines and restart Apache:</p>
 
 <pre>
@@ -3038,14 +3038,14 @@ SetInputFilter PHP
 <p> Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in <abbr title="Internet Server Application Programming Interface">ISAPI</abbr>
     mode under <abbr title="Internet Information Services">IIS</abbr> 5.1.</p>
 
-<ol><li>In your <tt>php.ini</tt> file, set <tt>cgi.rfc2616_headers = 0</tt></li>
-    <li>In <tt>Web Site Properties -&gt; File/Directory Security -&gt; Anonymous
-        Access</tt> dialog box, check the <tt>Anonymous access</tt> checkbox and
-        uncheck any other checkboxes (i.e. uncheck <tt>Basic authentication</tt>,
-        <tt>Integrated Windows authentication</tt>, and <tt>Digest</tt> if it's
-        enabled.) Click <tt>OK</tt>.</li>
-    <li>In <tt>Custom Errors</tt>, select the range of <tt>401;1</tt> through
-        <tt>401;5</tt> and click the <tt>Set to Default</tt> button.</li>
+<ol><li>In your <code>php.ini</code> file, set <code>cgi.rfc2616_headers = 0</code></li>
+    <li>In <code>Web Site Properties -&gt; File/Directory Security -&gt; Anonymous
+        Access</code> dialog box, check the <code>Anonymous access</code> checkbox and
+        uncheck any other checkboxes (i.e. uncheck <code>Basic authentication</code>,
+        <code>Integrated Windows authentication</code>, and <code>Digest</code> if it's
+        enabled.) Click <code>OK</code>.</li>
+    <li>In <code>Custom Errors</code>, select the range of <code>401;1</code> through
+        <code>401;5</code> and click the <code>Set to Default</code> button.</li>
 </ol>
 
 <h4 id="faq1_33">
@@ -3055,8 +3055,8 @@ SetInputFilter PHP
     <a href="#faq1_34">1.34 Can I access directly to database or table pages?</a></h4>
 
 <p> Yes. Out of the box, you can use <abbr title="Uniform Resource Locator">URL</abbr>s like
-http://server/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script. For <tt>server</tt> you use the server number which refers to
-the order of the server paragraph in <tt>config.inc.php</tt>.
+http://server/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script. For <code>server</code> you use the server number which refers to
+the order of the server paragraph in <code>config.inc.php</code>.
     Table and script parts are optional. If you want
     http://server/phpMyAdmin/database[/table][/script] <abbr title="Uniform Resource Locator">URL</abbr>s, you need to do
     some configuration. Following lines apply only for <a
@@ -3142,7 +3142,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 
     <p>
         You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning">
-        <tt>SuhosinDisableWarning</tt> directive</a>.
+        <code>SuhosinDisableWarning</code> directive</a>.
     </p>
 
 <h4 id="faq1_39">
@@ -3150,7 +3150,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
     but then my connection is redirected back to http. What can cause this 
     behavior?</a></h4>
 
-<p> Be sure that you have enabled <tt>SSLOptions</tt> and <tt>StdEnvVars</tt>
+<p> Be sure that you have enabled <code>SSLOptions</code> and <code>StdEnvVars</code>
 in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>
 
 <h4 id="faq1_40">
@@ -3185,7 +3185,7 @@ ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
            privileges, I get an error about an unknown column.</a></h4>
 
 <p> The MySQL server's privilege tables are not up to date, you need to run
-the <tt>mysql_upgrade</tt> command on the server.</p>
+the <code>mysql_upgrade</code> command on the server.</p>
 
 <h4 id="faq1_42">
     <a href="#faq1_42">1.42 How can I prevent robots from accessing phpMyAdmin?</a></h4>
@@ -3225,10 +3225,10 @@ RewriteRule .* - [F]
 
 <p> Edit your <em>config.inc.php</em> file and ensure there is nothing
     (I.E. no blank lines, no spaces, no characters...) neither before the
-    <tt>&lt;?php</tt> tag at the beginning, neither after the <tt>?&gt;</tt>
+    <code>&lt;?php</code> tag at the beginning, neither after the <code>?&gt;</code>
     tag at the end. We also got a report from a user under
     <abbr title="Internet Information Services">IIS</abbr>, that used
-    a zipped distribution kit: the file <tt>libraries/Config.class.php</tt>
+    a zipped distribution kit: the file <code>libraries/Config.class.php</code>
     contained an end-of-line character (hex 0A) at the end; removing this character
     cleared his errors.</p>
 
@@ -3263,7 +3263,7 @@ RewriteRule .* - [F]
 <ul><li>First, you need to determine what socket is being used by MySQL.<br />
         To do this, telnet to your server and go to the MySQL bin directory. In
         this directory there should be a file named <em>mysqladmin</em>. Type
-        <tt>./mysqladmin variables</tt>, and this should give you a bunch of
+        <code>./mysqladmin variables</code>, and this should give you a bunch of
         info about your MySQL server, including the socket
         (<em>/tmp/mysql.sock</em>, for example).</li>
     <li>Then, you need to tell PHP to use this socket.<br /> To do this in
@@ -3287,7 +3287,7 @@ RewriteRule .* - [F]
     what can I do?</a></h4>
 
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGZip']</a>
-    directive to <tt>FALSE</tt> in the phpMyAdmin configuration file. It helps
+    directive to <code>FALSE</code> in the phpMyAdmin configuration file. It helps
     sometime.<br />
     Also have a look at your PHP version number: if it contains &quot;b&quot; or &quot;alpha&quot;
     it means you're running a testing version of PHP. That's not a so good idea,
@@ -3339,19 +3339,19 @@ RewriteRule .* - [F]
 
 <ul><li>make a new subdirectory (for example &quot;your_theme_name&quot;) under
         <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>
-        (by default <tt>themes</tt>)</li>
+        (by default <code>themes</code>)</li>
     <li>copy the files and directories from &quot;original&quot; to
         &quot;your_theme_name&quot;</li>
     <li>edit the css-files in &quot;your_theme_name/css&quot;</li>
     <li>put your new images in &quot;your_theme_name/img&quot;</li>
-    <li>edit <tt>layout.inc.php</tt> in &quot;your_theme_name&quot;</li>
-    <li>edit <tt>info.inc.php</tt> in &quot;your_theme_name&quot; to
+    <li>edit <code>layout.inc.php</code> in &quot;your_theme_name&quot;</li>
+    <li>edit <code>info.inc.php</code> in &quot;your_theme_name&quot; to
         contain your chosen theme name, that will be visible in user interface</li>
     <li>make a new screenshot of your theme and save it under
         &quot;your_theme_name/screen.png&quot;</li>
 </ul>
 
-<p> In theme directory there is file <tt>info.inc.php</tt> which contains
+<p> In theme directory there is file <code>info.inc.php</code> which contains
     theme verbose name, theme generation and theme version. These versions and
     generations are enumerated from 1 and do not have any direct dependence on
     phpMyAdmin version. Themes within same generation should be backwards
@@ -3369,7 +3369,7 @@ RewriteRule .* - [F]
 
 <p> Here are a few points to check:</p>
 
-<ul><li>In <tt>config.inc.php</tt>, try to leave the
+<ul><li>In <code>config.inc.php</code>, try to leave the
         <a href="#cfg_PmaAbsoluteUri" class="configrule">$cfg['PmaAbsoluteUri']</a>
         directive empty. See also
         <a href="#faq4_7"><abbr title="Frequently Asked Questions">FAQ</abbr> 4.7</a>.
@@ -3379,19 +3379,19 @@ RewriteRule .* - [F]
         <a href="http://bugs.php.net/bug.php?id=31134">
         http://bugs.php.net/bug.php?id=31134</a>.
     </li>
-    <li>If you are using Hardened PHP with the ini directive <tt>varfilter.max_request_variables</tt>
+    <li>If you are using Hardened PHP with the ini directive <code>varfilter.max_request_variables</code>
         set to the default (200) or another low value, you could get this
         error if your table has a high number of columns. Adjust this setting
         accordingly. (Thanks to Klaus Dorninger for the hint).
     </li>
-    <li>In the <tt>php.ini</tt> directive <tt>arg_separator.input</tt>, a value
+    <li>In the <code>php.ini</code> directive <code>arg_separator.input</code>, a value
         of &quot;;&quot; will cause this error. Replace it with &quot;&amp;;&quot;.
     </li>
     <li>If you are using <a href="http://www.hardened-php.net/">Hardened-PHP</a>,
        you might want to increase
        <a href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.
     </li>
-    <li>The directory specified in the <tt>php.ini</tt> directive <tt>session.save_path</tt> does not exist or is read-only.
+    <li>The directory specified in the <code>php.ini</code> directive <code>session.save_path</code> does not exist or is read-only.
     </li>
 </ul>
 
@@ -3402,7 +3402,7 @@ RewriteRule .* - [F]
 have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
     or the <a href="http://pecl.php.net/package/uploadprogress">uploadprogress</a>
     one. Moreover, the JSON extension has to be enabled in your PHP.</p>
-    <p> If using APC, you must set <tt>apc.rfc1867</tt> to <tt>on</tt> in your php.ini.</p>
+    <p> If using APC, you must set <code>apc.rfc1867</code> to <code>on</code> in your php.ini.</p>
 
 <h3 id="faqlimitations">Known limitations</h3>
 
@@ -3526,7 +3526,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <h4 id="faq3_10">
     <a href="#faq3_10">3.10 Homonyms and no primary key: When the results of a SELECT display
     more that one column with the same value
-    (for example <tt>SELECT lastname from employees where firstname like 'A%'</tt> and two &quot;Smith&quot; values are displayed),
+    (for example <code>SELECT lastname from employees where firstname like 'A%'</code> and two &quot;Smith&quot; values are displayed),
     if I click Edit I cannot be sure that I am editing the intended row.</a></h4>
 
 <p> Please make sure that your table has a primary key, so that phpMyAdmin
@@ -3545,7 +3545,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
     <a href="#faq3_12">3.12 (withdrawn).</a></h4>
 
 <h4 id="faq3_13">
-    <a href="#faq3_13">3.13 I get an error when entering <tt>USE</tt> followed by a db name
+    <a href="#faq3_13">3.13 I get an error when entering <code>USE</code> followed by a db name
     containing an hyphen.
 </a></h4>
 <p>
@@ -3630,7 +3630,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 </p>
 <ul>
     <li>
-        Your <em>config.inc.php</em> file should be <tt>chmod 660</tt>.
+        Your <em>config.inc.php</em> file should be <code>chmod 660</code>.
     </li>
     <li>
         All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
@@ -3648,8 +3648,8 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 </a></h4>
 <p>
     Check <em>php.ini</em>, or ask your sysadmin to check it. The
-    <tt>include_path</tt> must contain &quot;.&quot; somewhere in it, and
-    <tt>open_basedir</tt>, if used, must contain &quot;.&quot; and
+    <code>include_path</code> must contain &quot;.&quot; somewhere in it, and
+    <code>open_basedir</code>, if used, must contain &quot;.&quot; and
     &quot;./lang&quot; to allow normal operation of phpMyAdmin.
 </p>
 
@@ -3676,15 +3676,15 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
 <p> Starting with 2.2.5, in the user management page, you can enter a wildcard
     database name for a user (for example &quot;joe%&quot;),
     and put the privileges you want.  For example,
-    adding <tt>SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER</tt>
+    adding <code>SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER</code>
     would let a user create/manage his/her database(s).</p>
 
 <h4 id="faq4_6">
     <a href="#faq4_6">4.6 How can I use the Host-based authentication additions?</a></h4>
 
 <p> If you have existing rules from an old <a href="#glossary"><em>.htaccess</em></a> file, you can take them
-    and add a username between the <tt>'deny'</tt>/<tt>'allow'</tt> and
-    <tt>'from'</tt> strings. Using the username wildcard of <tt>'%'</tt> would
+    and add a username between the <code>'deny'</code>/<code>'allow'</code> and
+    <code>'from'</code> strings. Using the username wildcard of <code>'%'</code> would
     be a major benefit here if your installation is suited to using it. Then
     you can just add those updated lines into the
     <a href="#cfg_Servers_AllowDeny_rules" class="configrule">
@@ -3718,7 +3718,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
 <h4 id="faq4_8">
     <a href="#faq4_8">4.8 Which parameters can I use in the URL that starts phpMyAdmin?</a></h4>
 
-<p>When starting phpMyAdmin, you can use the <tt>db</tt>, <tt>pma_username</tt>, <tt>pma_password</tt> and <tt>server</tt> parameters. This last one can contain either the numeric host index (from <tt>$i</tt> of the configuration file) or one of the host names present in the configuration file. Using <tt>pma_username</tt> and <tt>pma_password</tt> has been tested along with the usage of 'cookie' <tt>auth_type</tt>.</p>
+<p>When starting phpMyAdmin, you can use the <code>db</code>, <code>pma_username</code>, <code>pma_password</code> and <code>server</code> parameters. This last one can contain either the numeric host index (from <code>$i</code> of the configuration file) or one of the host names present in the configuration file. Using <code>pma_username</code> and <code>pma_password</code> has been tested along with the usage of 'cookie' <code>auth_type</code>.</p>
 
 <h3 id="faqbrowsers">Browsers or client <abbr title="operating system">OS</abbr></h3>
 
@@ -3862,8 +3862,8 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
     Javascript errors. Or I cannot make phpMyAdmin work under Windows.</a></h4>
 
 <p> Please check the following points:</p>
-    <ul><li>Maybe you have defined your <tt>PmaAbsoluteUri</tt> setting
-            in <tt>config.inc.php</tt> to an <abbr title="Internet Protocol">IP</abbr>
+    <ul><li>Maybe you have defined your <code>PmaAbsoluteUri</code> setting
+            in <code>config.inc.php</code> to an <abbr title="Internet Protocol">IP</abbr>
             address and you are starting
             phpMyAdmin with a <abbr title="Uniform Resource Locator">URL</abbr>
             containing a domain name, or the reverse situation.</li>
@@ -3881,12 +3881,12 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
     installed in their Firefox is causing the problem.</p>
 
 <h4 id="faq5_18">
-<a href="#faq5_18">5.18 With Konqueror 4.2.x an invalid <tt>LIMIT</tt>
+<a href="#faq5_18">5.18 With Konqueror 4.2.x an invalid <code>LIMIT</code>
     clause is generated when I browse a table.</a></h4>
 <p> This happens only when both of these conditions are met: using the 
-    <tt>http</tt> authentication mode and <tt>register_globals</tt> being set 
-    to <tt>On</tt> on the server. It seems to be a browser-specific problem; 
-    meanwhile use the <tt>cookie</tt> authentication mode.</p>
+    <code>http</code> authentication mode and <code>register_globals</code> being set 
+    to <code>On</code> on the server. It seems to be a browser-specific problem; 
+    meanwhile use the <code>cookie</code> authentication mode.</p>
 
 <h4 id="faq5_19">
 <a href="#faq5_19">5.19 I get JavaScript errors in my browser.</a></h4>
@@ -3906,8 +3906,8 @@ to see if the problem goes away.</p>
     Common errors include:
 </p>
 <ul>
-    <li>Using <tt>VARCHAR</tt> without a size argument</li>
-    <li>Using <tt>TEXT</tt> or <tt>BLOB</tt> with a size argument</li>
+    <li>Using <code>VARCHAR</code> without a size argument</li>
+    <li>Using <code>TEXT</code> or <code>BLOB</code> with a size argument</li>
 </ul>
 <p>
     Also, look at the syntax chapter in the MySQL manual to confirm that your
@@ -3975,7 +3975,7 @@ to see if the problem goes away.</p>
     <a href="#faq6_6">6.6 How can I use the relation table in Query-by-example?</a></h4>
 
 <p> Here is an example with the tables persons, towns and countries, all
-    located in the database mydb. If you don't have a <tt>pma_relation</tt>
+    located in the database mydb. If you don't have a <code>pma_relation</code>
     table, create it as explained in the configuration section. Then create the
     example tables:</p>
 
@@ -4175,8 +4175,8 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
 <p>
     To install <abbr title="PHP Extension and Application
     Repository">PEAR</abbr> <abbr title="Simple Object Access
-    Protocol">SOAP</abbr> module, run <tt>"pear install Net_Socket Net_URL
-    HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr
+    Protocol">SOAP</abbr> module, run <code>"pear install Net_Socket Net_URL
+    HTTP_Request Mail_Mime Net_DIME SOAP"</code> to get the necessary <abbr
     title="PHP Extension and Application Repository">PEAR</abbr> modules for
     usage.
 </p>
@@ -4318,7 +4318,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
 
     For 100 values or more, a distinct window will appear, to browse foreign
     key values and choose one. To change the default limit of 100, see
-    <tt><a href="#cfg_ForeignKeyMaxLimit" class="configrule">$cfg['ForeignKeyMaxLimit']</a></tt>.</p>
+    <code><a href="#cfg_ForeignKeyMaxLimit" class="configrule">$cfg['ForeignKeyMaxLimit']</a></code>.</p>
 
 <h4 id="faq6_22">
     <a href="#faq6_22">6.22 Bookmarks: Can I execute a default bookmark
@@ -4439,7 +4439,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
             <p>
             Create a Zip archive with .shp and .dbf files and import it. For this to work, 
             you need to set <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to a
-            place where the web server user can write (for example <tt>'./tmp'</tt>).
+            place where the web server user can write (for example <code>'./tmp'</code>).
             </p>
 
             <p> To create the temporary directory on a UNIX-based system, you can do:</p>
@@ -4614,7 +4614,7 @@ the source and target corresponding tables.
 </p>
 
 <p>
-The difference is depicted by the red and green buttons with <tt>S</tt> and <tt>D</tt>
+The difference is depicted by the red and green buttons with <code>S</code> and <code>D</code>
 letters, indicating that either Structure or Data are not up to date. By
 clicking on them, they will turn grey, what means that they will be synchronized.
 </p>
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index c47e6ea6bd..7e48366e01 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -618,7 +618,7 @@ if ($GLOBALS['PMA_Config']->error_config_default_file) {
     trigger_error($error, E_USER_ERROR);
 }
 if ($GLOBALS['PMA_Config']->error_pma_uri) {
-    trigger_error(__('The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!'), E_USER_ERROR);
+    trigger_error(__('The <code>$cfg[\'PmaAbsoluteUri\']</code> directive MUST be set in your configuration file!'), E_USER_ERROR);
 }
 
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 435eef8a5f..461c3eb620 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -295,7 +295,7 @@ if (!empty($submit_mult) && !empty($what)) {
             }
             echo __('Do you really want to execute following query?');
         ?>:</legend>
-        <tt><?php echo $full_query; ?></tt>
+        <code><?php echo $full_query; ?></code>
     </fieldset>
     <fieldset class="tblFooters">
         <input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" />
diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
index 7ce0329e20..e7ec025b06 100644
--- a/libraries/tcpdf/tcpdf.php
+++ b/libraries/tcpdf/tcpdf.php
@@ -20710,7 +20710,7 @@ class TCPDF {
 		// define self-closing tags
 		$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
 		// remove all unsupported tags (the line below lists all supported tags)
-		$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
+		$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><code><u><ul>');
 		//replace some blank characters
 		$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
 		$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
diff --git a/po/af.po b/po/af.po
index e0e584928c..4d8303dd0b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2880,10 +2880,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Die <tt>$cfg['PmaAbsoluteUri']</tt> veranderlike MOET gestel wees in jou "
+"Die <code>$cfg['PmaAbsoluteUri']</code> veranderlike MOET gestel wees in jou "
 "konfigurasie leer!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ar.po b/po/ar.po
index d7bbffed9b..7ef1646ae4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2769,10 +2769,10 @@ msgstr "لا يمكن تحميل الإعدادات الإفتراضية من :
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"المتغير <span dir=\"ltr\"><tt>$cfg['PmaAbsoluteUri']</tt></span> يجب تعديله "
+"المتغير <span dir=\"ltr\"><code>$cfg['PmaAbsoluteUri']</code></span> يجب تعديله "
 "في ملف التعريف !"
 
 #: libraries/common.inc.php:647
diff --git a/po/az.po b/po/az.po
index e0ff994887..901d1c152d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2911,10 +2911,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktivi PMA konfiqurasiya faylınızda "
+"<code>$cfg['PmaAbsoluteUri']</code> direktivi PMA konfiqurasiya faylınızda "
 "QURULMAMIŞDIR!"
 
 #: libraries/common.inc.php:647
diff --git a/po/be.po b/po/be.po
index 45acb55766..4090a21435 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2979,10 +2979,10 @@ msgstr "Немагчыма загрузіць канфігурацыю па зм
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Дырэктыва <tt>$cfg['PmaAbsoluteUri']</tt> ПАВІННА быць вызначаная ў вашым "
+"Дырэктыва <code>$cfg['PmaAbsoluteUri']</code> ПАВІННА быць вызначаная ў вашым "
 "канфігурацыйным файле!"
 
 #: libraries/common.inc.php:647
diff --git a/po/be@latin.po b/po/be@latin.po
index db303900a2..5e6767e666 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -2994,7 +2994,7 @@ msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 "Dyrektyva $cfg['PmaAbsoluteUri'] PAVINNA być vyznačanaja ŭ vašym "
diff --git a/po/bg.po b/po/bg.po
index 5029a122f5..cb4baa32fb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2757,10 +2757,10 @@ msgstr "Конфигурацията по подразбиране не може
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"На <tt>$cfg['PmaAbsoluteUri']</tt> ТРЯБВА да се зададе стойност в "
+"На <code>$cfg['PmaAbsoluteUri']</code> ТРЯБВА да се зададе стойност в "
 "конфигурационния файл!"
 
 #: libraries/common.inc.php:647
diff --git a/po/bn.po b/po/bn.po
index 9a3faf64a8..631af528c5 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -2893,10 +2893,10 @@ msgstr "\"%1$s\" হতে ডিফল্ট কনফিগারেশন ল
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/br.po b/po/br.po
index 4b88c93796..f2b1fd92a6 100644
--- a/po/br.po
+++ b/po/br.po
@@ -2787,10 +2787,10 @@ msgstr "N'eus ket bet gallet kargañ ar c'hefluniadur dre ziouer adalek %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"RET eo d'an arventenn <tt>$cfg['PmaAbsoluteUri']</tt> bezañ resisaet er "
+"RET eo d'an arventenn <code>$cfg['PmaAbsoluteUri']</code> bezañ resisaet er "
 "restr kefluniañ!"
 
 #: libraries/common.inc.php:647
diff --git a/po/bs.po b/po/bs.po
index 5806f81ec8..665076c342 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2909,10 +2909,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podješena u "
+"<code>$cfg['PmaAbsoluteUri']</code> direktiva MORA biti podješena u "
 "konfiguracionoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ca.po b/po/ca.po
index 4326bfa45a..fbb732b334 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2738,10 +2738,10 @@ msgstr "No es pot carregar la configuració per defecte des de: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"La directiva <tt>$cfg['PmaAbsoluteUri']</tt> HA d'estar establerta a l'arxiu "
+"La directiva <code>$cfg['PmaAbsoluteUri']</code> HA d'estar establerta a l'arxiu "
 "de configuració!"
 
 #: libraries/common.inc.php:647
diff --git a/po/cs.po b/po/cs.po
index 2be3670aed..e052730ac8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2748,10 +2748,10 @@ msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Parametr <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ být nastaven v konfiguračním "
+"Parametr <code>$cfg['PmaAbsoluteUri']</code> MUSÍ být nastaven v konfiguračním "
 "souboru!"
 
 #: libraries/common.inc.php:647
diff --git a/po/cy.po b/po/cy.po
index e6f1dcb24a..6cc76337b0 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2905,7 +2905,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index e17996bd24..2feb7c6c22 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2802,10 +2802,10 @@ msgstr "Kunne ikke indlæse standardkonfiguration fra: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktivet SKAL være sat i din "
+"<code>$cfg['PmaAbsoluteUri']</code> direktivet SKAL være sat i din "
 "konfigurationsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/de.po b/po/de.po
index 4b70909d61..39d04d2625 100644
--- a/po/de.po
+++ b/po/de.po
@@ -856,7 +856,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
 
-# Schema is not the right word for it, because a dump contains also data, and
+# Schema is not the right word for it, because a dump contains also data, and
 # NOT just the scheme.
 #: export.php:654
 #, php-format
@@ -919,8 +919,8 @@ msgstr "LineString"
 msgid "Outer Ring"
 msgstr "Ankreis"
 
-# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
-# 
+# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
+# 
 # Ja
 #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:320
 msgid "Inner Ring"
@@ -2795,10 +2795,10 @@ msgstr "Fehler beim Laden der Standard-Konfiguration von: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Das <tt>$cfg['PmaAbsoluteUri']</tt> Verzeichnis MUSS in Ihrer "
+"Das <code>$cfg['PmaAbsoluteUri']</code> Verzeichnis MUSS in Ihrer "
 "Konfigurationsdatei angegeben werden!"
 
 #: libraries/common.inc.php:647
@@ -3285,7 +3285,7 @@ msgstr "Zeile unter Mauscursor hervorheben"
 msgid "Highlight pointer"
 msgstr "Cursor hervorheben"
 
-# Maybe the wikipedia link should point to the german version of the article
+# Maybe the wikipedia link should point to the german version of the article
 # (http://de.wikipedia.org/wiki/Bzip2 )
 #: libraries/config/messages.inc.php:30
 msgid ""
@@ -5362,7 +5362,7 @@ msgstr "Aktiviere die Prüfung auf Aktualisierungen auf der Hauptseite"
 msgid "Version check"
 msgstr "Versionsüberprüfung"
 
-# Maybe wikipedia links should point to $lang.wikipedia.org, eg
+# Maybe wikipedia links should point to $lang.wikipedia.org, eg
 # http://de.wikipedia.org/wiki/ZIP-Dateiformat
 #: libraries/config/messages.inc.php:524
 msgid ""
diff --git a/po/el.po b/po/el.po
index 32937c37d5..de06e8adea 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2779,10 +2779,10 @@ msgstr "Αδύνατη η φόρτωση της προεπιλεγμένης ρ
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Η εντολή <tt>$cfg['PmaAbsoluteUri']</tt> ΠΡΕΠΕΙ να οριστεί στο αρχείο "
+"Η εντολή <code>$cfg['PmaAbsoluteUri']</code> ΠΡΕΠΕΙ να οριστεί στο αρχείο "
 "ρυθμίσεων!"
 
 #: libraries/common.inc.php:647
diff --git a/po/en_GB.po b/po/en_GB.po
index 7bd9a1bdde..e2c1553ecc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2746,10 +2746,10 @@ msgstr "Could not load default configuration from: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/es.po b/po/es.po
index 4a833ba660..c3b5c9bc24 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1362,7 +1362,7 @@ msgstr "PB"
 msgid "EiB"
 msgstr "EB"
 
-# singular: tabla
+# singular: tabla
 # plural: tablas
 #: js/messages.php:128
 #, php-format
@@ -2787,10 +2787,10 @@ msgstr "No se pudo cargar la configuración predeterminada desde: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"¡El contenido de <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar definido en el "
+"¡El contenido de <code>$cfg['PmaAbsoluteUri']</code> DEBE estar definido en el "
 "archivo de configuración config.inc.php!"
 
 #: libraries/common.inc.php:647
@@ -12844,7 +12844,7 @@ msgstr ""
 msgid "Percentage of used open files limit"
 msgstr "Porcentaje de uso del límite de archivos de abiertos"
 
-# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
+# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
 # traducirlo
 #: po/advisory_rules.php:186
 msgid ""
diff --git a/po/et.po b/po/et.po
index 5a849bc43d..b2f30bf7e2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2748,10 +2748,10 @@ msgstr "Ei saanud laadida vaikimisi seadistuse faili kohast: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> väärtus PEAB sinu seadistusfailis olema "
+"<code>$cfg['PmaAbsoluteUri']</code> väärtus PEAB sinu seadistusfailis olema "
 "määratud!"
 
 #: libraries/common.inc.php:647
diff --git a/po/eu.po b/po/eu.po
index 2aaf4f8ab1..8733017ace 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2857,10 +2857,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktibak zure konfigurazio fitxategian "
+"<code>$cfg['PmaAbsoluteUri']</code> direktibak zure konfigurazio fitxategian "
 "zehaztuta behar du egon!"
 
 #: libraries/common.inc.php:647
diff --git a/po/fa.po b/po/fa.po
index da47ce2c0d..833324b49e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2873,7 +2873,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 80b781b425..7c29009f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2840,9 +2840,9 @@ msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<tt>$cfg['PmaAbsoluteUri']</tt> täytyy määritellä asetustiedostossa!"
+msgstr "<code>$cfg['PmaAbsoluteUri']</code> täytyy määritellä asetustiedostossa!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/fr.po b/po/fr.po
index f69fee06f7..ee2cf26279 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2775,10 +2775,10 @@ msgstr "Chargement de la configuration par défaut impossible depuis %1$s"
 # OK
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Le paramètre <tt>$cfg['PmaAbsoluteUri']</tt> DOIT être renseigné dans votre "
+"Le paramètre <code>$cfg['PmaAbsoluteUri']</code> DOIT être renseigné dans votre "
 "fichier de configuration !"
 
 #: libraries/common.inc.php:647
diff --git a/po/gl.po b/po/gl.po
index 87d56137c3..f4cb0f809e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2986,10 +2986,10 @@ msgstr "Non se puido cargar a configuración desde: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A directiva <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar asignada no seu "
+"A directiva <code>$cfg['PmaAbsoluteUri']</code> DEBE estar asignada no seu "
 "ficheiro de configuración."
 
 #: libraries/common.inc.php:647
diff --git a/po/he.po b/po/he.po
index 1ae9ecd73d..3e195847e4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2913,7 +2913,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index f2bc4640a5..0289df43bc 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2862,10 +2862,10 @@ msgstr "%1$s से मूलभूत विन्यास लोड नही
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
+"<code>$cfg['PmaAbsoluteUri']</code> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/hr.po b/po/hr.po
index 6f14607633..e3053b4a3e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2975,10 +2975,10 @@ msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> MORA BITI postavljena u vašoj "
+"Direktiva <code>$cfg['PmaAbsoluteUri']</code> MORA BITI postavljena u vašoj "
 "konfiguracijskoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/hu.po b/po/hu.po
index 3350676299..b995477ddb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2766,10 +2766,10 @@ msgstr "Nem lehetett betölteni az alapértelmezett konfigurációt innen: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A <tt>$cfg['PmaAbsoluteUri']</tt> utasítás értékét a konfigurációs fájlban "
+"A <code>$cfg['PmaAbsoluteUri']</code> utasítás értékét a konfigurációs fájlban "
 "KELL megadni!"
 
 #: libraries/common.inc.php:647
diff --git a/po/id.po b/po/id.po
index 877da97f9a..4c85585ca7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2759,10 +2759,10 @@ msgstr "Tidak dapat memuat konfigurasi default dari: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Directif <tt>$cfg['PmaAbsoluteUri']</tt> WAJIB diset dalam berkas "
+"Directif <code>$cfg['PmaAbsoluteUri']</code> WAJIB diset dalam berkas "
 "konfigurasi!"
 
 #: libraries/common.inc.php:647
diff --git a/po/it.po b/po/it.po
index d5372153a8..21f9457a31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2779,10 +2779,10 @@ msgstr "Non posso caricare la configurazione predefinita da: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"La direttiva <tt>$cfg['PmaAbsoluteUri']</tt> DEVE essere impostata nel file "
+"La direttiva <code>$cfg['PmaAbsoluteUri']</code> DEVE essere impostata nel file "
 "di configurazione!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ja.po b/po/ja.po
index 1df0098663..8cb10adb31 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2751,10 +2751,10 @@ msgstr "デフォルトの設定を読み込めませんでした: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> は<b>必ず</b>設定ファイルに設定しなければなり"
+"<code>$cfg['PmaAbsoluteUri']</code> は<b>必ず</b>設定ファイルに設定しなければなり"
 "ません！"
 
 #: libraries/common.inc.php:647
diff --git a/po/ka.po b/po/ka.po
index 2cf6625828..a458ce4116 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2963,10 +2963,10 @@ msgstr "Could not load default configuration from: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ko.po b/po/ko.po
index 1d81b6cebf..676fb0b16b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2741,10 +2741,10 @@ msgstr "기본 설정을 가져올 수 없습니다: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 정의되어야 합니다!"
+"환경설정 파일에 <code>$cfg['PmaAbsoluteUri']</code> 변수가 정의되어야 합니다!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/lt.po b/po/lt.po
index 17f4c6305e..597384aa64 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2784,10 +2784,10 @@ msgstr "Nepavyko užkrauti numatytų nustatymų failo iš: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"BŪTINA nustatymų faile įrašyti <tt>$cfg['PmaAbsoluteUri']</tt> reikšmę!"
+"BŪTINA nustatymų faile įrašyti <code>$cfg['PmaAbsoluteUri']</code> reikšmę!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/lv.po b/po/lv.po
index 6d33fa2fed..9a9c8fecda 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2922,10 +2922,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktīvai ir JĀBŪT nodefinētai Jūsu "
+"<code>$cfg['PmaAbsoluteUri']</code> direktīvai ir JĀBŪT nodefinētai Jūsu "
 "konfigurācijas failā!"
 
 #: libraries/common.inc.php:647
diff --git a/po/mk.po b/po/mk.po
index bab361fb6b..347f88c955 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2924,10 +2924,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> директивата МОРА да биде подесена во "
+"<code>$cfg['PmaAbsoluteUri']</code> директивата МОРА да биде подесена во "
 "конфигурациската податотека!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ml.po b/po/ml.po
index 142f9740e4..fad073e8ab 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2668,7 +2668,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/mn.po b/po/mn.po
index 0c3cf6cfff..aa2ba9f28b 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -2943,10 +2943,10 @@ msgstr "Анхдагч тохиргоо дуудагдсангүй нь: \"%1$s\
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> -ыг тохиргооны файлд тохируулах хэрэгтэй!"
+"<code>$cfg['PmaAbsoluteUri']</code> -ыг тохиргооны файлд тохируулах хэрэгтэй!"
 
 #: libraries/common.inc.php:647
 #, fuzzy, php-format
diff --git a/po/ms.po b/po/ms.po
index 075b369b4e..89bc1c0358 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2892,10 +2892,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[PmaAbsoluteUri]</tt> MESTI disetkan di dalam fail konfigurasi."
+"<code>$cfg[PmaAbsoluteUri]</code> MESTI disetkan di dalam fail konfigurasi."
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/nb.po b/po/nb.po
index a65452cad5..d8f1c1e487 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2888,10 +2888,10 @@ msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> variabelen MÅ være innstilt i din "
+"<code>$cfg['PmaAbsoluteUri']</code> variabelen MÅ være innstilt i din "
 "konfigurasjonsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/nl.po b/po/nl.po
index 04018774d5..ef451208da 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2785,10 +2785,10 @@ msgstr "Standaard configuratiebestand kon niet geladen worden vanuit: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"De <tt>$cfg['PmaAbsoluteUri']</tt> richtlijn MOET gezet zijn in het "
+"De <code>$cfg['PmaAbsoluteUri']</code> richtlijn MOET gezet zijn in het "
 "configuratiebestand!"
 
 #: libraries/common.inc.php:647
@@ -9769,8 +9769,8 @@ msgstr ""
 "Deze MySQL server is ingesteld als <b>slave</b> in een <b>replicatie</b> "
 "proces."
 
-# Er moet een betere vertaling voor "replication" zijn. "Nadoen"?
-# "Deze MySQL-server functioneert als %s in een <b>replicatie</b> proces."
+# Er moet een betere vertaling voor "replication" zijn. "Nadoen"?
+# "Deze MySQL-server functioneert als %s in een <b>replicatie</b> proces."
 # weggehaald.
 #: server_status.php:1076
 msgid ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index c0bf01a835..1525311d30 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -2665,7 +2665,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 4fe711a52a..e64438f1e4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2766,10 +2766,10 @@ msgstr "Nie można załadować domyślnej konfiguracji z: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Dyrektywa <tt>$cfg['PmaAbsoluteUri']</tt> musi być ustawiona w pliku "
+"Dyrektywa <code>$cfg['PmaAbsoluteUri']</code> musi być ustawiona w pliku "
 "konfiguracyjnym!"
 
 #: libraries/common.inc.php:647
diff --git a/po/pt.po b/po/pt.po
index d067a70328..71846200c7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2811,10 +2811,10 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A directiva <tt>$cfg['PmaAbsoluteUri']</tt> TEM que ser definida no ficheiro "
+"A directiva <code>$cfg['PmaAbsoluteUri']</code> TEM que ser definida no ficheiro "
 "de configuração!"
 
 #: libraries/common.inc.php:647
diff --git a/po/pt_BR.po b/po/pt_BR.po
index efabe52edd..43abfc737d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2775,10 +2775,10 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"A diretriz<tt>$cfg['PmaAbsoluteUri']</tt> dDEVE ser estabelecida no seu "
+"A diretriz<code>$cfg['PmaAbsoluteUri']</code> dDEVE ser estabelecida no seu "
 "arquivo de configuração!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ro.po b/po/ro.po
index 1c4d910db5..0a373767ed 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2896,10 +2896,10 @@ msgstr "Nu s-a putut încărca configurația implicită din: „%1$s”"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Directiva <tt>$cfg['PmaAbsoluteUri']</tt> TREBUIE să fie stabilită în "
+"Directiva <code>$cfg['PmaAbsoluteUri']</code> TREBUIE să fie stabilită în "
 "fișierul de configurare!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ru.po b/po/ru.po
index 4809671e6b..d76c9f2e8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2772,10 +2772,10 @@ msgstr "Невозможно загрузить изначальную конф
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Директива <tt>$cfg['PmaAbsoluteUri']</tt> ДОЛЖНА быть установлена в "
+"Директива <code>$cfg['PmaAbsoluteUri']</code> ДОЛЖНА быть установлена в "
 "конфигурационном файле!"
 
 #: libraries/common.inc.php:647
diff --git a/po/si.po b/po/si.po
index 512657928a..f50f67c514 100644
--- a/po/si.po
+++ b/po/si.po
@@ -2726,10 +2726,10 @@ msgstr "%1$s වෙතින් පෙරනිමි සිටුවම් ප
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> සඳහා අගය ඔබගේ වින්‍යාස ගොනුවේ අඩංගු විය යුතුමය!"
+"<code>$cfg['PmaAbsoluteUri']</code> සඳහා අගය ඔබගේ වින්‍යාස ගොනුවේ අඩංගු විය යුතුමය!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/sk.po b/po/sk.po
index 34959a390b..1ea9654a2c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2746,10 +2746,10 @@ msgstr "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktíva <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ byť nastavená v konfiguračnom "
+"Direktíva <code>$cfg['PmaAbsoluteUri']</code> MUSÍ byť nastavená v konfiguračnom "
 "súbore!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sl.po b/po/sl.po
index 7ceed6471d..8207bb3713 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2763,10 +2763,10 @@ msgstr "Ne morem naložiti privzete konfiguracije iz: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Ukaz <tt>$cfg['PmaAbsoluteUri']</tt> MORA biti določen v konfiguracijski "
+"Ukaz <code>$cfg['PmaAbsoluteUri']</code> MORA biti določen v konfiguracijski "
 "datoteki!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sq.po b/po/sq.po
index a4401f6eda..282b5e5b12 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -2919,10 +2919,10 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> DUHET të përcaktohet tek file i "
+"Direktiva <code>$cfg['PmaAbsoluteUri']</code> DUHET të përcaktohet tek file i "
 "konfigurimit!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sr.po b/po/sr.po
index 493c5102b5..233588ab1e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2960,10 +2960,10 @@ msgstr "Не могу да учитам подразумевану конфиг
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> директива МОРА бити подешена у "
+"<code>$cfg['PmaAbsoluteUri']</code> директива МОРА бити подешена у "
 "конфигурационој датотеци!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 0aa39244e2..b70a3c3bf9 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -2953,10 +2953,10 @@ msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> direktiva MORA biti podešena u "
+"<code>$cfg['PmaAbsoluteUri']</code> direktiva MORA biti podešena u "
 "konfiguracionoj datoteci!"
 
 #: libraries/common.inc.php:647
diff --git a/po/sv.po b/po/sv.po
index 1733d9e156..9f566857fe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2751,10 +2751,10 @@ msgstr "Kunde inte ladda standardkonfiguration från: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Variabeln <tt>$cfg['PmaAbsoluteUri']</tt> direktivet MÅSTE anges i din "
+"Variabeln <code>$cfg['PmaAbsoluteUri']</code> direktivet MÅSTE anges i din "
 "konfigurationsfil!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ta.po b/po/ta.po
index 546cfe0b81..6124b4856e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2743,7 +2743,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index db019a759c..f5681db8c2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2825,7 +2825,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 4964fe3c1c..f4f0daba14 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2690,9 +2690,9 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<b>ต้อง</b>กำหนดค่า <tt>$cfg['PmaAbsoluteUri']</tt> ในไฟล์คอนฟิกูเรชั่นเสียก่อน"
+msgstr "<b>ต้อง</b>กำหนดค่า <code>$cfg['PmaAbsoluteUri']</code> ในไฟล์คอนฟิกูเรชั่นเสียก่อน"
 
 #: libraries/common.inc.php:647
 #, php-format
@@ -12623,8 +12623,8 @@ msgstr "ขนาดบัฟเฟอร์ของ InnoDB"
 msgid "Your InnoDB buffer pool is fairly small."
 msgstr "ขนาดบัฟเฟอร์  InnoDB ของคุณมีขนาดเล็ก"
 
-# buffer pool แปลเป็น บัฟเฟอร์
-# non-InnoDB-Tables ใช้คำทับศัพท์
+# buffer pool แปลเป็น บัฟเฟอร์
+# non-InnoDB-Tables ใช้คำทับศัพท์
 #
 #: po/advisory_rules.php:267
 #, php-format
diff --git a/po/tk.po b/po/tk.po
index d2c3c077b7..a24865586b 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -2671,7 +2671,7 @@ msgstr ""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 97e38567fc..2166f35211 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2756,10 +2756,10 @@ msgstr "Varsayılan yapılandırma bundan yüklenemedi: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> talimatı yapılandırma dosyanız içinde "
+"<code>$cfg['PmaAbsoluteUri']</code> talimatı yapılandırma dosyanız içinde "
 "AYARLANMAK zorundadır!"
 
 #: libraries/common.inc.php:647
diff --git a/po/tt.po b/po/tt.po
index 75a3ece388..aff12a49d5 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -2938,10 +2938,10 @@ msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ug.po b/po/ug.po
index 05f6ee5dcd..5de2aad6f8 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2871,9 +2871,9 @@ msgstr "تەڭشەك ئەندىزى %1$s كىرگۈزىلمىدى."
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "<tt>$cfg['PmaAbsoluteUri']</tt> نى تەڭشەڭ !تەڭشەك ھۆججىتى ئىچىدىكى"
+msgstr "<code>$cfg['PmaAbsoluteUri']</code> نى تەڭشەڭ !تەڭشەك ھۆججىتى ئىچىدىكى"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/uk.po b/po/uk.po
index 4eeba56669..34d2bee2b1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2779,10 +2779,10 @@ msgstr "Неможливо завантажити стандартну функ
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"Змінна <tt>$cfg['PmaAbsoluteUri']</tt> ПОВИННА бути встановлена у Вашому "
+"Змінна <code>$cfg['PmaAbsoluteUri']</code> ПОВИННА бути встановлена у Вашому "
 "конфігураційному файлі!"
 
 #: libraries/common.inc.php:647
diff --git a/po/ur.po b/po/ur.po
index eef11b47b9..7c720e7b76 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -2866,10 +2866,10 @@ msgstr "طے شدہ تشکیلات کو لوڈ نہیں کرسکا: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg['PmaAbsoluteUri']</tt> ہدایات آپ کے تشکیل مسل میں لازمی موجود ہوں!"
+"<code>$cfg['PmaAbsoluteUri']</code> ہدایات آپ کے تشکیل مسل میں لازمی موجود ہوں!"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/uz.po b/po/uz.po
index e8d4f35376..2237ea34bc 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3012,10 +3012,10 @@ msgstr "\"%1$s\" файлидан андоза конфигурацияни юк
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> директиваси конфигурацион файлда созланиши "
+"<code>$cfg[\"PmaAbsoluteUrl\"]</code> директиваси конфигурацион файлда созланиши "
 "ШАРТ!"
 
 #: libraries/common.inc.php:647
diff --git a/po/uz@latin.po b/po/uz@latin.po
index 67140ddbe8..f832885d70 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3019,10 +3019,10 @@ msgstr "\"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi."
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
 msgstr ""
-"<tt>$cfg[\"PmaAbsoluteUrl\"]</tt> direktivasi konfiguratsion faylda "
+"<code>$cfg[\"PmaAbsoluteUrl\"]</code> direktivasi konfiguratsion faylda "
 "sozlanishi SHART!"
 
 #: libraries/common.inc.php:647
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08d763df65..dd132a3d6b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2705,9 +2705,9 @@ msgstr "无法加载默认配置: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "必须在您的配置文件中设置 <tt>$cfg['PmaAbsoluteUri']</tt> ！"
+msgstr "必须在您的配置文件中设置 <code>$cfg['PmaAbsoluteUri']</code> ！"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ee363c079f..98c313b556 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2820,9 +2820,9 @@ msgstr "無法載入預設設定: %1$s"
 
 #: libraries/common.inc.php:617
 msgid ""
-"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
+"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
 "configuration file!"
-msgstr "必須在您的設定檔案中設定 <tt>$cfg['PmaAbsoluteUri']</tt> ！"
+msgstr "必須在您的設定檔案中設定 <code>$cfg['PmaAbsoluteUri']</code> ！"
 
 #: libraries/common.inc.php:647
 #, php-format
diff --git a/server_privileges.php b/server_privileges.php
index d7c0a875c2..101503eddc 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -449,8 +449,8 @@ function PMA_displayColumnPrivs($columns, $row, $name_for_select,
 ) {
     echo '    <div class="item" id="div_item_' . $name . '">' . "\n"
        . '        <label for="select_' . $name . '_priv">' . "\n"
-       . '            <tt><dfn title="' . $name_for_dfn . '">'
-        . $priv_for_header . '</dfn></tt>' . "\n"
+       . '            <code><dfn title="' . $name_for_dfn . '">'
+        . $priv_for_header . '</dfn></code>' . "\n"
        . '        </label><br />' . "\n"
        . '        <select id="select_' . $name . '_priv" name="'
         . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
@@ -662,11 +662,11 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                 : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl']) . '"/>' . "\n";
 
             echo '            <label for="checkbox_' . $current_grant
-                . '"><tt><dfn title="'
+                . '"><code><dfn title="'
                 . (isset($GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))])
                     ? $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5))]
                     : $GLOBALS['strPrivDesc' . substr($tmp_current_grant, 0, (strlen($tmp_current_grant) - 5)) . 'Tbl'])
-               . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></tt></label>' . "\n"
+               . '">' . strtoupper(substr($current_grant, 0, strlen($current_grant) - 5)) . '</dfn></code></label>' . "\n"
                . '        </div>' . "\n";
         } // end foreach ()
 
@@ -766,8 +766,8 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                     .                   ' value="Y" title="' . $priv[2] . '"'
                     .                   ((! empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
                     .               '/>' . "\n"
-                    . '            <label for="checkbox_' . $priv[0] . '_priv"><tt><dfn title="' . $priv[2] . '">'
-                    .                    $priv[1] . '</dfn></tt></label>' . "\n"
+                    . '            <label for="checkbox_' . $priv[0] . '_priv"><code><dfn title="' . $priv[2] . '">'
+                    .                    $priv[1] . '</dfn></code></label>' . "\n"
                     . '        </div>' . "\n";
             }
             echo '    </fieldset>' . "\n";
@@ -779,26 +779,26 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true)
                . '        <legend>' . __('Resource limits') . '</legend>' . "\n"
                . '        <p><small><i>' . __('Note: Setting these options to 0 (zero) removes the limit.') . '</i></small></p>' . "\n"
                . '        <div class="item">' . "\n"
-               . '            <label for="text_max_questions"><tt><dfn title="'
-                . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></tt></label>' . "\n"
+               . '            <label for="text_max_questions"><code><dfn title="'
+                . __('Limits the number of queries the user may send to the server per hour.') . '">MAX QUERIES PER HOUR</dfn></code></label>' . "\n"
                . '            <input type="text" name="max_questions" id="text_max_questions" value="'
                 . $row['max_questions'] . '" size="11" maxlength="11" title="' . __('Limits the number of queries the user may send to the server per hour.') . '" />' . "\n"
                . '        </div>' . "\n"
                . '        <div class="item">' . "\n"
-               . '            <label for="text_max_updates"><tt><dfn title="'
-                . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></tt></label>' . "\n"
+               . '            <label for="text_max_updates"><code><dfn title="'
+                . __('Limits the number of commands that change any table or database the user may execute per hour.') . '">MAX UPDATES PER HOUR</dfn></code></label>' . "\n"
                . '            <input type="text" name="max_updates" id="text_max_updates" value="'
                 . $row['max_updates'] . '" size="11" maxlength="11" title="' . __('Limits the number of commands that change any table or database the user may execute per hour.') . '" />' . "\n"
                . '        </div>' . "\n"
                . '        <div class="item">' . "\n"
-               . '            <label for="text_max_connections"><tt><dfn title="'
-                . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></tt></label>' . "\n"
+               . '            <label for="text_max_connections"><code><dfn title="'
+                . __('Limits the number of new connections the user may open per hour.') . '">MAX CONNECTIONS PER HOUR</dfn></code></label>' . "\n"
                . '            <input type="text" name="max_connections" id="text_max_connections" value="'
                 . $row['max_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of new connections the user may open per hour.') . '" />' . "\n"
                . '        </div>' . "\n"
                . '        <div class="item">' . "\n"
-               . '            <label for="text_max_user_connections"><tt><dfn title="'
-                . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></tt></label>' . "\n"
+               . '            <label for="text_max_user_connections"><code><dfn title="'
+                . __('Limits the number of simultaneous connections the user may have.') . '">MAX USER_CONNECTIONS</dfn></code></label>' . "\n"
                . '            <input type="text" name="max_user_connections" id="text_max_user_connections" value="'
                 . $row['max_user_connections'] . '" size="11" maxlength="11" title="' . __('Limits the number of simultaneous connections the user may have.') . '" />' . "\n"
                . '        </div>' . "\n"
@@ -1570,7 +1570,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
         };
 
         $new_user_string .= '</td>'."\n";
-        $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here
+        $new_user_string .= '<td><code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code></td>'; //Fill in privileges here
         $new_user_string .= '<td>';
 
         if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
@@ -1708,8 +1708,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 // a automatic repair feature soon.
                 $raw = 'Your privilege table structure seems to be older than'
                     . ' this MySQL version!<br />'
-                    . 'Please run the <tt>mysql_upgrade</tt> command'
-                    . '(<tt>mysql_fix_privilege_tables</tt> on older systems)'
+                    . 'Please run the <code>mysql_upgrade</code> command'
+                    . '(<code>mysql_fix_privilege_tables</code> on older systems)'
                     . ' that should be included in your MySQL server distribution'
                     . ' to solve this problem!';
                 PMA_Message::rawError($raw)->display();
@@ -1856,9 +1856,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                             break;
                         } // end switch
                         echo '</td>' . "\n"
-                           . '            <td><tt>' . "\n"
+                           . '            <td><code>' . "\n"
                            . '                ' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
-                           . '                </tt></td>' . "\n"
+                           . '                </code></td>' . "\n"
                            . '            <td>' . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . '</td>' . "\n"
                            . '            <td align="center">';
                         printf($link_edit, urlencode($host['User']), urlencode($host['Host']), '', '');
@@ -2198,9 +2198,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
                     echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
                        . '    <td>' . htmlspecialchars((! isset($dbname)) ? $row['Db'] : $row['Table_name']) . '</td>' . "\n"
-                       . '    <td><tt>' . "\n"
+                       . '    <td><code>' . "\n"
                        . '        ' . join(',' . "\n" . '            ', PMA_extractPrivInfo($row, true)) . "\n"
-                       . '        </tt></td>' . "\n"
+                       . '        </code></td>' . "\n"
                        . '    <td>' . ((((! isset($dbname)) && $row['Grant_priv'] == 'Y') || (isset($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? __('Yes') : __('No')) . '</td>' . "\n"
                        . '    <td>';
                     if (! empty($row['Table_privs']) || ! empty ($row['Column_priv'])) {
@@ -2489,14 +2489,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 } elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) {
                     $user_form .= __('database-specific');
                 } else {
-                    $user_form .= __('wildcard'). ': <tt>' . htmlspecialchars($current['Db']) . '</tt>';
+                    $user_form .= __('wildcard'). ': <code>' . htmlspecialchars($current['Db']) . '</code>';
                 }
                 $user_form .= "\n"
                    . '        </td>' . "\n"
                    . '        <td>' . "\n"
-                   . '            <tt>' . "\n"
+                   . '            <code>' . "\n"
                    . '                ' . join(',' . "\n" . '                ', PMA_extractPrivInfo($current, true)) . "\n"
-                   . '            </tt>' . "\n"
+                   . '            </code>' . "\n"
                    . '        </td>' . "\n"
                    . '        <td>' . "\n"
                    . '            ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n"
diff --git a/sql.php b/sql.php
index 95b28b0067..e196acdbad 100644
--- a/sql.php
+++ b/sql.php
@@ -384,7 +384,7 @@ if ($do_confirm) {
     <?php
     echo '<fieldset class="confirmation">' . "\n"
         .'    <legend>' . __('Do you really want to execute following query?') . '</legend>'
-        .'    <tt>' . htmlspecialchars($stripped_sql_query) . '</tt>' . "\n"
+        .'    <code>' . htmlspecialchars($stripped_sql_query) . '</code>' . "\n"
         .'</fieldset>' . "\n"
         .'<fieldset class="tblFooters">' . "\n";
     ?>
diff --git a/test/theme.php b/test/theme.php
index 7dc63e0e2f..c7d150a9db 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -201,7 +201,7 @@ echo sprintf(__('Welcome to %s'),
 
 <fieldset class="confirmation">
     <legend>Confirmation fieldset</legend>
-    <tt>QUERY TO EXECUTE;</tt>
+    <code>QUERY TO EXECUTE;</code>
 </fieldset>
 <fieldset class="tblFooters">
     <input type="submit" name="yes" value="YES" />