--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/12/30 08:27:49	1.22
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/12/30 13:25:34	1.24
@@ -43,7 +43,7 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/12/30 08:27:49 $
+    $Date: 2006/12/30 13:25:34 $
 
   @Require:
     @@Module:
@@ -449,7 +449,7 @@
 
 ResourceDef:
   @QName: boolean
-  @AliasFor: idl|boolean||ManakaiDOM|all
+  @AliasFor: idl|boolean
 
 ResourceDef:
   @QName: Node
@@ -487,7 +487,7 @@
     @@Value:
       @@@@: 1
       @@@ContentType: DISCore|Boolean
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ElementTypeBinding:
   @Name: FalseCase
@@ -499,7 +499,7 @@
     @@Value:
       @@@@: 0
       @@@ContentType: DISCore|Boolean
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ## -- Features
 
@@ -509,7 +509,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: f|Feature
-    @@For: =ManakaiDOM|all
 
 ElementTypeBinding:
   @Name: FeatureVerDef
@@ -530,7 +529,7 @@
   @QName: AtomFeature
   @FeatureVerDef:
     @@QName: AtomFeature10
-    @@Version: 1.0
+    @@f:version: 1.0
     @@f:instanceOf: AtomFeature
     @@f:requires: tx|XMLFeature30
     @@enDesc:
@@ -541,7 +540,7 @@
   @QName: AtomThreadingFeature
   @FeatureVerDef:
     @@QName: AtomThreadingFeature10
-    @@Version: 1.0
+    @@f:version: 1.0
     @@f:instanceOf: AtomThreadingFeature
     @@f:requires: fe|AtomFeature10
     @@enDesc:
@@ -682,7 +681,6 @@
     The <IF::AtomImplementation> interface provides convenience
     methods to create Atom documents.
 
-  @f:provides: AtomFeature10
   @f:implements: AtomFeature10
 
   @Test:
@@ -1653,7 +1651,7 @@
 STCDef:
   @QName: atomUriCM
   @mv:elementContentModelName: URI
-  @cm: (dxm|PCDATA||ManakaiDOM|all)*
+  @cm: (dxm|PCDATA)*
 
 STDef:
   @QName: atomEmailAddress
@@ -1663,7 +1661,7 @@
 STCDef:
   @QName: atomEmailAddressCM
   @mv:elementContentModelName: EmailAddress
-  @cm: (dxm|PCDATA||ManakaiDOM|all)*
+  @cm: (dxm|PCDATA)*
 
 ElementTypeBinding:
   @Name: AGDef
@@ -1715,7 +1713,7 @@
   @ClsISA: te|ManakaiDOMElement
    
   @f:implements: AtomFeature10
-  @s:elementType: AnyAtomElement||ManakaiDOM|all
+  @s:elementType: AnyAtomElement
 
   @enDesc:
     The <IF::AtomElement> interface provides convenience
@@ -1787,12 +1785,12 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    dxm|ANY||ManakaiDOM|all
+    dxm|ANY
   @enImplNote:
     @@ddid:cm
     @@@:
       {TODO::
-        (dxm|PCDATA||ManakaiDOM|all | html|div)*
+        (dxm|PCDATA | html|div)*
       }
 
   @enDesc:
@@ -2086,7 +2084,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    (dxm|PCDATA||ManakaiDOM|all)*
+    (dxm|PCDATA)*
   @enImplNote:
     @@ddid: cm
     @@@:
@@ -3549,7 +3547,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    dxm|ANY||ManakaiDOM|all
+    dxm|ANY
 
   @enDesc:
     The <XE::atom|content> element either contains or links to
@@ -3960,7 +3958,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    (dxm|PCDATA||ManakaiDOM|all)*
+    (dxm|PCDATA)*
 
   @enDesc:
     The <XE::atom|generator> element identifies the agent used
@@ -4816,8 +4814,7 @@
       @@@@: c|DOMConfigurationParameter
     @@DISCore:resourceType:
       @@@@: DISCore|Property
-      @@@For: =ManakaiDOM|all
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ECDef:
   @QName: simpleExtensionElements
@@ -4844,7 +4841,7 @@
   @QName: undefinedContent
   @mv:elementContentModelName: undefined
   @DISCore:resourceType: mv|ElementContentModel
-  @cm: dxm|ANY||ManakaiDOM|all
+  @cm: dxm|ANY
   @enImplNote:
     (text | anyForeignElement)*
 
@@ -5167,7 +5164,7 @@
       as to the total number of replies contained by the
       linked resource.  The value is advisory and
       may not accurately reflect the actual number of replies.
-    @@Type: idl|long||ManakaiDOM|all
+    @@Type: idl|long
     @@Get:
       @@@PerlDef:
         __CODE{getReflectAttrNonNegativeIntegerValue::