From 52a5f8156eff37ef65d6cd9816f1d87f15384989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 2 Nov 2005 19:05:42 +0000
Subject: [PATCH] This is not a configuration file.

---
 ChangeLog          | 3 +++
 config.default.php | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 91b10e85b..3ab4dbae4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-02 Michal Čihař  <michal@cihar.com>
+    * config.default.php: This is not a configuration file.
+
 2005-11-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/dbg/setup.php:
       - display error in error box
diff --git a/config.default.php b/config.default.php
index 759fcaf0b..90c1b0a5e 100644
--- a/config.default.php
+++ b/config.default.php
@@ -1,9 +1,13 @@
 <?php
+
+/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
 /**
- * phpMyAdmin Configuration File
+ * phpMyAdmin default configuration, you can copy values from here to your
+ * config.inc.php
  *
  * All directives are explained in Documentation.html
  */