correct change log to match code modifications.

30e2c323 · Chris Withers · b2ea75a2 · 30e2c323
Commit 30e2c323 authored Dec 02, 2005 by Chris Withers
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

doc/CHANGES.txt doc/CHANGES.txt +6 -5

No files found.
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -28,11 +28,12 @@ Zope Changes
      - Using FastCGI is offically deprecated.
-      - Improved logging of ConflictErrors. Now a log is made at level
+      - Improved logging of ConflictErrors. All conflict errors are
-        BLATHER with traceback for any conflict retried. In addition, a
+        logged at INFO, with counts of how many occurred and how many
-        log is made at level ERROR for a conflict that can't be retried
+        were resolved. Tracebacks for all conflicts are logged a DEBUG
-        anymore and is returned to the browser as an error. Nothing is
+        level, although these won't help anyone much. If a conflict
-        logged anymore at level INFO.
+        error is unresolved, it will now bubble up to error_log and
+        standard_error_message.
      - Use new-style security declarations everywhere possible. This
        means remove the use of __ac_permissions__, foo__roles__ and