diff --git a/browse_foreigners.php b/browse_foreigners.php
index 349188a99a47..6c2be738bad3 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -1,8 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * display selection for relational field values
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/calendar.php b/calendar.php
index 7b86b898551c..f971f7a32a3b 100644
--- a/calendar.php
+++ b/calendar.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 require_once('./libraries/header_http.inc.php');
 $page_title = $strCalendar;
diff --git a/chk_rel.php b/chk_rel.php
index e35e46ee8432..71889a6c29dc 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 161a31f5845b..55c76ad13c3f 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -1,13 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * phpMyAdmin sample configuration, you can use it as base for
  * manual configuration. For easier setup you can use scripts/setup.php
  *
  * All directives are explained in Documentation.html and on phpMyAdmin
  * wiki <http://wiki.cihar.com>.
+ *
+ * @version $Id$
  */
 
 /*
diff --git a/db_create.php b/db_create.php
index 926a63d703bc..5e7e8d4ecf53 100644
--- a/db_create.php
+++ b/db_create.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/db_datadict.php b/db_datadict.php
index b532e46fb5d5..e88c3e401e23 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
diff --git a/db_export.php b/db_export.php
index a6d27ae28efa..f87d2a237ebb 100644
--- a/db_export.php
+++ b/db_export.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * dumps a database
  *
+ * @version $Id$
  * @uses    libraries/db_common.inc.php
  * @uses    libraries/db_info.inc.php
  * @uses    libraries/display_export.lib.php
diff --git a/db_import.php b/db_import.php
index 16d1a8dc87fa..9d9893980c93 100644
--- a/db_import.php
+++ b/db_import.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/db_operations.php b/db_operations.php
index 4d8b4cc9fcc7..b28c9e2c52bb 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -1,7 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * handles miscellaneous db operations:
  *  - move/rename
@@ -10,6 +8,8 @@
  *  - changing comment
  *  - adding tables
  *  - viewing PDF schemas
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/db_printview.php b/db_printview.php
index 3ea1591d18e7..a32b44fa6063 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 
 /**
diff --git a/db_qbe.php b/db_qbe.php
index f0b1a0d5d9bc..b780a5c167a4 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * query by example the whole database
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/db_sql.php b/db_sql.php
index 87a579c3e772..a1174fa4e2a5 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/db_structure.php b/db_structure.php
index 5542eedaa931..390208d3aad4 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 require_once './libraries/Table.class.php';
 
diff --git a/import.php b/import.php
index 5ded837790bb..b721148a4f10 100644
--- a/import.php
+++ b/import.php
@@ -1,8 +1,10 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/* Core script for import, this is just the glue around all other stuff */
+/**
+ * Core script for import, this is just the glue around all other stuff
+ *
+ * @version $Id$
+ */
 
 /**
  * Get the variables sent or posted to this script and a core script
diff --git a/index.php b/index.php
index c6c4ec1de488..a85af76dd1d7 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * forms frameset
  *
+ * @version $Id$
  * @uses    libraries/common.lib.php        global fnctions
  * @uses    libraries/relation.lib.php      table relations
  * @uses    $GLOBALS['strNoFrames']
diff --git a/js/functions.js b/js/functions.js
index 7e3f26f2ee37..efe959b1de62 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1,4 +1,9 @@
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * general function, usally for data manipulation pages
+ *
+ * @version $Id$
+ */
 
 /**
  * @var sql_box_locked lock for the sqlbox textarea in the querybox/querywindow
diff --git a/js/indexes.js b/js/indexes.js
index 8493881d63f6..8caed6bdd535 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -1,5 +1,9 @@
-/* $Id$ */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used for index manipulation pages
+ *
+ * @version $Id$
+ */
 
 /**
  * Ensures a value submitted in a form is numeric and is in a range
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 4713c9e3f876..8fe721f51d54 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -1,5 +1,9 @@
-/* $Id$ */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used in server privilege pages
+ *
+ * @version $Id$
+ */
 
 /**
  * Validates the password field in a form
diff --git a/js/tbl_change.js b/js/tbl_change.js
index beeb148380e5..7f4bf5deb3c5 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -1,5 +1,9 @@
-/* $Id$ */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used in table data manipulation pages
+ *
+ * @version $Id$
+ */
 
 /**
  * Modify from controls when the "NULL" checkbox is selected
diff --git a/js/tooltip.js b/js/tooltip.js
index 9f39fae6ef21..4f9cd359c0ab 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,11 +1,14 @@
-/* $Id$ */
-
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Displays the Tooltips (hints), if we have some
  * 2005-01-20 added by Michael Keck (mkkeck)
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 var ttXpos = 0, ttYpos = 0;
 var ttXadd = 10, ttYadd = -10;
 var ttDisplay = 0, ttHoldIt = 0;
