# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-11-13 14:57:40
# Node ID df7c2f81afd534dd3f7b37ce6f584e0c5fc0b412
# Parent  733345a127ca135d3f60db4232b696a3498586a0
# Parent  20974e51383ae93bb7cdf3ee3c649e68e397d59f

merge with stable

diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -66,6 +66,11 @@ like the deprecated win32text extension 
 disable win32text and enable eol and your filters will still work. You
 only need to these filters until you have prepared a ``.hgeol`` file.
 
+The ``win32text.forbid*`` hooks provided by the win32text extension
+have been unified into a single hook named ``eol.hook``. The hook will
+lookup the expected line endings from the ``.hgeol`` file, which means
+you must migrate to a ``.hgeol`` file first before using the hook.
+
 See :hg:`help patterns` for more information about the glob patterns
 used.
 """