Update from 1.2.6 to latest development version 2.0.0rc4 after repocopy.

Add CONFLICTS.
Add the note in UPDATING about configuration file changes.

1 files changed, 10 insertions, 0 deletions

diff --git a/UPDATING b/UPDATING
index ce5630dcd2ea..b6baa1862d8e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100815:
+  AFFECTS: users of databases/redis and databases/redis-devel
+  AUTHOR: osa@FreeBSD.org
+
+  The redis configuration file, redis.conf, have been changed, some options
+  removed in newer versions (>=2.0).  In some cases, redis-server with 
+  older configuration might does not run at startup.
+
+  If you run into startup problems, re-edit configuration file.
+
 20100813:
   AFFECTS: www/opera
   AUTHOR: dinoex@