diff --git a/js/user_password.js b/js/user_password.js
index 4fa0d26e2e3d..fcfa15a4f9b5 100644
--- a/js/user_password.js
+++ b/js/user_password.js
@@ -1,5 +1,9 @@
-/* $Id$ */
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used for password change form
+ *
+ * @version $Id$
+ */
 
 /**
  * Validates the password field in a form
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 983d80922bd3..368da045a406 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -1,6 +1,10 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ *
+ * @version $Id$
+ */
 
 /**
  * Configuration class
diff --git a/libraries/PMA_File.class.php b/libraries/PMA_File.class.php
index 098cac9d818c..a597f34fcdee 100644
--- a/libraries/PMA_File.class.php
+++ b/libraries/PMA_File.class.php
@@ -3,6 +3,7 @@
 /**
  * file upload functions
  *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/PMA_List.class.php b/libraries/PMA_List.class.php
index 4e2ee4c40684..f375a24ec83e 100644
--- a/libraries/PMA_List.class.php
+++ b/libraries/PMA_List.class.php
@@ -2,6 +2,8 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * hold the PMA_List base class
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/PMA_List_Database.class.php b/libraries/PMA_List_Database.class.php
index 164debff592b..e7e820af904e 100644
--- a/libraries/PMA_List_Database.class.php
+++ b/libraries/PMA_List_Database.class.php
@@ -3,6 +3,7 @@
 /**
  * holds the PMA_List_Database class
  *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 2d9565246aee..38c289bac974 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 class PMA_Table {
 
     /**
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index d9f19f9aa816..1aeec15e55c9 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -1,11 +1,20 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 require_once './libraries/Theme.class.php';
 
-class PMA_Theme_Manager {
-
+/**
+ *
+ */
+class PMA_Theme_Manager
+{
     /**
      * @var string path to theme folder
      * @protected
diff --git a/libraries/blowfish.php b/libraries/blowfish.php
index 624bc394ddf9..1e16d0669bf0 100644
--- a/libraries/blowfish.php
+++ b/libraries/blowfish.php
@@ -1,7 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * The Cipher_blowfish:: class implements the Cipher interface enryption data
  * using the Blowfish algorithm.
@@ -14,7 +12,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Revision$
+ * @version $Id$
  * @since   Horde 2.2
  * @package horde.cipher
  */
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 846438c3a495..77839716e864 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used with the bookmark feature
+ *
+ * @version $Id$
  */
 
 
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index c5ce78c882db..110c69cef19a 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -1,10 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * Charset conversion functions.
+ *
+ * @version $Id$
  */
 
 
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 6084810d3623..38eb5bec4d21 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -1,11 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Get user's global privileges and some db-specific privileges
-// ($controllink and $userlink are links to MySQL defined in the "common.lib.php" library)
-// Note: if no controluser is defined, $controllink contains $userlink
-
+/**
+ * Get user's global privileges and some db-specific privileges
+ * ($controllink and $userlink are links to MySQL defined in the "common.lib.php" library)
+ * Note: if no controluser is defined, $controllink contains $userlink
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 $is_create_db_priv  = false;
 $is_process_priv = true;
 $is_reload_priv  = false;
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index 824c48364419..b6d1d3a5c888 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Functions for cleanup of user input.
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 0f2b11a5b626..25a41c41d19e 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1,9 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Common Option Constants For DBI Functions
+ *
+ * @version $Id$
+ */
+
+/**
+ *
  */
 // PMA_DBI_try_query()
 define('PMA_DBI_QUERY_STORE',       1);  // Force STORE_RESULT method, ignored by classic MySQL.
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index d576c21e1048..560b60b533d8 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 54fa578cdf87..739f9991db83 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -1,10 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
-// Check parameters
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ * Check parameters
+ */
 require_once('./libraries/common.lib.php');
 
 PMA_checkParameters(array('db'));
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index c06eb2ec98dd..fc281ff71a54 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 require_once './libraries/relation.lib.php';
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index f4268d401c44..17d163ad78f2 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -1,8 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
-// Check parameters
+/**
+ * Check parameters
+ *
+ */
 if ( PMA_MYSQL_INT_VERSION >= 50002 ) {
     $url_query .= '&amp;goto=db_structure.php';
 
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index dc95b7ce6cb2..2009eba8c48b 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -1,10 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Ensure the database and the table exist (else move to the "parent" script)
  * and display headers
+ *
+ * @version $Id$
+ */
+
+/**
+ *
  */
 if (empty($is_db)) {
     if (isset($db) && strlen($db)) {
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index f2936ddfa5c5..75a06d70f02b 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Displays form for creating database (if user has privileges for that)
+/**
+ * Displays form for creating database (if user has privileges for that)
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/check_user_privileges.lib.php');
 
 if ($is_create_db_priv) {
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index 38c9e11ef6a0..2102f714503c 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Displays form for creating a table (if user has privileges for that)
+/**
+ * Displays form for creating a table (if user has privileges for that)
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/check_user_privileges.lib.php');
 
 // for MySQL >= 4.1.0, we should be able to detect if user has a CREATE
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index e02714f97bd3..3efa0cc7dbcf 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/Table.class.php';
 
 // Get relations & co. status
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 38d9bc99a029..ed0f4bf2af35 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 require_once('./libraries/file_listing.php');
 require_once('./libraries/plugin_interface.lib.php');
 
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index 1db1ee63319a..81e35b29f7bf 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -1,8 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/*
+/**
  * Code for displaying language selection
- * $Id$
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index a96773dce69a..7162163c3cf0 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/Table.class.php';
 
 /**
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index c87aa514acb4..52e28f4e274f 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -1,13 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
-// - bugfix for select all checkboxes
-// - copy right to left (or left to right) if user click on a check box
-// - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
-// - also changes made in js/functions.js
+/**
+ * modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
+ * - bugfix for select all checkboxes
+ * - copy right to left (or left to right) if user click on a check box
+ * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
+ * - also changes made in js/functions.js
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if ( $doWriteModifyAt == 'left' ){
 
     if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index e71d111ad0e8..667182fea0b1 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build CSV dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['excel'] = array(
         'text' => 'strStrucExcelCSV',
diff --git a/libraries/export/htmlexcel.php b/libraries/export/htmlexcel.php
index 81b2db979482..71b212d28a0b 100644
--- a/libraries/export/htmlexcel.php
+++ b/libraries/export/htmlexcel.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build CSV dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['htmlexcel'] = array(
         'text' => 'strHTMLExcel',
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 43316cab9578..70ec09967b01 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build CSV dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['htmlword'] = array(
         'text' => 'strHTMLWord',
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 8e3b4a4f1c91..6c21e87694aa 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $hide_structure = false;
     if ($plugin_param['export_type'] == 'table' && !$plugin_param['single_table']) {
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 0eb484507932..bfad1e1453a6 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build CSV dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['ods'] = array(
         'text' => 'strOpenDocumentSpreadsheet',
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 95f99a16f39d..0f7350efd98c 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build CSV dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $hide_structure = false;
     if ($plugin_param['export_type'] == 'table' && !$plugin_param['single_table']) {
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index b4a023ddd331..145683678823 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Produce a PDF report (export) from a query
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['pdf'] = array(
         'text' => 'strPDF',
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index f52f87c23caf..21d18c167a16 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build SQL dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $hide_sql       = false;
     $hide_structure = false;
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 58cb680e898b..8b88bf3f479a 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -1,7 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ * Set of functions used to build XLS dumps of tables
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 // Check if we have native MS Excel export using PEAR class Spreadsheet_Excel_Writer
 if (!empty($GLOBALS['cfg']['TempDir'])) {
     @include_once('Spreadsheet/Excel/Writer.php');
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index e6c22e08db4e..289b22b69023 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used to build XML dumps of tables
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if (isset($GLOBALS['db']) && strlen($GLOBALS['db'])) { /* Can't do server export */
 
 if (isset($plugin_list)) {
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 455a05ae3ce5..b33c78645ead 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -1,7 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ * Set of functions used to build YAML dumps of tables
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['yaml'] = array(
         'text' => 'YAML',
diff --git a/libraries/file_listing.php b/libraries/file_listing.php
index 2a6d71c7b3d9..5a71dd0c429b 100644
--- a/libraries/file_listing.php
+++ b/libraries/file_listing.php
@@ -1,7 +1,10 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-// Functions for listing directories
+/**
+ * Functions for listing directories
+ *
+ * @version $Id$
+ */
 
 /**
  * Returns array of filtered file names
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index a112a6551154..8f643af76082 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -1,15 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * WARNING: This script has to be included at the very end of your code because
  *          it will stop the script execution!
  *
  * always use $GLOBALS, as this script is also included by functions
  *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 require_once './libraries/relation.lib.php'; // for PMA_setHistory()
 
 /**
diff --git a/libraries/get_foreign.lib.php b/libraries/get_foreign.lib.php
index b9c39553b70d..ddc6eb8b561f 100644
--- a/libraries/get_foreign.lib.php
+++ b/libraries/get_foreign.lib.php
@@ -1,8 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/Table.class.php';
 
 /**
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index 3600e36f7cfc..b4dbf39b21b1 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -1,8 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * This library grabs the names and values of the variables sent or posted to a
  * script in the $_* arrays and sets simple globals variables from them. It does
@@ -10,6 +7,8 @@
  * $HTTP_AUTHORIZATION variables.
  *
  * loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index b393fe43a42c..2c2182eee933 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 
 if (empty($GLOBALS['is_header_sent'])) {
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index ccc0f709836f..ab1207638e2d 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
     die("GLOBALS overwrite attempt");
 }
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 2377281a1e98..daf29624a863 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
     die("GLOBALS overwrite attempt");
 }
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 89bd4d9b955a..9814fe999bd1 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets a core script and starts output buffering work
diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php
index 7c936f47fd82..2e75eeb2d50a 100644
--- a/libraries/iconv_wrapper.lib.php
+++ b/libraries/iconv_wrapper.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 # GNU iconv code set to IBM AIX libiconv code set table
 # Keys of this table should be in lowercase, and searches should be performed using lowercase!
 $gnu_iconv_to_aix_iconv_codepage_map = array (
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 627104937bab..de91d03600f4 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -1,10 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ * DocSQL import plugin for phpMyAdmin
+ *
+ * @version $Id$
+ */
 
-/* DocSQL import plugin for phpMyAdmin */
-
-/* We need relations enabled and we work only on database */
+/**
+ * We need relations enabled and we work only on database
+ */
 if ($plugin_param == 'database' && $GLOBALS['num_tables'] > 0 && $GLOBALS['cfgRelation']['relwork'] && $GLOBALS['cfgRelation']['commwork']) {
     if (isset($plugin_list)) {
         $plugin_list['docsql'] = array(           // set name of your plugin
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index a7d0dbc626d5..e9db16106296 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/* CSV import plugin for phpMyAdmin */
+/**
+ * CSV import plugin for phpMyAdmin
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if ($plugin_param == 'table') {
     if (isset($plugin_list)) {
         if ($GLOBALS['cfg']['Import']['ldi_local_option'] == 'auto') {
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 9c4eea1c6a7b..a792dd90b1c3 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/* SQL import plugin for phpMyAdmin */
+/**
+ * SQL import plugin for phpMyAdmin
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if (isset($plugin_list)) {
     $plugin_list['sql'] = array(
         'text' => 'strSQL',
diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php
index 2fa0c600d522..8255360bf3ca 100644
--- a/libraries/information_schema_relations.lib.php
+++ b/libraries/information_schema_relations.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 $GLOBALS['information_schema_relations'] = array(
     'CHARACTER_SETS' => array(
         'DEFAULT_COLLATE_NAME' => array(
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index 4ae321112da0..205ea26bea76 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -1,10 +1,10 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * This library is used with the server IP allow/deny host authentication
  * feature
+ *
+ * @version $Id$
  */
 
 
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index b69c64162495..9d128aa311ee 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Javascript escaping functions.
  *
  * @author Michal Čihař <michal@cihar.com>
  * @package phpMyAdmin
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
index 5aba38f3b218..2e5b9f83fa5a 100644
--- a/libraries/kanji-encoding.lib.php
+++ b/libraries/kanji-encoding.lib.php
@@ -1,8 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * Set of functions for kanji-encoding convert (available only with japanese
  * language)
@@ -11,6 +8,8 @@
  *     --enable-mbstring --enable-mbstr-enc-trans --enable-mbregex
  *
  * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp>
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/language.lib.php b/libraries/language.lib.php
index 81eb2275fd7a..d8e8d6105285 100644
--- a/libraries/language.lib.php
+++ b/libraries/language.lib.php
@@ -1,12 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * phpMyAdmin Language Loading File
+ *
+ * @version $Id$
  */
 
-// Detection is done here
+/**
+ * lang detection is done here
+ */
 require_once('./libraries/select_lang.lib.php');
 
 // Load the translation
diff --git a/libraries/mcrypt.lib.php b/libraries/mcrypt.lib.php
index ea7a729af83b..27db6c27580e 100644
--- a/libraries/mcrypt.lib.php
+++ b/libraries/mcrypt.lib.php
@@ -1,15 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Initialization
+ * Store the initialization vector because it will be needed for
+ * further decryption. I don't think necessary to have one iv
+ * per server so I don't put the server number in the cookie name.
  */
-
-// Store the initialization vector because it will be needed for
-// further decryption. I don't think necessary to have one iv
-// per server so I don't put the server number in the cookie name.
-
 if (!isset($_COOKIE['pma_mcrypt_iv'])) {
     srand((double) microtime() * 1000000);
     $iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_BLOWFISH, MCRYPT_MODE_CBC), MCRYPT_RAND);
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 9e64cfe76db2..6d4546f47b73 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Prepares the work and runs some other scripts if required
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index d2beb050790b..a390cb0b7ed3 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if (PMA_MYSQL_INT_VERSION >= 40100){
 
     $res = PMA_DBI_query('SHOW CHARACTER SET;');
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 39b6e48b850a..17dc19969af5 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -1,12 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * displays the pma logo, links and db and server selection in left frame
  *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if ( empty( $query_url ) ) {
     $db     = ! isset( $db )      ? '' : $db;
     $table  = ! isset( $table )   ? '' : $table;
diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php
index dd0e4229a100..99b8a8ac6fab 100644
--- a/libraries/ob.lib.php
+++ b/libraries/ob.lib.php
@@ -1,8 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * Output buffer functions for phpMyAdmin
  *
@@ -11,6 +8,8 @@
  *
  * Check for all the needed functions for output buffering
  * Make some wrappers for the top and bottoms of our files.
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index 035df667811c..72c7cf169a97 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Simple interface for creating OASIS OpenDocument files.
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 require_once('./libraries/zip.lib.php');
 
 $GLOBALS['OpenDocumentNS'] = 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php
index c60bb084543a..7885b253b8a4 100644
--- a/libraries/parse_analyze.lib.php
+++ b/libraries/parse_analyze.lib.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 $GLOBALS['unparsed_sql'] = $sql_query;
 $parsed_sql = PMA_SQP_parse($sql_query);
 $analyzed_sql = PMA_SQP_analyze($parsed_sql);
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 2a2b000099d6..c5aec14eab50 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Generic plugin interface.
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 84061105f238..e80755143eba 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -1,13 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-require_once './libraries/Table.class.php';
-
 /**
  * Set of functions used with the relation and pdf feature
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
+require_once './libraries/Table.class.php';
+
 /**
  * Executes a query as controluser if possible, otherwise as normal user
  *
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index b67d7b34ceef..ac371be22483 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -1,12 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used for cleaning up phpMyAdmin tables
+ *
+ * @version $Id$
  */
 
-
+/**
+ *
+ */
 require_once('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index ea183b87d26c..2107e3b7e205 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -1,8 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/*
+/**
  * Code for displaying server selection written by nijel
- * $Id$
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index e817a637e5db..e6aad721a7c0 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -1,9 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Check parameters
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ * Check parameters
+ */
 require_once('./libraries/common.lib.php');
 require_once('./libraries/server_common.inc.php');
 
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 914bd5e3580c..111b1ecb0c57 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * session handling
  *
+ * @version $Id$
  * @todo    add failover or warn if sessions are not configured properly
  * @todo    add an option to use mm-module for session handler
  * @see     http://www.php.net/session
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 35cd20ebab93..fcd9bdaf9c11 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * functions for displaying the sql query form
  *
+ * @version $Id$
  * @usedby  server_sql.php
  * @usedby  db_sql.php
  * @usedby  tbl_sql.php
@@ -11,6 +11,9 @@
  * @usedby  querywindow.php
  */
 
+/**
+ *
+ */
 require_once './libraries/file_listing.php'; // used for file listing
 require_once './libraries/bookmark.lib.php'; // used for file listing
 
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 00ecb26f4d3a..a1b825385e38 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -1,7 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
 * PHP interface to MimerSQL Validator
 *
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index c97b6f891ba0..eb7fa1617ae4 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -1,7 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * SQL Validator interface for phpMyAdmin
  *
@@ -28,12 +26,15 @@
  * $cfg['SQLValidator']['use']  = FALSE;
  *
  * Also set a username and password if you have a private one
+ *
+ * @version $Id$
  */
 
-
-// We need the PEAR libraries, so do a minimum version check first
-// I'm not sure if PEAR was available before this point
-// For now we actually use a configuration flag
+/**
+ * We need the PEAR libraries, so do a minimum version check first
+ * I'm not sure if PEAR was available before this point
+ * For now we actually use a configuration flag
+ */
 if ($cfg['SQLValidator']['use'] == TRUE)  {
     require_once('./libraries/sqlvalidator.class.php');
 } // if ($cfg['SQLValidator']['use'] == TRUE)
diff --git a/libraries/storage_engines.lib.php b/libraries/storage_engines.lib.php
index 968c09e9fe54..f388ab669125 100644
--- a/libraries/storage_engines.lib.php
+++ b/libraries/storage_engines.lib.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Library for extracting information about the available storage engines
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 $GLOBALS['mysql_storage_engines'] = array();
 
 if (PMA_MYSQL_INT_VERSION >= 40102) {
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index b550ddb2403a..09a5d792c8f2 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -1,8 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/** Specialized String Functions for phpMyAdmin
+/**
+ * Specialized String Functions for phpMyAdmin
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
  * http://www.orbis-terrarum.net/?l=people.robbat2
@@ -12,6 +11,8 @@
  * (that are slower).
  *
  * The SQL Parser code relies heavily on these functions.
+ *
+ * @version $Id$
  */
 
 /* Try to load mbstring, unless we're using buggy php version */
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
index 1838b931cb43..6ddd36b1a98b 100644
--- a/libraries/tbl_common.php
+++ b/libraries/tbl_common.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/libraries/tbl_indexes.lib.php b/libraries/tbl_indexes.lib.php
index 4644650f36c1..62ee73d9efcb 100644
--- a/libraries/tbl_indexes.lib.php
+++ b/libraries/tbl_indexes.lib.php
@@ -3,7 +3,7 @@
 /**
  * function library for handling table indexes
  *
- * $Id$
+ * @version $Id$
  */
 
 /**
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index a09f3b8b3e5c..80659eec1b70 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/Table.class.php';
 
 /**
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 1160c6a5e192..3f90c5042283 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -1,9 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Check parameters
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ * Check parameters
+ */
 require_once('./libraries/common.lib.php');
 
 PMA_checkParameters(array('db', 'table'));
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 2bf8dc2e4349..b6ca23d594f2 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -1,8 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-// Check parameters
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ * Check parameters
+ */
 require_once('./libraries/common.lib.php');
 PMA_checkParameters(array('db', 'table', 'action', 'num_fields'));
 
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
index ad9a56ce3ff3..3a00263ed610 100644
--- a/libraries/transformations.lib.php
+++ b/libraries/transformations.lib.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * Set of functions used with the relation and pdf feature
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 function PMA_transformation_getOptions($string) {
     $transform_options = array();
 
diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php
index 565c86340d69..b53cbcdba125 100644
--- a/libraries/transformations/application_octetstream__download.inc.php
+++ b/libraries/transformations/application_octetstream__download.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_application_octetstream__download(&$buffer, $options = array(), $meta = '') {
     global $row, $fields_meta;
 
diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php
index f7519d7a7d10..c4e675e80bb8 100644
--- a/libraries/transformations/application_octetstream__hex.inc.php
+++ b/libraries/transformations/application_octetstream__hex.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_application_octetstream__hex($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
     // include('./libraries/transformations/global.inc.php');
diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php
index a46eefa5aa39..6648b7b31e96 100644
--- a/libraries/transformations/global.inc.php
+++ b/libraries/transformations/global.inc.php
@@ -1,7 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
 /**
  * GLOBAL Plugin function (Garvin Hicking).
  * ---------------
@@ -21,8 +19,12 @@
  *
  * Please provide a comment for your function, what it does and what parameters are available.
  *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 function PMA_transformation_global_plain($buffer, $options = array(), $meta = '') {
     return htmlspecialchars($buffer);
 }
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
index 6d71453817f5..4ed92005ea92 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '') {
     require_once('./libraries/transformations/global.inc.php');
 
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
index d7d742293c18..7b46e185d305 100644
--- a/libraries/transformations/image_jpeg__link.inc.php
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '') {
     require_once('./libraries/transformations/global.inc.php');
 
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
index 0f155ef6c65e..37a4c18c7b79 100644
--- a/libraries/transformations/image_png__inline.inc.php
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '') {
     require_once('./libraries/transformations/global.inc.php');
 
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
index bbec0c5cc51a..6c83746ba3d0 100644
--- a/libraries/transformations/text_plain__dateformat.inc.php
+++ b/libraries/transformations/text_plain__dateformat.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__dateformat($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
     // include('./libraries/transformations/global.inc.php');
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index 6fadaf6ba1a7..44cca5c95b23 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__external_nowrap($options = array()) {
     if (!isset($options[3]) || $options[3] == '') {
         $nowrap = true;
diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php
index da87e1b98be1..7277a4d98450 100644
--- a/libraries/transformations/text_plain__formatted.inc.php
+++ b/libraries/transformations/text_plain__formatted.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__formatted($buffer, $options = array(), $meta = '') {
     return $buffer;
 }
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
index 150e26088a98..b8446e78bfa0 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '') {
     require_once('./libraries/transformations/global.inc.php');
 
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
index f51b0c5be66e..ebbf253e1618 100644
--- a/libraries/transformations/text_plain__link.inc.php
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '') {
     require_once('./libraries/transformations/global.inc.php');
 
diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php
index 5af3ea3ce7c0..f4007e708564 100644
--- a/libraries/transformations/text_plain__sql.inc.php
+++ b/libraries/transformations/text_plain__sql.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 function PMA_transformation_text_plain__sql($buffer, $options = array(), $meta = '') {
     $result = PMA_SQP_formatHtml(PMA_SQP_parse($buffer));
     // Need to clear error state not to break subsequent queries display.
diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php
index 99ab2f579deb..4fd1fc141b11 100644
--- a/libraries/transformations/text_plain__substr.inc.php
+++ b/libraries/transformations/text_plain__substr.inc.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 function PMA_transformation_text_plain__substr($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
     // include('./libraries/transformations/global.inc.php');
diff --git a/libraries/unzip.lib.php b/libraries/unzip.lib.php
index 1a0b5731a7a9..12ffcaf32c6b 100644
--- a/libraries/unzip.lib.php
+++ b/libraries/unzip.lib.php
@@ -1,5 +1,6 @@
-<?PHP
-    /* $Id$ */
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/* $Id$ */
 
     /**
      *  ZIP file unpack classes. Contributed to the phpMyAdmin project.
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index c67ac61c7779..6db301e9bce2 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -1,13 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * URL/hidden inputs generating.
+ *
+ * @version $Id$
  */
 
-
 /**
  * Generates text with hidden inputs.
  *
diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
index c7e398099734..eb62a9120736 100644
--- a/libraries/zip.lib.php
+++ b/libraries/zip.lib.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Zip file creation class.
diff --git a/license.php b/license.php
index ca7ae7f15036..91927f41ae26 100644
--- a/license.php
+++ b/license.php
@@ -1,10 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-// Simple script to set correct charset for the license
-//
-// Note: please do not fold this script into a general script
-// that would read any file using a GET parameter, it would open a hole
+/**
+ * Simple script to set correct charset for the license
+ *
+ * Note: please do not fold this script into a general script
+ * that would read any file using a GET parameter, it would open a hole
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 header('Content-type: text/plain; charset=iso-8859-1');
 readfile('LICENSE');
 ?>
diff --git a/main.php b/main.php
index c756a7f24ab7..6e2174185e8d 100644
--- a/main.php
+++ b/main.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Don't display the page heading
diff --git a/navigation.php b/navigation.php
index 72af447762b1..1c7da323655c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * the navigation frame - displays server, db and table selection tree
  *
+ * @version $Id$
  * @uses $GLOBALS['PMA_List_Database']
  * @uses $GLOBALS['server']
  * @uses $GLOBALS['db']
diff --git a/pdf_pages.php b/pdf_pages.php
index a7edf76237ab..2b40b9b0de01 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/pdf_schema.php b/pdf_schema.php
index c1aedb3e4cfb..406c0b0c6ee1 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -1,8 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * Contributed by Maxime Delorme and merged by lem9
+ *
+ * @version $Id$
  */
 
 /**
diff --git a/phpinfo.php b/phpinfo.php
index 29fbb20c9bcf..3f38ece5137a 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets core libraries and defines some variables
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index 2177c1a65c3e..0a9efcc2bd0e 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 define('PMA_MINIMUM_COMMON', true);
 require_once './libraries/common.lib.php';
 require_once './libraries/sqlparser.lib.php';
diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js
index 34076fb9590c..1a3ae6d91f11 100644
--- a/pmd/scripts/ajax.js
+++ b/pmd/scripts/ajax.js
@@ -1,35 +1,42 @@
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 var http_request = false;
 var xmldoc;
 var textdoc;
 
 
-function makeRequest(url, parameters) 
+function makeRequest(url, parameters)
 {
   http_request = false;
-  if (window.XMLHttpRequest) 
+  if (window.XMLHttpRequest)
   { // Mozilla, Safari,...
     http_request = new XMLHttpRequest();
     if (http_request.overrideMimeType) { http_request.overrideMimeType('text/xml'); }
-  } 
-  else 
-  if (window.ActiveXObject) 
+  }
+  else
+  if (window.ActiveXObject)
   { // IE
-    try { http_request = new ActiveXObject("Msxml2.XMLHTTP"); } 
-    catch (e) 
+    try { http_request = new ActiveXObject("Msxml2.XMLHTTP"); }
+    catch (e)
     {
-      try { http_request = new ActiveXObject("Microsoft.XMLHTTP"); } 
+      try { http_request = new ActiveXObject("Microsoft.XMLHTTP"); }
       catch (e) {}
     }
   }
 
-  if (!http_request) 
+  if (!http_request)
   {
     alert('Giving up :( Cannot create an XMLHTTP instance');
     return false;
   }
- 
+
   http_request.onreadystatechange = alertContents;
   http_request.open('POST', url, true);
   http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
@@ -38,9 +45,9 @@ function makeRequest(url, parameters)
   http_request.send(parameters);
 }
 
-function alertContents() 
+function alertContents()
 {
-  if (http_request.readyState == 1 ) 
+  if (http_request.readyState == 1 )
   {
     document.getElementById("layer_action").style.left = document.body.clientWidth + document.body.scrollLeft - 85;
     document.getElementById("layer_action").style.top  = document.body.scrollTop + 10;
@@ -48,23 +55,23 @@ function alertContents()
   }
   if (http_request.readyState == 2 ) document.getElementById("layer_action").innerHTML  = 'Loaded';
   if (http_request.readyState == 3 ) document.getElementById("layer_action").innerHTML  = 'Loading 99%';
-  if (http_request.readyState == 4 ) 
+  if (http_request.readyState == 4 )
   {
-    if (http_request.status == 200) 
+    if (http_request.status == 200)
     {
       textdoc = http_request.responseText;
       //alert(textdoc);
-      xmldoc  = http_request.responseXML; 
+      xmldoc  = http_request.responseXML;
       PrintXML();
       document.getElementById("layer_action").style.visibility = 'hidden';
-    } 
-    else 
+    }
+    else
     {
       alert('There was a problem with the request.');
     }
   }
 }
-            
+
 function PrintXML()
 {
   var root = xmldoc.getElementsByTagName('root').item(0);  //root
@@ -82,7 +89,7 @@ function PrintXML()
     //alert(root.attributes[0].nodeValue);
     //alert(xmldoc.getElementsByTagName('root')[0].attributes[0].nodeValue);
     //xmldoc.getElementsByTagName('root')[0].getAttribute("act")
-    
+
     if(root.getAttribute('act') == 'save_pos')
       alert(strLang[root.getAttribute('return')]);
     if(root.getAttribute('act') == 'relation_upd')
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 26ce9493a636..60f274ccec6c 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -1,7 +1,12 @@
-/*
-$Id$
-@author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
-*/
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @version $Id$
+ * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
+ */
+
+/**
+ *
+ */
 var dx, dy, dy2;
 var cur_click;
 var sm_x = 2, sm_y = 2; // update in Main()
@@ -32,10 +37,10 @@ var old_class;
 //---------------------------------------------------------------------------------------------------------------------------
 
 
-//window.captureEvents(Event.MOUSEDOWN | Event.MOUSEUP); 
+//window.captureEvents(Event.MOUSEDOWN | Event.MOUSEUP);
 //---CROSS
-document.onmousedown = MouseDown; 
-document.onmouseup   = MouseUp; 
+document.onmousedown = MouseDown;
+document.onmouseup   = MouseUp;
 document.onmousemove = MouseMove;
 
 isIE = document.all && !window.opera;
@@ -43,15 +48,15 @@ isNN = !document.all && document.getElementById;
 isN4 = document.layers;
 
 if (isIE) {
-  window.onscroll = General_scroll; 
+  window.onscroll = General_scroll;
   document.onselectstart = function () {return false;};
 }
 
 //document.onmouseup = function(){General_scroll_end();}
-function MouseDown(e) 
-{ 
-  if (cur_click != null) 
-  { 
+function MouseDown(e)
+{
+  if (cur_click != null)
+  {
     offsetx=isIE ? event.clientX + document.body.scrollLeft : e.pageX;
     offsety=isIE ? event.clientY + document.body.scrollTop : e.pageY;
     dx = offsetx - parseInt(cur_click.style.left);
@@ -61,58 +66,58 @@ function MouseDown(e)
     /*
     var left = parseInt(cur_click.style.left);
     var top  = parseInt(cur_click.style.top);
-    dx = e.pageX - left; 
+    dx = e.pageX - left;
     dy = e.pageY - top;
-    
+
     alert(" dx = " + dx + " dy = " +dy);*/
-    cur_click.style.zIndex = 2;    
+    cur_click.style.zIndex = 2;
   }
   if(layer_menu_cur_click)
   {
     offsetx=isIE ? event.clientX + document.body.scrollLeft: e.pageX;
-    dx = offsetx - parseInt(document.getElementById("layer_menu").style.width); 
+    dx = offsetx - parseInt(document.getElementById("layer_menu").style.width);
   }
-} 
+}
 
 function MouseMove(e)
-{ 
-  
-  //Glob_X = e.pageX; 
+{
+
+  //Glob_X = e.pageX;
   //Glob_Y = e.pageY;
-  Glob_X = isIE ? event.clientX + document.body.scrollLeft: e.pageX; 
+  Glob_X = isIE ? event.clientX + document.body.scrollLeft: e.pageX;
   Glob_Y = isIE ? event.clientY + document.body.scrollTop: e.pageY;
 
   // mouseX= (bw.ns4||bw.ns6)? e.pageX: bw.ie&&bw.win&&!bw.ie4? (event.clientX-2)+document.body.scrollLeft : event.clientX+document.body.scrollLeft;
   //mouseY= (bw.ns4||bw.ns6)? e.pageY: bw.ie&&bw.win&&!bw.ie4? (event.clientY-2)+document.body.scrollTop : event.clientY+document.body.scrollTop;
-  
+
   //window.status = "X = "+ Glob_X + " Y = "+ Glob_Y;
-  
+
   var mGx, mGy;
-  if (cur_click != null) 
+  if (cur_click != null)
   {
     mGx = Glob_X - dx;
     mGy = Glob_Y - dy;
     mGx = mGx > 0 ? mGx : 0;
     mGy  = mGy > 0 ? mGy : 0;
- 
+
     if(ON_grid)
     {
       mGx = mGx % step < step / 2 ? mGx - mGx % step : mGx - mGx % step + step;
       mGy = mGy % step < step / 2 ? mGy - mGy % step : mGy - mGy % step + step;
     }
-    
+
     cur_click.style.left = mGx;
     cur_click.style.top  = mGy;
   }
 
-  if (ON_relation || ON_display_field) 
+  if (ON_relation || ON_display_field)
   {
     document.getElementById('hint').style.left = Glob_X + 20;
     document.getElementById('hint').style.top  = Glob_Y + 20;
   }
 
   if(layer_menu_cur_click)
-  { 
+  {
     document.getElementById("layer_menu").style.width = Glob_X - dx>=150?Glob_X - dx:150;
     //document.getElementById("layer_menu").style.height = Glob_Y - dy>=200?Glob_Y - dy:200;
     //document.getElementById("id_scroll_tab").style.height = Glob_Y - dy2;
@@ -121,15 +126,15 @@ function MouseMove(e)
 
 function MouseUp(e)
 {
-  if (cur_click != null) 
-  {  
+  if (cur_click != null)
+  {
     document.getElementById("canvas").style.visibility = 'visible';
-    Re_load(); 
+    Re_load();
     cur_click.style.zIndex = 1;
-    cur_click = null; 
+    cur_click = null;
   }
   layer_menu_cur_click=0;
-  //window.releaseEvents(Event.MOUSEMOVE); 
+  //window.releaseEvents(Event.MOUSEMOVE);
 }
 //---------------------------------------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------------------------------------
@@ -147,7 +152,7 @@ function Canvas_pos()
   canvas_height = document.getElementById('canvas').height = osn_tab_height - 3;
 
    if(isIE)
-  { 
+  {
     document.getElementById('canvas').style.width  = (osn_tab_width  - 3)?(osn_tab_width  - 3):0;
     document.getElementById('canvas').style.height = (osn_tab_height - 3)?(osn_tab_height - 3):0;
   }
@@ -162,7 +167,7 @@ function Osn_tab_pos()
 
 function Main()
 { //alert( document.getElementById('osn_tab').offsetTop);
- //---CROSS 
+ //---CROSS
   if(isIE)
   {
     document.getElementById('top_menu').style.position = 'absolute';
@@ -172,13 +177,13 @@ function Main()
   document.getElementById("layer_menu").style.top = -1000; //fast scroll
   sm_x += document.getElementById('osn_tab').offsetLeft;
   sm_y += document.getElementById('osn_tab').offsetTop;
-  Osn_tab_pos(); 
-  Canvas_pos(); 
+  Osn_tab_pos();
+  Canvas_pos();
   Small_tab_refresh();
   Re_load();
   id_hint = document.getElementById('hint');
   if (isIE) {
-	General_scroll();
+    General_scroll();
   }
 }
 
@@ -188,7 +193,7 @@ function Rezize_osn_tab()
 {
   var max_X = max_Y = 0;
   for (key in j_tabs)
-  { 
+  {
     k_x = parseInt(document.getElementById(key).style.left) + document.getElementById(key).offsetWidth;
     k_y = parseInt(document.getElementById(key).style.top) + document.getElementById(key).offsetHeight;
     max_X = max_X < k_x ? k_x : max_X;
@@ -203,18 +208,18 @@ function Rezize_osn_tab()
 //--------------------------------------------------------------------------------------
 
 
-function Re_load() 
+function Re_load()
 {
   Rezize_osn_tab();
   var n;
   var a = new Array();
   Clear();
-  for (K in contr) 
+  for (K in contr)
     for (key in contr[K])                 // contr name
       for (key2 in contr[K][key])         // table name
         for (key3 in contr[K][key][key2]) // field name
-        { 
-          if(!document.getElementById("check_vis_"+key2).checked || 
+        {
+          if(!document.getElementById("check_vis_"+key2).checked ||
              !document.getElementById("check_vis_"+contr[K][key][key2][key3][0]).checked) continue; // if hide
           var x1_left  = document.getElementById(key2).offsetLeft+1;
           var x1_right = x1_left + document.getElementById(key2).offsetWidth;
@@ -232,15 +237,15 @@ function Re_load()
     // alert(key2+"."+key3);
           var y1 = document.getElementById(key2).offsetTop + document.getElementById(key2+"."+key3).offsetTop + height_field;
       //    alert(1);
-          var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop + 
+          var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
                    document.getElementById(contr[K][key][key2][key3][0]+"."+contr[K][key][key2][key3][1]).offsetTop + height_field;
           Line0(x1-sm_x,y1-sm_y,x2-sm_x,y2-sm_y,"rgba(0,100,150,1)");
-          
+
         }
 }
 
-function Line(x1,y1,x2,y2,color_line) 
-{ 
+function Line(x1,y1,x2,y2,color_line)
+{
   var canvas = document.getElementById("canvas");
   var ctx    = canvas.getContext("2d");
   ctx.strokeStyle = color_line;
@@ -248,7 +253,7 @@ function Line(x1,y1,x2,y2,color_line)
   ctx.beginPath();
   ctx.moveTo(x1, y1);
   ctx.lineTo(x2, y2);
-  ctx.stroke();  
+  ctx.stroke();
 }
 
 function Line0(x1,y1,x2,y2,color_line)
@@ -259,33 +264,33 @@ function Line0(x1,y1,x2,y2,color_line)
   Line3(x1,y1,x2,y2,color_line);
 }
 
-function Line2(x1,y1,x2,y2,color_line) 
+function Line2(x1,y1,x2,y2,color_line)
 {
   var x1_ = x1;
   var x2_ = x2;
-  
+
   Circle(x1,y1,3,3,"rgba(0,0,255,1)");
   Rect(x2-1,y2-2,4,4,"rgba(0,0,255,1)");
-  
-  if(s_right) 
+
+  if(s_right)
   {
     x1_ += sm_add; x2_ += sm_add;
   }
-  else if(s_left) 
+  else if(s_left)
   {
     x1_ -= sm_add; x2_ -= sm_add;
   }
   else
   if(x1 < x2) { x1_ += sm_add; x2_ -= sm_add; }
   else        { x1_ -= sm_add; x2_ += sm_add; }
-    
-  
+
+
   Line(x1,y1,x1_,y1,color_line);
   Line(x2,y2,x2_,y2,color_line);
   Line(x1_,y1,x2_,y2,color_line);
 }
 
-function Line3(x1,y1,x2,y2,color_line) 
+function Line3(x1,y1,x2,y2,color_line)
 {
   var x1_ = x1;
   var x2_ = x2;
@@ -293,50 +298,50 @@ function Line3(x1,y1,x2,y2,color_line)
   Rect(x2-1,y2-2,4,4,"rgba(0,0,255,1)");
 
   var x_s = (x1+x2)/2;
-  if(s_right) 
+  if(s_right)
   {
     if(x1 < x2) { x1_ += x2 - x1 + sm_add; x2_ += sm_add; }
     else        { x2_ += x1 - x2 + sm_add; x1_ += sm_add; }
-    
+
     Line(x1,y1,x1_,y1,color_line);
     Line(x2,y2,x2_,y2,color_line);
     Line(x1_,y1,x2_,y2,color_line);
     return 0;
   }
-  if(s_left) 
+  if(s_left)
   {
     if(x1 < x2) { x2_ -= x2 - x1 + sm_add; x1_ -= sm_add; }
     else        { x1_ -= x1 - x2 + sm_add; x2_ -= sm_add; }
-    
+
     Line(x1,y1,x1_,y1,color_line);
     Line(x2,y2,x2_,y2,color_line);
     Line(x1_,y1,x2_,y2,color_line);
     return 0;
   }
-    
+
   Line(x1,y1,x_s,y1,color_line);
   Line(x_s,y2,x2,y2,color_line);
   Line(x_s,y1,x_s,y2,color_line);
 }
 
-function Circle(x,y,r,w,color) 
-{   
-  var ctx = document.getElementById('canvas').getContext('2d');   
-  ctx.beginPath(); 
+function Circle(x,y,r,w,color)
+{
+  var ctx = document.getElementById('canvas').getContext('2d');
+  ctx.beginPath();
   ctx.moveTo(x, y);
   ctx.lineWidth = w;
   ctx.strokeStyle = color;
-  ctx.arc(x, y, r, 0, 2*Math.PI, true);   
-  ctx.stroke(); 
-} 
+  ctx.arc(x, y, r, 0, 2*Math.PI, true);
+  ctx.stroke();
+}
 
-function Clear() 
+function Clear()
 {
   var canvas = document.getElementById("canvas");
   var ctx    = canvas.getContext("2d");
   ctx.clearRect(0, 0, canvas_width, canvas_height);
 }
-  
+
 function Rect(x1,y1,w,h,color)
 {
   var ctx = document.getElementById('canvas').getContext('2d');
@@ -354,7 +359,7 @@ function Save(url) // (del?) no for pdf
     document.getElementById('t_v['+key+']').value=document.getElementById('_|_tbody_'+key).style.display=='none'?0:1;
     document.getElementById('t_h['+key+']').value=document.getElementById('check_vis_'+key).checked?1:0;
   }
-  document.form1.action = url; 
+  document.form1.action = url;
   document.form1.submit();
 }
 
@@ -383,14 +388,14 @@ function Grid()
   if(!ON_grid ) {
     ON_grid = 1;
     document.getElementById('grid_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
-  
+
     if(isIE) { // correct for IE
       document.getElementById('grid_button').className = 'M_butt_Selected_down_IE';
     }
   }
   else  {
     document.getElementById('grid_button').className = 'M_butt';
-    ON_grid = 0;  
+    ON_grid = 0;
   }
 }
 
@@ -399,13 +404,13 @@ function Angular_direct()
   if(ON_angular_direct ) {
     ON_angular_direct = 0;
     document.getElementById('angular_direct_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
-  
+
     if(isIE) { // correct for IE
       document.getElementById('angular_direct_button').className = 'M_butt_Selected_down_IE';
     }
   }
   else {
-    ON_angular_direct = 1;  
+    ON_angular_direct = 1;
     document.getElementById('angular_direct_button').className = 'M_butt';
   }
   Re_load();
@@ -413,7 +418,7 @@ function Angular_direct()
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++ RELATION ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 function Start_relation()
 {
-  if(ON_display_field) return; 
+  if(ON_display_field) return;
 
   if(!ON_relation )
   {
@@ -422,7 +427,7 @@ function Start_relation()
     document.getElementById('hint').innerHTML = LangSelectReferencedKey;
     document.getElementById('hint').style.visibility = "visible";
     document.getElementById('rel_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
-    
+
     if(isIE) { // correct for IE
       document.getElementById('rel_button').className = 'M_butt_Selected_down_IE';
     }
@@ -432,8 +437,8 @@ function Start_relation()
     document.getElementById('hint').innerHTML = "";
     document.getElementById('hint').style.visibility = "hidden";
     document.getElementById('rel_button').className = 'M_butt';
-    click_field = 0; 
-    ON_relation = 0;  
+    click_field = 0;
+    ON_relation = 0;
   }
 }
 
@@ -449,17 +454,17 @@ function Click_field(T,f,PK) // table field
       link_relation = "T1=" + T + "&F1=" + f;
       document.getElementById('hint').innerHTML = LangSelectForeignKey;
     }
-    else 
+    else
     {
       Start_relation(); // hidden hint...
       if(j_tabs[db+'.'+T]!='INNODB' || !PK ) document.getElementById('InnoDB_relation').style.display='none';
       document.getElementById('layer_new_relation').style.left = Glob_X - (document.getElementById('layer_new_relation').offsetWidth>>1);
       document.getElementById('layer_new_relation').style.top  = Glob_Y - document.getElementById('layer_new_relation').offsetHeight - 10;
       document.getElementById('layer_new_relation').style.visibility = "visible";
-      link_relation += '&T2=' + T + '&F2=' + f;   
+      link_relation += '&T2=' + T + '&F2=' + f;
     }
   }
-  
+
   if(ON_display_field)
   {
     if(display_field[T] == f) // if is display field
@@ -472,7 +477,7 @@ function Click_field(T,f,PK) // table field
       //n = 0;for(k in display_field)n++;alert(n);
     }
     else
-    { 
+    {
       old_class = 'tab_field_3';
       if(display_field[T])
       {
@@ -496,7 +501,7 @@ function New_relation()
   link_relation += '&db=' + db + '&token=' + token + '&die_save_pos=0';
   link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
   link_relation += Get_url_pos();
-  
+
   //alert(link_relation);
   makeRequest('pmd_relation_new.php', link_relation);
 }
@@ -529,7 +534,7 @@ function Small_tab_all(id_this) // max/min all tables
     id_this.src="pmd/images/rightarrow1.png";
   }
   else
-  {  
+  {
     for (key in j_tabs)
       if(document.getElementById('_|_hide_tbody_'+key).innerHTML!="v")
       Small_tab(key,0);
@@ -550,7 +555,7 @@ function Small_tab_invert() // invert max/min all tables
   Re_load();
 }
 
-function Small_tab_refresh() 
+function Small_tab_refresh()
 {
    for (key in j_tabs)
      if(document.getElementById('_|_hide_tbody_'+key).innerHTML!="v")
@@ -560,7 +565,7 @@ function Small_tab_refresh()
      }
 }
 
-function Small_tab(t,re_load) 
+function Small_tab(t,re_load)
 {
   var id      = document.getElementById('_|_tbody_'+t);
   var id_this = document.getElementById('_|_hide_tbody_'+t);
@@ -574,7 +579,7 @@ function Small_tab(t,re_load)
     id.style.display = 'none';
     id_this.innerHTML = '>';
   }
-  else 
+  else
   {
     id.style.display = '';
     id_this.innerHTML = 'v';
@@ -592,7 +597,7 @@ function Select_tab(t)
   //----------
   var id_t    = document.getElementById(t);
   window.scrollTo( parseInt(id_t.style.left)-300, parseInt(id_t.style.top)-300 );
-  
+
   setTimeout(function(){document.getElementById('_|_zag_'+t).className = 'tab_zag';},800);
 }
 //-----------------------------------------------------------------------------------------------------------------
@@ -607,8 +612,8 @@ function Canvas_click(id)
     for (key in contr[K])
       for (key2 in contr[K][key])
         for (key3 in contr[K][key][key2])
-        { 
-          if(!document.getElementById("check_vis_"+key2).checked || 
+        {
+          if(!document.getElementById("check_vis_"+key2).checked ||
              !document.getElementById("check_vis_"+contr[K][key][key2][key3][0]).checked) continue; // if hide
           var x1_left  = document.getElementById(key2).offsetLeft + 1;//document.getElementById(key2+"."+key3).offsetLeft;
           var x1_right = x1_left + document.getElementById(key2).offsetWidth;
@@ -623,20 +628,20 @@ function Canvas_click(id)
           if(n==2){ x1 = x1_right+sm_s; x2 = x2_left-sm_s;  if(x1>x2)n=0;}
           if(n==3){ x1 = x1_right+sm_s; x2 = x2_right+sm_s; s_right = 1; }
           if(n==0){ x1 = x1_left-sm_s;  x2 = x2_left-sm_s;  s_left  = 1; }
-     
+
           var y1 = document.getElementById(key2).offsetTop + document.getElementById(key2+"."+key3).offsetTop + height_field;
-          var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop + 
+          var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
                    document.getElementById(contr[K][key][key2][key3][0]+"."+contr[K][key][key2][key3][1]).offsetTop + height_field;
           if( !selected && Glob_X > x1-10 && Glob_X < x1+10 && Glob_Y > y1-7 && Glob_Y < y1+7)
           {
-            Line0(x1-sm_x,y1-sm_y,x2-sm_x,y2-sm_y,"rgba(255,0,0,1)"); 
-            selected = 1; // Rect(x1-sm_x,y1-sm_y,10,10,"rgba(0,255,0,1)"); 
-            relation_name = key; // 
-            Key0=contr[K][key][key2][key3][0]; Key1=contr[K][key][key2][key3][1]; 
+            Line0(x1-sm_x,y1-sm_y,x2-sm_x,y2-sm_y,"rgba(255,0,0,1)");
+            selected = 1; // Rect(x1-sm_x,y1-sm_y,10,10,"rgba(0,255,0,1)");
+            relation_name = key; //
+            Key0=contr[K][key][key2][key3][0]; Key1=contr[K][key][key2][key3][1];
             Key2 = key2; Key3 = key3;
             Key = K;
-          } 
-          else    
+          }
+          else
           Line0(x1-sm_x,y1-sm_y,x2-sm_x,y2-sm_y,"rgba(0,100,150,1)");
         }
   if( selected )  // select relations
@@ -668,11 +673,11 @@ function Hide_tab_all(id_this) // max/min all tables
   if(id_this.alt == 'v') { id_this.alt='>';id_this.src="pmd/images/rightarrow1.png"; }
   else { id_this.alt='v';id_this.src="pmd/images/downarrow1.png"; }
   var E = document.form1;
-  for (i=0;i<E.elements.length;i++) 
+  for (i=0;i<E.elements.length;i++)
     if(E.elements[i].type=="checkbox" && E.elements[i].id.substring( 0 , 10) == 'check_vis_')
     {
-      if(id_this.alt == 'v') { E.elements[i].checked = true; document.getElementById(E.elements[i].value).style.visibility = 'visible';}       
-      else { E.elements[i].checked = false; document.getElementById(E.elements[i].value).style.visibility = 'hidden';} 
+      if(id_this.alt == 'v') { E.elements[i].checked = true; document.getElementById(E.elements[i].value).style.visibility = 'visible';}
+      else { E.elements[i].checked = false; document.getElementById(E.elements[i].value).style.visibility = 'hidden';}
     }
   Re_load();
 }
@@ -685,39 +690,39 @@ function in_array_k(x,m)
   return b;
 }
 
-function No_have_constr(id_this) 
+function No_have_constr(id_this)
 {
   var a = new Array();
-  for (K in contr) 
+  for (K in contr)
     for (key in contr[K])                 // contr name
       for (key2 in contr[K][key])         // table name
         for (key3 in contr[K][key][key2]) // field name
         a[key2]=a[contr[K][key][key2][key3][0]]=1; // exist constr
- 
- 
-        
+
+
+
   if(id_this.alt == 'v') { id_this.alt='>';id_this.src="pmd/images/rightarrow2.png"; }
   else { id_this.alt='v';id_this.src="pmd/images/downarrow2.png"; }
   var E = document.form1;
-  for (i=0;i<E.elements.length;i++) 
+  for (i=0;i<E.elements.length;i++)
     if(E.elements[i].type=="checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_')
     {
       if(!in_array_k(E.elements[i].value,a))
-      if(id_this.alt == 'v') 
-           { E.elements[i].checked = true; document.getElementById(E.elements[i].value).style.visibility = 'visible';}       
-      else { E.elements[i].checked = false; document.getElementById(E.elements[i].value).style.visibility = 'hidden';} 
+      if(id_this.alt == 'v')
+           { E.elements[i].checked = true; document.getElementById(E.elements[i].value).style.visibility = 'visible';}
+      else { E.elements[i].checked = false; document.getElementById(E.elements[i].value).style.visibility = 'hidden';}
     }
 }
 
 function Help()
 {
- var WinHelp = 
+ var WinHelp =
  window.open("pmd_help.php","wind1", "top=200,left=400,width=300,height=200,resizable=yes,scrollbars=yes,menubar=no");
 }
 
 function PDF_save()
 {
-  // var WinPDF = 
+  // var WinPDF =
   // window.open("pmd_pdf.php?token="+token+"&db="+db,"wind1", "top=200,left=200,width=200,height=100,resizable=yes,scrollbars=yes,menubar=no");
  Save('pmd_pdf.php?token='+token+'&db='+db);
 }
@@ -737,7 +742,7 @@ function General_scroll()
   timeoutID = setTimeout
   (
     function()
-    {  
+    {
       document.getElementById('top_menu').style.left = document.body.scrollLeft;
       document.getElementById('top_menu').style.top  = document.body.scrollTop;
       document.getElementById('layer_menu').style.left = document.body.scrollLeft;
@@ -745,11 +750,11 @@ function General_scroll()
     }
     ,200
   );
-} 
+}
 
 /*
 function General_scroll_end()
-{ 
+{
 //  document.getElementById('layer_menu').style.left = document.body.scrollLeft;
 //  document.getElementById('layer_menu').style.top  = document.body.scrollTop + document.getElementById('top_menu').offsetHeight;
   //if(isIE)
@@ -772,7 +777,7 @@ function Show_left_menu(id_this) // max/min all tables
     if(isIE) General_scroll();
   }
   else
-  {  
+  {
     document.getElementById("layer_menu").style.top = -1000; //fast scroll
     document.getElementById("layer_menu").style.visibility = 'hidden';
     id_this.alt = "v";
@@ -781,7 +786,7 @@ function Show_left_menu(id_this) // max/min all tables
 }
 //----------------------------------------------------------------------------------------
 function Top_menu_right(id_this)
-{ 
+{
   if(id_this.alt==">")
   {
     document.getElementById('top_menu').style.marginLeft = document.getElementById('top_menu').offsetWidth; // = 350
@@ -789,11 +794,11 @@ function Top_menu_right(id_this)
     id_this.src="pmd/images/2leftarrow_m.png";
   }
   else
-  {  
+  {
     document.getElementById('top_menu').style.marginLeft = 0;
     id_this.alt = ">";
     id_this.src="pmd/images/2rightarrow_m.png";
-  } 
+  }
 }
 //----------------------------------------------------------------------------------------
 function Start_display_field()
@@ -815,6 +820,6 @@ function Start_display_field()
     document.getElementById('hint').innerHTML = "";
     document.getElementById('hint').style.visibility = "hidden";
     document.getElementById('display_field_button').className = 'M_butt';
-    ON_display_field = 0;  
+    ON_display_field = 0;
   }
 }
diff --git a/pmd_common.php b/pmd_common.php
index dcdfe27d143f..d11f15d2f97e 100644
--- a/pmd_common.php
+++ b/pmd_common.php
@@ -1,11 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/*
-@author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
-*/
-
+/**
+ * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 // not understand
 require_once './libraries/header_http.inc.php';
diff --git a/pmd_display_field.php b/pmd_display_field.php
index bb46fa909a8a..ffbb34654735 100644
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -1,11 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/*
-@author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
-*/
-
+/**
+ * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 include_once 'pmd_common.php';
 require_once './libraries/relation.lib.php';
 
diff --git a/pmd_general.php b/pmd_general.php
index d951bb598f7b..57b6df58cff5 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -1,10 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
+ * @version $Id$
+ */
 
-/*
-@author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
-*/
+/**
+ *
+ */
 include_once "./pmd_common.php";
 
 $tab_column       = get_tab_info();
diff --git a/pmd_help.php b/pmd_help.php
index 1ba945c2176d..3fa35ee40d37 100644
--- a/pmd_help.php
+++ b/pmd_help.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once 'pmd_common.php';
 ?>
 <html>
diff --git a/pmd_pdf.php b/pmd_pdf.php
index e3d966415b8b..c43abf097d94 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 include_once 'pmd_common.php';
 if ( ! isset($scale)) {
     $no_die_save_pos = 1;
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index 9ac32f0e3409..6530715ee237 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 include_once 'pmd_common.php';
 $die_save_pos = 0;
 include_once 'pmd_save_pos.php';
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index f35b66f91534..d332b4186337 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 include_once 'pmd_common.php';
 require_once './libraries/relation.lib.php';
 extract($_POST);
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index a7c14b108988..584fd4f44c65 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 include_once 'pmd_common.php';
 require_once './libraries/relation.lib.php';
 
diff --git a/readme.php b/readme.php
index 72cd78ad4dc5..34fecce0ebd1 100644
--- a/readme.php
+++ b/readme.php
@@ -1,10 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-// Simple script to set correct charset for the readme
-//
-// Note: please do not fold this script into a general script
-// that would read any file using a GET parameter, it would open a hole
+/**
+ * Simple script to set correct charset for the readme
+ *
+ * Note: please do not fold this script into a general script
+ * that would read any file using a GET parameter, it would open a hole
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 header('Content-type: text/plain; charset=utf-8');
 readfile('README');
 ?>
diff --git a/scripts/check_lang.php b/scripts/check_lang.php
index 9ff666cb9189..1d50cc1f0ada 100644
--- a/scripts/check_lang.php
+++ b/scripts/check_lang.php
@@ -1,11 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * This test script checks all the language files to ensure there is no errors
  * inside and nothing is displayed on screen (eg no extra no blank line).
+ *
+ * @version $Id$
+ */
+
+/**
+ *
  */
 $failed = array();
 $passed = array();
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index 6ce9a0709721..a4a9f69ca41d 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -1,8 +1,5 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-
 /**
  * Parser BUG decoder
  *
@@ -10,9 +7,10 @@
  * Throw the bug data in teh query box, and hit submit for output.
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
+ *
+ * @version $Id$
  */
 
-
 /**
  * Displays the form
  */
diff --git a/scripts/signon.php b/scripts/signon.php
index 2231b627c8c7..da6bf0607c3d 100644
--- a/scripts/signon.php
+++ b/scripts/signon.php
@@ -1,12 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-// Single signon for phpMyAdmin
-//
-// This is just example how to use single signon with phpMyAdmin, it is
-// not intended to be perfect code and look, only shows how you can
-// integrate this functionality in your application.
+/**
+ * Single signon for phpMyAdmin
+ *
+ * This is just example how to use single signon with phpMyAdmin, it is
+ * not intended to be perfect code and look, only shows how you can
+ * integrate this functionality in your application.
+ *
+ * @version $Id$
+ */
 
 /* Was data posted? */
 if (isset($_POST['user'])) {
@@ -28,7 +30,7 @@
     /* Show simple form */
     header('Content-Type: text/html; charset=utf-8');
     echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
-?>
+    ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
diff --git a/server_collations.php b/server_collations.php
index 1f2812b75008..31000c6d6a43 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * requirements
diff --git a/server_databases.php b/server_databases.php
index d138977a49b3..f5fc38f3738e 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Does the common work
diff --git a/server_engines.php b/server_engines.php
index 0eedac364a71..19eb7b39629c 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -1,10 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * display list of server enignes and additonal information about them
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
     define( 'PMA_NO_VARIABLES_IMPORT', true );
 }
diff --git a/server_export.php b/server_export.php
index 1544e0eb8732..94e36b280743 100644
--- a/server_export.php
+++ b/server_export.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Does the common work
diff --git a/server_import.php b/server_import.php
index 80dc64610800..ec490b8ca6ae 100644
--- a/server_import.php
+++ b/server_import.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index 3cd6a58389b4..9bf4fe75d535 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/server_processlist.php b/server_processlist.php
index c2ba23b6d9bf..86ef87ac1fd2 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/server_sql.php b/server_sql.php
index 7ac4c2b47926..3188e61a02f2 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/server_status.php b/server_status.php
index d373226d515f..d635b659fec8 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * displays status variables with descriptions and some hints an optmizing
  *  + reset status variables
+ *
+ * @version $Id$
+ */
+
+/**
+ *
  */
 if (! defined('PMA_NO_VARIABLES_IMPORT')) {
     define('PMA_NO_VARIABLES_IMPORT', true);
diff --git a/server_variables.php b/server_variables.php
index 4e46d6f16c4c..de947a23657a 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
     define( 'PMA_NO_VARIABLES_IMPORT', true );
 }
diff --git a/show_config_errors.php b/show_config_errors.php
index a00cf84b1869..7b13c812a450 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -1,9 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
-/* Simple wrapper just to enable error reporting and include config */
+/**
+ * Simple wrapper just to enable error reporting and include config
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 echo "Starting to parse config file...\n";
 
 error_reporting(E_ALL);
diff --git a/sql.php b/sql.php
index f81830d6408e..deca316fafb8 100644
--- a/sql.php
+++ b/sql.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
 /**
  * @todo    we must handle the case if sql.php is called directly with a query
  *          what returns 0 rows - to prevent cyclic redirects or includes
+ * @version $Id$
  */
 
 /**
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 54673379a5ab..5812748ec25c 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Get some core libraries
diff --git a/tbl_alter.php b/tbl_alter.php
index e24d87f528ae..3ab01bedcb6b 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/tbl_export.php b/tbl_export.php
index c24dcb6c9a5a..963fe216b6bb 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/tbl_import.php b/tbl_import.php
index 8d4dbade3b6a..67f3bda86157 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index c442d970467c..93f8bf39526c 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/tbl_operations.php b/tbl_operations.php
index 3ac5554c3a2f..6673caf5ea83 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 require_once './libraries/Table.class.php';
 
diff --git a/tbl_printview.php b/tbl_printview.php
index 249124ae56fd..066ac80da164 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 
 require './libraries/tbl_common.php';
diff --git a/tbl_relation.php b/tbl_relation.php
index a450768d2dd4..20baa6ff2fa2 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/tbl_row_action.php b/tbl_row_action.php
index bcdcc9e244de..60ba6f4195a4 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -1,6 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 require_once('./libraries/mysql_charsets.lib.php');
 
diff --git a/tbl_select.php b/tbl_select.php
index dafec85b0e6f..43a26fea16e6 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/tbl_sql.php b/tbl_sql.php
index fa76ae2300a7..a3a9fd8dadc9 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once('./libraries/common.lib.php');
 
 /**
diff --git a/tbl_structure.php b/tbl_structure.php
index ea0db4ca5ac9..eb94e362c64d 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 require_once './libraries/mysql_charsets.lib.php';
 require_once './libraries/relation.lib.php';
diff --git a/test/AllTests.php b/test/AllTests.php
index 5ee7e01fc1a4..539b595b0945 100644
--- a/test/AllTests.php
+++ b/test/AllTests.php
@@ -3,6 +3,7 @@
 /**
  * runs all defined tests
  *
+ * @version $Id$
  */
 
 /**
diff --git a/themes.php b/themes.php
index db3c47a290ff..6d55e3d6ad7b 100644
--- a/themes.php
+++ b/themes.php
@@ -1,6 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* get some globals */
+/**
+ *
+ * @version $Id$
+ */
+
+/**
+ * get some globals
+ */
 require_once('./libraries/common.lib.php');
 
 /* Theme Select */
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index ecf8efb07d2c..7cb056d5ce50 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1,9 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-    // unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
-    }
+/**
+ * main css file from theme Darkblue Orange
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Orange
+ */
+
+// unplanned execution path
+if (!defined('PMA_MINIMUM_COMMON')) {
+    exit();
+}
 ?>
 /******************************************************************************/
 /* general tags */
diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php
index eeaf8b7cd445..648978350c2e 100644
--- a/themes/darkblue_orange/info.inc.php
+++ b/themes/darkblue_orange/info.inc.php
@@ -1,7 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-/* Theme information */
+/**
+ * Theme information
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 $theme_name = 'Darkblue/orange';
 $theme_full_version = '2.9';
 ?>
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
index b8d0afff2321..f774ed494728 100644
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -3,6 +3,10 @@
 /**
  * configures general layout
  * for detailed layout configuration please refer to the css files
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Darkblue Orange
  */
 
 /**
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 9cf63ef897bb..a4a56ebd02ff 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -1,5 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * navigation css file from theme Original
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original
+ */
+
 // unplanned execution path
 if (!defined('PMA_MINIMUM_COMMON')) {
     exit();
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index d497423ba6b0..148199ce11d4 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1,9 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-    // unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
-    }
+/**
+ * main css file from theme Original
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original
+ */
+
+// unplanned execution path
+if (!defined('PMA_MINIMUM_COMMON')) {
+    exit();
+}
 ?>
 /******************************************************************************/
 /* general tags */
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
index 9f8d25c18a99..794bb5ba420b 100644
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -1,7 +1,14 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-/* Theme information */
+/**
+ * Theme information
+ *
+ * @version $Id$
+ */
+
+/**
+ *
+ */
 $theme_name = 'Original';
 $theme_full_version = '2.9';
 ?>
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index b7d1718596a8..93a6f6a09b36 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -3,6 +3,10 @@
 /**
  * configures general layout
  * for detailed layout configuration please refer to the css files
+ *
+ * @version $Id$
+ * @package phpMyAdmin-theme
+ * @subpackage Original
  */
 
 /**
diff --git a/transformation_overview.php b/transformation_overview.php
index 3e076ffd2228..ceac9b745c06 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -1,6 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Don't display the page heading
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 4886722d5af4..f53dc94910c6 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 define('IS_TRANSFORMATION_WRAPPER', true);
 
 /**
diff --git a/user_password.php b/user_password.php
index 54e0a6b897db..685f254b6ff8 100644
--- a/user_password.php
+++ b/user_password.php
@@ -1,7 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
-
+/**
+ *
+ * @version $Id$
+ */
 
 /**
  * Gets some core libraries
diff --git a/view_create.php b/view_create.php
index 073683a78fd9..88bbb8efb032 100644
--- a/view_create.php
+++ b/view_create.php
@@ -1,7 +1,13 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id$ */
+/**
+ *
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 require_once './libraries/common.lib.php';
 
 /**