diff --git a/ChangeLog b/ChangeLog
index 9f3cf65f9..8e5f0ea6a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,19 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-22 Loïc Chapeaux  <lolo@phpheaven.net>
+    * libraries/common.lib.php3, lines 198-200: open the documentation
+      link in the "documentation" window.
+    * libraries/charset_conversion.lib.php3; libraries/select_lang.lib.php3:
+      PHP3 fixes (don't use "require" inside a conditional statement).
+    * Documentation.html: XHTML fixes.
+    * db_details_structure.php3; tbl_properties.php3;
+      tbl_change.php3, line 336; tbl_properties_structure.php3;
+      tbl_select.php3, lines 122 & 127; tbl_query_box.php3: XHTML fixes.
+    * db_details.php3; db_details_links.php3;
+      tbl_properties_export.php3, lines 156-158: beautified generated
+      XHTML code.
+
 2002-07-21 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, libraries/common.lib.php3: added a faq about
       mysql extension, and a link to it when the error occurs
diff --git a/Documentation.html b/Documentation.html
index dd3f61287..51df663ba 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1603,8 +1603,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 </p>
 
 <p>
-    <b>I can't run the "display relations" feature because the script seems
-       not to know the font face I'm using!</b>
+    <b>I can't run the &quot;display relations&quot; feature because the script
+       seems not to know the font face I'm using!</b>
     <br />
     The &quot;FPDF&quot; library we're using for this feature requires some
     special files to use font faces.<br />
@@ -1615,19 +1615,19 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 
 <a name="faqmysql"></a>
 <p>
-    <b>I receive the error 'cannot load MySQL extension, please check 
-       PHP Configuration'.</b>
+    <b>I receive the error &quot;cannot load MySQL extension, please check
+       PHP Configuration&quot;.</b>
     <br />
     To connect to a MySQL server, PHP needs a set of MySQL functions called
     &quot;MySQL extension&quot;.
-    This extension may be part of the PHP server (compiled-in), otherwise
-    it needs to be loaded dynamically. phpMyAdmin tried to load the extension
-    but failed. 
+    This extension may be part of the PHP server (compiled-in), otherwise it
+    needs to be loaded dynamically. phpMyAdmin tried to load the extension but
+    failed.
     <br /><br />
     Usually, the problem is solved by installing a software package called
     &quot;PHP-MySQL&quot; or something similar.
- 
 </p>
+
 <a name="faqconfig"></a>
 <h3>[Configuration]</h3>
 
@@ -2203,8 +2203,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
        existing language, where do I start?</b>
     <br />
     Always use the current cvs version of your language file.
-    For a new language, start from english-iso-8859-1.inc.php3. If you don't 
-    know how to get the cvs version, please ask one of the developers.
+    For a new language, start from <i>english-iso-8859-1.inc.php3</i>. If you
+    don't  know how to get the cvs version, please ask one of the developers.
     <br />
     Please note that we try not to use html entities like &amp;eacute; in
     the translations, since we define the right character set in the file.
diff --git a/db_details.php3 b/db_details.php3
index f3169b5b5..2bfcb96fa 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -45,7 +45,6 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
            ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize')))
            // loic1: php 3.0.15 and lower bug -> always enabled
            : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize')));
-
 ?>
 <!-- Query box, sql file loader and bookmark support -->
 <a name="querybox"></a>
diff --git a/db_details_links.php3 b/db_details_links.php3
index e355f27e5..6f1ff0a44 100644
--- a/db_details_links.php3
+++ b/db_details_links.php3
@@ -82,3 +82,4 @@ echo "\n";
     </tr>
 </table>
 <br />
+
diff --git a/db_details_structure.php3 b/db_details_structure.php3
index 913ca1f3b..45e738775 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php3
@@ -452,9 +452,11 @@ echo '        ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
 <?php
 if ($num_tables > 0
     && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) {
-    echo '<font color="red">' . $strError . '</font><br />' . "\n";
+    echo '    <li>' . "\n";
+    echo '        <font color="red">' . $strError . '</font><br />' . "\n";
     $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php3?' . $url_query . '">';
-    echo sprintf($strRelationNotWorking, $url_to_goto, '</a>') . "\n";
+    echo '        ' . sprintf($strRelationNotWorking, $url_to_goto, '</a>') . "\n";
+    echo '    </li>' . "\n";
 } // end if
 
 // is this OK to check for 'class' support?
@@ -466,7 +468,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
         <a href="pdf_pages.php3?<?php echo $takeaway; ?>"><?php echo $strEditPDFPages; ?></a>
     </li>
 
-        <!-- PDF schema -->
+    <!-- PDF schema -->
     <?php
     // We only show this if we find something in the new pdf_pages table
     $test_query = 'SELECT * FROM ' . PMA_backquote($cfgRelation['pdf_pages'])
diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3
index 5a90f5843..e1734c8d4 100644
--- a/libraries/charset_conversion.lib.php3
+++ b/libraries/charset_conversion.lib.php3
@@ -147,11 +147,11 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
                 return recode_string($charset . '..'  . $convcharset, $what);
             } else {
                 if (!isset($GLOBALS['is_header_sent'])) {
-                    require('./header.inc.php3');
+                    include('./header.inc.php3');
                 }
                 echo $GLOBALS['strCantUseRecodeIconv'];
-                require('./footer.inc.php3');
-                exit;
+                include('./footer.inc.php3');
+                exit();
             }
         }
     } //  end of the "PMA_convert_charset()" function
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 0672e93f8..a552257e5 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -192,12 +192,11 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             $suffix = '.so';
         }
         if (!@extension_loaded($extension)) {
-            @dl($extension.$suffix);
+            @dl($extension . $suffix);
         }
         if (!@extension_loaded($extension)) {
-            echo $strCantLoadMySQL . '<br /> ' 
-            . '<a href="Documentation.html#faqmysql">' 
-            . $GLOBALS['strDocu'] . '</a>';
+            echo $strCantLoadMySQL . '<br />' . "\n"
+                 . '<a href="./Documentation.html#faqmysql" target="documentation">' . $GLOBALS['strDocu'] . '</a>' . "\n";
             exit();
         }
     } // end load mysql extension
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3
index 4e967a289..038bc0f7e 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php3
@@ -8,7 +8,7 @@
 
 
 
