--- a/microdata-namespace/ns.json	Tue Feb 28 22:21:21 2012 -0800
+++ b/microdata-namespace/ns.json	Tue Feb 28 22:43:52 2012 -0800
@@ -31,9 +31,5 @@
     "properties": {
       "categories": {"multipleValues": "list"}
     }
-  },
-  "http://n.whatwg.org/work": {
-    "propertyURI":    "contextual",
-    "multipleValues": "list"
   }
 }

--- a/microdata-namespace/ns.jsonld	Tue Feb 28 22:21:21 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-{
-  "@context": {
-    "@base": "http://www.w3.org/ns/md",
-    "hcalendar": "http://microformats.org/profile/hcalendar#",
-    "hcard": "http://microformats.org/profile/hcard",
-    "md": "http://www.w3.org/ns/md#",
-    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-    "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
-    "schema": "http://schema.org/",
-    "work": "http://n.whatwg.org/work",
-    "@coerce": {
-      "@iri": [
-        "rdfs:domain",
-        "rdfs:isDefinedBy",
-        "rdfs:range",
-        "rdfs:seeAlso",
-        "md:defaultRange"
-      ]
-    }
-  },
-  "@subject": [
-    {
-      "@subject": "hcalendar:",
-      "@type": {
-        "@subject": "md:RegistryEntry",
-        "@type": "rdfs:Class",
-        "rdfs:comment": {
-          "@literal": "A Registry Entry specifies processor behavior for property URI generation and value range.",
-          "@language": "en"
-        },
-        "rdfs:isDefinedBy": "md:",
-        "rdfs:label": {
-          "@literal": "Registry Entry",
-          "@language": "en"
-        },
-        "rdfs:seeAlso": "https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/"
-      },
-      "md:defaultRange": "rdfs:Resource",
-      "md:propertyURI": "vocabulary"
-    },
-    {
-      "@subject": "hcalendar:categories",
-      "@type": "rdfs:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "hcard:",
-      "@type": "md:RegistryEntry",
-      "md:defaultRange": "rdfs:Resource",
-      "md:propertyURI": "vocabulary"
-    },
-    {
-      "@subject": "work:",
-      "@type": "md:RegistryEntry",
-      "md:defaultRange": "rdf:List",
-      "md:propertyURI": "contextual"
-    },
-    {
-      "@subject": "schema:",
-      "@type": "md:RegistryEntry",
-      "md:defaultRange": "rdfs:Resource",
-      "md:propertyURI": "vocabulary"
-    },
-    {
-      "@subject": "schema:blogPosts",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:breadcrumb",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:byArtist",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:creator",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:episodes",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:events",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:founders",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:itemListElement",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:musicGroupMember",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:performerIn",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:performers",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:producer",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:recipeInstructions",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:seasons",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:subEvents",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "schema:tracks",
-      "@type": "rdf:Property",
-      "rdfs:range": "rdf:List"
-    },
-    {
-      "@subject": "md:defaultRange",
-      "@type": "rdfs:Property",
-      "rdfs:comment": {
-        "@literal": "\r\n    Specifies a default range for properties within a namespace.\r\n    Permissible values are rdfs:Resource and rdf:List.\r\n    A value of rdf:List is equivalent to specifying an rdfs:range of rdf:List for all properties not having\r\n    a range specification, for the purpose of transforming microdata to RDF.\r\n  ",
-        "@language": "en"
-      },
-      "rdfs:domain": "md:RegistryEntry",
-      "rdfs:isDefinedBy": "md:",
-      "rdfs:label": {
-        "@literal": "Default Range",
-        "@language": "en"
-      },
-      "rdfs:range": "rdfs:Class"
-    },
-    {
-      "@subject": "md:propertyURI",
-      "@type": "rdfs:Property",
-      "rdfs:comment": {
-        "@literal": "\r\n    Specifies the method to be used for creating a property URI from a non-absolute URI token.\r\n    Permissible values are \"vocabulary\" and \"contextual\".\r\n  ",
-        "@language": "en"
-      },
-      "rdfs:domain": "md:RegistryEntry",
-      "rdfs:isDefinedBy": "md:",
-      "rdfs:label": {
-        "@literal": "Property URI",
-        "@language": "en"
-      },
-      "rdfs:range": "rdfs:Literal"
-    }
-  ]
-}
\ No newline at end of file

