1.1 --- a/docs/annotations.txt Wed Feb 29 00:39:20 2012 +0100
1.2 +++ b/docs/annotations.txt Mon Mar 05 00:25:11 2012 +0100
1.3 @@ -12,8 +12,13 @@
1.4 _attrcombined defines a dictionary mapping local names to sets of
1.5 attribute names found to be used with those names for the
1.6 entire lifetime of a particular attribute user
1.7 -_attrtypes defines types deduced from the combined attribute usage
1.8 - details
1.9 +_attrmerged defines a dictionary mapping local names to sets of
1.10 + attribute names merging combined observations with locally
1.11 + applicable observations, indicating usage specific to a
1.12 + region of the code
1.13 +_attrtypes defines types deduced either from combined attribute usage
1.14 + details (for users) or from merged attribute usage details
1.15 + (for other nodes)
1.16 _attrdefs defines definition-related users which consume usage details
1.17 from the node
1.18