[Zope3-checkins] CVS: Zope3/src/zope/proxy/context - decorators.txt:1.1.2.9

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/proxy/context
In directory cvs.zope.org:/tmp/cvs-serv16642

Modified Files:
      Tag: stevea-decorators-branch
	decorators.txt 
Log Message:
Clarified the terms in the "defining terms" section.


=== Zope3/src/zope/proxy/context/decorators.txt 1.1.2.8 => 1.1.2.9 ===
--- Zope3/src/zope/proxy/context/decorators.txt:1.1.2.8	Mon May 19 08:29:31 2003
+++ Zope3/src/zope/proxy/context/decorators.txt	Mon May 19 09:52:02 2003
@@ -49,22 +49,27 @@
 Defining terms
 ==============
 
+In general:
+
   Context-dependent code
   Context-dependent functionality  Code that performs the appropriate wrapping
                                    and unwrapping
 
-  inner                            The object that a decorator is wrapping
+  mixin object                     The object that is providing decorations
 
-  outer                            The context wrapper of the decorator
+  mixin factory                    The callable that creates a mixin object
 
   inner object                     Unambiguous term for "decorated object"
                                    (Not to be confused with 'inner context',
                                     which is a term used when talking about
                                     nested wrappers.)
 
-  mixin object                     The object that is providing decorations
+A mixin factory is called with the two arguments 'inner' and 'outer': 
+
+  inner                            The object that a decorator is wrapping
+
+  outer                            The context wrapper of the decorator
 
-  mixin factory                    The callable that creates a mixin object
 
 Diagram
 =======