diff --git a/CREDITS b/CREDITS
index f692046d6..71cc78dca 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,3 @@
-$Id$
-
-
phpMyAdmin - Credits
====================
diff --git a/ChangeLog b/ChangeLog
index 213f95456..58e2f8a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@
phpMyAdmin - ChangeLog
----------------------
-$Id$
-
3.4.0.0 (not yet released)
+ rfe #2890226 [view] Enable VIEW rename
+ rfe #838637 [privileges] Export a user's privileges
@@ -317,5 +315,5 @@ $Id$
# vim: et ts=4 sw=4 sts=4
# vim: ft=changelog fenc=utf-8 encoding=utf-8
-# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>6&&getline(v\:lnum)!~'^#'
+# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>4&&getline(v\:lnum)!~'^#'
# vim: fdn=1 fdm=expr
diff --git a/Documentation.html b/Documentation.html
index ec8412ff9..5b75982d4 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -5,7 +5,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
-->
-
@@ -53,9 +52,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
License: LICENSE
- Documentation version:
- $Id$
-
diff --git a/INSTALL b/INSTALL
index 29bc6de01..56c8948f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Installation
-------------------------
diff --git a/README b/README
index 2bc2d1a88..4e95e3476 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Readme
===================
diff --git a/TODO b/TODO
index 503e02916..7e9652761 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Todo
=================
diff --git a/contrib/README b/contrib/README
index 35be9bcac..6e2c9e13a 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,5 +1,3 @@
-$Id$
-
This directory contains various stuff contributed by users that might be
useful to other. There is no guarantee it will work for you.
diff --git a/docs.css b/docs.css
index e9defb718..1d0f08de0 100644
--- a/docs.css
+++ b/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
/* Stylesheet for phpMyAdmin documentation */
/* vim: expandtab ts=4 sw=4 sts=4 tw=78
*/
diff --git a/js/common.js b/js/common.js
index f0eea2548..9a690c6a9 100644
--- a/js/common.js
+++ b/js/common.js
@@ -2,7 +2,6 @@
/**
* common functions used for communicating between main, navigation and querywindow
*
- * @version $Id$
*/
/**
diff --git a/js/db_operations.js b/js/db_operations.js
index 8bdeea2c3..a1355328f 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -7,7 +7,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/export.js b/js/export.js
index 8f5cba563..1cf9de50b 100644
--- a/js/export.js
+++ b/js/export.js
@@ -2,7 +2,6 @@
/**
* Functions used in the export tab
*
- * @version $Id$
*/
/**
diff --git a/js/functions.js b/js/functions.js
index f19344e74..6efa1e045 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2,7 +2,6 @@
/**
* general function, usally for data manipulation pages
*
- * @version $Id$
*/
/**
diff --git a/js/import.js b/js/import.js
index be7938886..0bcc3d010 100644
--- a/js/import.js
+++ b/js/import.js
@@ -2,7 +2,6 @@
/**
* Functions used in the import tab
*
- * @version $Id$
*/
diff --git a/js/indexes.js b/js/indexes.js
index 3a170bf4e..b97fcd2fd 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -2,7 +2,6 @@
/**
* function used for index manipulation pages
*
- * @version $Id$
*/
/**
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 4ecfea00f..a3c63853d 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -7,7 +7,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/sql.js b/js/sql.js
index ee66044fc..126784d64 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -5,7 +5,6 @@
* @requires jQuery
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 3ef28cb02..4a4e444ff 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -6,7 +6,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
index c74cc60c0..6f5aa97cf 100644
--- a/js/tbl_operations.js
+++ b/js/tbl_operations.js
@@ -2,7 +2,6 @@
/**
* function used in server privilege pages
*
- * @version $Id$
*/
/**
diff --git a/js/update-location.js b/js/update-location.js
index b8b001dfd..d271cc82e 100644
--- a/js/update-location.js
+++ b/js/update-location.js
@@ -3,7 +3,6 @@
* Scripts to update location to allow bookmarking of frameset
* and restoring the bookmark once the page is loaded.
*
- * @version $Id$
*/
var hash_to_set = "";
diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php
index 2a51c92d4..58e31592b 100644
--- a/libraries/engines/pbms.lib.php
+++ b/libraries/engines/pbms.lib.php
@@ -1,7 +1,6 @@
UNIX conversions
#
diff --git a/scripts/upgrade.pl b/scripts/upgrade.pl
index c9e625e16..7f142940b 100755
--- a/scripts/upgrade.pl
+++ b/scripts/upgrade.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# $Id$
#
# upgrade.pl - automatic phpmyadmin upgrader
#
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
index 1ff470e30..905bd68f4 100644
--- a/scripts/upgrade_tables_mysql_4_1_2+.sql
+++ b/scripts/upgrade_tables_mysql_4_1_2+.sql
@@ -10,7 +10,6 @@
--
-- Please don't forget to set up the tablenames in config.inc.php
--
--- $Id$
-- --------------------------------------------------------
diff --git a/tbl_chart.php b/tbl_chart.php
index 0e9ed4049..f4b8bd3ad 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -3,7 +3,6 @@
/**
* handles creation of the chart
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/translators.html b/translators.html
index 2cf922797..537824c6f 100644
--- a/translators.html
+++ b/translators.html
@@ -2,7 +2,6 @@
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-