Skip to content

Commit

Permalink
Merge branch 'master' of github.com:w3c/activitystreams
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Prodromou committed Dec 6, 2016
2 parents 0740d41 + 286afe4 commit 8078546
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions core/index.html
Expand Up @@ -2545,8 +2545,9 @@ <h2>Example using Multiple Vocabularies</h2>
{
"oa": "http://www.w3.org/ns/oa#",
"prov": "http://www.w3.org/ns/prov#",
"oa:created": {
"@id": "oa:created",
"dcterms": "http://purl.org/dc/terms/",
"dcterms:created": {
"@id": "dcterms:created",
"@type": "xsd:dateTime"
}
}
Expand All @@ -2572,21 +2573,21 @@ <h2>Example using Multiple Vocabularies</h2>
},
{
"id": "http://example.org/activity/20150101000059",
"type": [ "Update", "prov:Activity", "oa:Annotate" ],
"type": [ "Update", "prov:Activity", "oa:Annotation" ],
"summary": "Eric edited a note.",
"oa:created": "2015-01-01T00:00:59Z",
"oa:creator": "http://example.org/#eric",
"dcterms:created": "2015-01-01T00:00:59Z",
"dcterms:creator": { "@id": "http://example.org/#eric" },
"oa:hasBody": {
"id": "http://example.org/entry/20150101000059",
"type": [ "Note", "prov:Entity" ],
"content": "Remember... all I'm offering is the truth. Nothing more.",
"prov:wasAttributedTo": "http://example.org/#eric",
"prov:wasRevisionOf": "http://example.org/entry/20150101000000"
"prov:wasAttributedTo": { "@id": "http://example.org/#eric" },
"prov:wasRevisionOf": { "@id": "http://example.org/entry/20150101000000" }
},
"oa:hasTarget": "http://example.org/entry/20150101000000",
"oa:motivatedBy": "oa:editing",
"prov:generated": "http://example.org/entry/20150101000059",
"prov:wasInformedBy": "http://example.org/activity/20150101000000"
"oa:hasTarget": { "@id": "http://example.org/entry/20150101000000" },
"oa:motivatedBy": { "@id": "oa:editing" },
"prov:generated": { "@id": "http://example.org/entry/20150101000059" },
"prov:wasInformedBy": { "@id": "http://example.org/activity/20150101000000" }
},
{
"id": "http://example.org/activity/20150101010101",
Expand Down

0 comments on commit 8078546

Please sign in to comment.