--- a/microdata-namespace/ns.ttl	Tue Feb 28 22:21:21 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-# This defines the microdata namespace, including an RDFS definintion for a registry
-# and a registry definition. The registry is used in transforming microdata into RDF.
-#
-# The current Editor's Draft of microdata to RDF may be found at
-# https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/index.html
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix md: <http://www.w3.org/ns/md#> .
-@prefix schema: <http://schema.org/> .
-@prefix hcard: <http://microformats.org/profile/hcard> .
-@prefix hcalendar: <http://microformats.org/profile/hcalendar#> .
-@prefix work: <http://n.whatwg.org/work> .
-
-md:RegistryEntry a rdfs:Class;
-  rdfs:label "Registry Entry"@en;
-  rdfs:comment "A Registry Entry specifies processor behavior for property URI generation and value range."@en;
-  rdfs:seeAlso <https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/>;
-  rdfs:isDefinedBy md: .
-
-md:propertyURI a rdfs:Property;
-  rdfs:label "Property URI"@en;
-  rdfs:comment """
-    Specifies the method to be used for creating a property URI from a non-absolute URI token.
-    Permissible values are "vocabulary" and "contextual".
-  """@en;
-  rdfs:domain md:RegistryEntry;
-  rdfs:range rdfs:Literal;
-  rdfs:isDefinedBy md: .
-
-md:defaultRange a rdfs:Property;
-  rdfs:label "Default Range"@en;
-  rdfs:comment """
-    Specifies a default range for properties within a namespace.
-    Permissible values are rdfs:Resource and rdf:List.
-    A value of rdf:List is equivalent to specifying an rdfs:range of rdf:List for all properties not having
-    a range specification, for the purpose of transforming microdata to RDF.
-  """@en;
-  rdfs:domain md:RegistryEntry;
-  rdfs:range rdfs:Class;
-  rdfs:isDefinedBy md: .
-
-schema: a md:RegistryEntry;
-  md:propertyURI "vocabulary";
-  md:defaultRange rdfs:Resource .
-
-schema:blogPosts          a rdf:Property;  rdfs:range rdf:List; .
-schema:breadcrumb         a rdf:Property;  rdfs:range rdf:List; .
-schema:byArtist           a rdf:Property;  rdfs:range rdf:List; .
-schema:creator            a rdf:Property;  rdfs:range rdf:List; .
-schema:episodes           a rdf:Property;  rdfs:range rdf:List; .
-schema:events             a rdf:Property;  rdfs:range rdf:List; .
-schema:founders           a rdf:Property;  rdfs:range rdf:List; .
-schema:itemListElement    a rdf:Property;  rdfs:range rdf:List; .
-schema:musicGroupMember   a rdf:Property;  rdfs:range rdf:List; .
-schema:performerIn        a rdf:Property;  rdfs:range rdf:List; .
-schema:performers         a rdf:Property;  rdfs:range rdf:List; .
-schema:producer           a rdf:Property;  rdfs:range rdf:List; .
-schema:recipeInstructions a rdf:Property;  rdfs:range rdf:List; .
-schema:seasons            a rdf:Property;  rdfs:range rdf:List; .
-schema:subEvents          a rdf:Property;  rdfs:range rdf:List; .
-schema:tracks             a rdf:Property;  rdfs:range rdf:List; .
-                            
-hcard: a md:RegistryEntry;  
-  md:propertyURI "vocabulary";
-  md:defaultRange rdfs:Resource .
-
-hcalendar: a md:RegistryEntry;
-  md:propertyURI "vocabulary";
-  md:defaultRange rdfs:Resource .
-
-hcalendar:categories a rdfs:Property; rdfs:range rdf:List .
-
-work: a md:RegistryEntry;
-  md:propertyURI "contextual";
-  md:defaultRange rdf:List .

--- a/microdata-rdf/index.html	Tue Feb 28 22:21:21 2012 -0800
+++ b/microdata-rdf/index.html	Tue Feb 28 22:43:52 2012 -0800
@@ -1595,6 +1595,17 @@
         "subEvents": {"multipleValues": "list"},
         "tracks": {"multipleValues": "list"}
       }
+    },
+    "http://microformats.org/profile/hcard": {
+      "propertyURI":    "vocabulary",
+      "multipleValues": "unordered"
+    },
+    "http://microformats.org/profile/hcalendar#": {
+      "propertyURI":    "vocabulary",
+      "multipleValues": "unordered",
+      "properties": {
+        "categories": {"multipleValues": "list"}
+      }
     }
   }
   </pre>