summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-05-20 16:45:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-05-20 16:45:41 +0200
commit1bac66db05ecbc078d009c40fcb40093cc7b0bc8 (patch)
tree96c9ac41d9823d2b62a5502ef432a0b3e6bc25e8 /ChangeLog
parent1ab2bb26d20eaffc36999cb2bb1d7c9be3994c56 (diff)
parentfcb747c57d2b8beacade7194f99fa1de8fb0a4fb (diff)
downloadrsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.gz
rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.xz
rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.zip
Merge branch 'v4-stable' into v4-devel
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d6f74e4..13d3bc81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,8 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-04-??
all 32-bit platforms
- bugfix: local unix system log socket was deleted even when it was
not configured
+- some doc fixes; incorrect config samples could cause confusion
+ thanks to Anthony Edwards for pointing the problems out
---------------------------------------------------------------------------
Version 4.6.2 [v4-stable] (rgerhards), 2010-03-26
- new feature: "." action type added to support writing files to relative