-if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')){
+if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
     define('PMA_SELECT_LANG_LIB_INCLUDED', 1);
 
     /**
@@ -272,7 +272,7 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')){
 
     // 5. Defines the associated filename and load the translation
     $lang_file = $lang_path . $available_languages[$lang][1] . '.inc.php3';
-    require('./' . $lang_file);
+    include('./' . $lang_file);
 
 } // $__PMA_SELECT_LANG_LIB__
 ?>
diff --git a/tbl_change.php3 b/tbl_change.php3
index 4025895b3..1588ed3d5 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -333,7 +333,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     echo '        <td bgcolor="' . $bgcolor . '">' . "\n";
     if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary))
         && $row_table_def['Null'] == 'YES') {
-        echo '            <input type="checkbox" tabindex=' . ($i+3*$fields_cnt) . '"'
+        echo '            <input type="checkbox" tabindex="' . ($i+3*$fields_cnt) . '"'
              . ' name="fields_null[' . urlencode($field) . ']"';
         if ($data == 'NULL' && !$first_timestamp) {
             echo ' checked="checked"';
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 936cb2bee..eaafe3c39 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -17,6 +17,7 @@ require('./tbl_properties_table_info.php3');
 ?>
 <ul>
 
+<!-- TABLE WORK -->
 <?php
 /**
  * Query box, bookmark, insert data from textfile
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php3
index 6e4cc31a7..61e2d8dc7 100755
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php3
@@ -153,7 +153,9 @@ echo "\n";
     </table>
 </form>
 
-<a href="./Documentation.html#faqexport" target="documentation"><?php echo $strDocu; ?></a>
+<p align="center">
+    <a href="./Documentation.html#faqexport" target="documentation"><?php echo $strDocu; ?></a>
+</p>
 
 
 <?php
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index 43a9c7272..65b9578de 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -545,7 +545,7 @@ echo "\n";
         <div style="margin-bottom: 10px">
         <a href="sql.php3?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>">
             <?php echo $strStructPropose; ?></a>
-        <?php echo PMA_showDocuShort('p/r/procedure_analyse.html'); ?>
+        <?php echo PMA_showDocuShort('p/r/procedure_analyse.html') . "\n"; ?>
         </div>
     </li>
 
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 8cf49b018..ab21a7cfb 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -53,11 +53,9 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
            : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize')));
 
 ?>
-<!-- TABLE WORK -->
-<a name="querybox"></a>
-
     <!-- Query box and bookmark support -->
     <li>
+        <a name="querybox"></a>
         <form method="post" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; echo "\n"; ?>
             onsubmit="return checkSqlQuery(this)" name="sqlform">
             <input type="hidden" name="is_js_confirmed" value="0" />
diff --git a/tbl_select.php3 b/tbl_select.php3
index b2f747458..ed430ea31 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -119,12 +119,12 @@ if (!isset($param) || $param[0] == '') {
             if (eregi('char|blob|text|set|enum', $fields_type[$i])) {
                 while (list($k, $fc) = each($textfunctions)) {
                     echo "\n" . '                        '
-                         . '<option value="' . $fc . '">' . htmlentities($fc) . '</option>';
+                         . '<option value="' . htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
                 } // end while
             } else {
                 while (list($k, $fc) = each($numfunctions)) {
                     echo "\n" . '                        '
-                         . '<option value="' . $fc . '">' . htmlentities($fc) . '</option>';
+                         . '<option value="' .  htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
                 } // end while
             } // end if... else...
             echo "\n";