Fix diff issues with generated $Id strings

diff --git a/horde/config/spelling.php.dist b/horde/config/spelling.php.dist
index afc146f..70becd5 100644 (file)
--- a/horde/config/spelling.php.dist
+++ b/horde/config/spelling.php.dist
@@ -3,7 +3,7 @@
  * This file defines a custom list of words that will be added to the spell
  * checker dictionary.
  *
- * $Id: 70becd51e9f3d20b27c40624fbfb8bd530ec14b3 $
+ * $Id$
  */
 
 /* Default list (English). */

diff --git a/imp/config/conf.xml b/imp/config/conf.xml
index 294cbb0..904d193 100644 (file)
--- a/imp/config/conf.xml
+++ b/imp/config/conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: 904d193cdfa992f09000e524880456592a5f04ed $ -->
+<!-- $Id$ -->
 <configuration>
  <configtab name="user" desc="User Capabilities and Constraints">
   <configsection name="user">

diff --git a/imp/config/header.php.dist b/imp/config/header.php.dist
index 2e8f224..7bde6ec 100644 (file)
--- a/imp/config/header.php.dist
+++ b/imp/config/header.php.dist
@@ -6,7 +6,7 @@
  * KEY:   Header name (must be in US-ASCII charset))
  * VALUE: Header data (must be in US-ASCII charset)
  *
- * $Id: 7bde6ec9418e8c67fff71a87364c32eaa793b4a6 $
+ * $Id$
  */
 
 $_header = array(

diff --git a/imp/config/hooks.php.dist b/imp/config/hooks.php.dist
index 8704d96..d0db740 100644 (file)
--- a/imp/config/hooks.php.dist
+++ b/imp/config/hooks.php.dist
@@ -8,7 +8,7 @@
  *
  * For more information please see the horde/config/hooks.php.dist file.
  *
- * $Id: 0f30312eb8b8cd1d7b2492bdf28de323b4d5baae $
+ * $Id$
  */
 
 class IMP_Hooks

diff --git a/imp/config/menu.php.dist b/imp/config/menu.php.dist
index 3f332cd..f8b2f03 100644 (file)
--- a/imp/config/menu.php.dist
+++ b/imp/config/menu.php.dist
@@ -35,7 +35,7 @@
  *
  *  $_menu[] = 'separator';
  *
- * $Id: f8b2f030625f918d7a37c72ad57cf76dc9087652 $
+ * $Id$
  */
 
 $_menu = array();

diff --git a/imp/config/mime_drivers.php.dist b/imp/config/mime_drivers.php.dist
index 4a0b01c..1b66dbe 100644 (file)
--- a/imp/config/mime_drivers.php.dist
+++ b/imp/config/mime_drivers.php.dist
@@ -13,7 +13,7 @@
  *   to download the part.  Don't set the parameter, or set to 0, to disable
  *   this check.
  *
- * $Id: 1b66dbe30b04c5f19e16595ac533b5dbd5ca284b $
+ * $Id$
  */
 
 /**

diff --git a/imp/config/portal.php.dist b/imp/config/portal.php.dist
index b0a6ce1..fc35863 100644 (file)
--- a/imp/config/portal.php.dist
+++ b/imp/config/portal.php.dist
@@ -15,7 +15,7 @@
  *            'tag' => A tag name to add to the template array. Allows
  *                     the use of <if:block.tag> in custom template files.
  *
- * $Id: fc35863e634219d65dde5db35d9d72310567741e $
+ * $Id$
  */
 
 $collection = new Horde_Block_Collection();

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 399ca0f..ad76550 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -2,7 +2,7 @@
 /**
  * See horde/config/prefs.php for documentation on the structure of this file.
  *
- * $Id: ad765501fddbc6c9735999dc7a6221c0c15aa80a $
+ * $Id$
  */
 
 // Make sure that constants are defined.

diff --git a/imp/config/servers.php.dist b/imp/config/servers.php.dist
index d7b35f2..d0ffbac 100644 (file)
--- a/imp/config/servers.php.dist
+++ b/imp/config/servers.php.dist
@@ -212,7 +212,7 @@
  * timeout: (integer) Set the server timeout (in seconds).
  *
  *
- * $Id: d0ffbac2cdec20ab3a7505dd643d4c8f2791b372 $
+ * $Id$
  */
 
 /* Any entries whose key value ('foo' in $servers['foo']) begin with '_'