# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1284142756 -7200
# Node ID 97e37994a6c365cd84b5430275e54343307d7031
# Parent  844d25bf65a33f80d8c6884126e81ed178b40fdd# Parent  0f61648062836dfc76f9a3cf7a7c4ea8dc9cad8f
merge with stable

diff -r 844d25bf65a3 -r 97e37994a6c3 hgext/keyword.py
--- a/hgext/keyword.py	Fri Sep 10 19:41:45 2010 +0200
+++ b/hgext/keyword.py	Fri Sep 10 20:19:16 2010 +0200
@@ -35,6 +35,9 @@
 change history. The mechanism can be regarded as a convenience for the
 current user or for archive distribution.
 
+Keywords expand to the changeset data pertaining to the latest change
+relative to the working directory parent of each file.
+
 Configuration is done in the [keyword], [keywordset] and [keywordmaps]
 sections of hgrc files.