[Zope3-checkins] SVN: Zope3/trunk/ - Fixed bug #707: "layer" directive was marked as deprecated in a confusing

[Christian Theune]

Log message for revision 71599:
  - Fixed bug #707: "layer" directive was marked as deprecated in a confusing
    way.
  

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/component/metadirectives.py

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2006-12-18 20:16:47 UTC (rev 71598)
+++ Zope3/trunk/doc/CHANGES.txt	2006-12-18 20:23:39 UTC (rev 71599)
@@ -148,6 +148,9 @@
         was removed back then already.)
 
     Bug fixes
+ 
+      - Fixed bug #707: "layer" directive was marked as deprecated in a
+        confusing way.
 
       - Fixed bug #728:  Able to change-dir into non-existant directories
         using FTP

Modified: Zope3/trunk/src/zope/app/component/metadirectives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metadirectives.py	2006-12-18 20:16:47 UTC (rev 71598)
+++ Zope3/trunk/src/zope/app/component/metadirectives.py	2006-12-18 20:23:39 UTC (rev 71599)
@@ -58,12 +58,9 @@
         required=False,
         )
 
-    # BBB 2006/02/18, to be removed after 12 months
     layer = LayerField(
         title=_("The layer the view is in."),
         description=_("""
-        *BBB: DEPRECATED*
-
         A skin is composed of layers. It is common to put skin
         specific views in a layer named after the skin. If the 'layer'
         attribute is not supplied, it defaults to 'default'."""),
@@ -205,11 +202,8 @@
                          IBasicResourceInformation):
     """Register a resource"""
 
-    # BBB 2006/02/18, to be removed after 12 months
     layer = LayerField(
-        title=_("The layer the resource is in.  This argument has been "
-                "deprecated and will be removed in Zope 3.5.  Use the "
-                "'type' argument instead."),
+        title=_("The layer the resource is in."),
         required=False,
         )