Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions core/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ <h2>Serialization</h2>
An <dfn>Activity Streams
Document</dfn> is a JSON document whose root value is an
Activity Streams <a>Object</a> of any type, including a
<a>Collection</a>, and whose MIME media type is
<a>Collection</a>, and whose media type ([[!IANA-MEDIA-TYPES]]) is
"<code>application/activity+json</code>".
</p>

Expand Down Expand Up @@ -380,7 +380,7 @@ <h2>Context with an array</h2>
<p>
When a JSON-LD enabled Activity Streams 2.0 implementation encounters
a JSON document identified using the
"<code>application/activity+json</code>" MIME media type, and
"<code>application/activity+json</code>" media type, and
that document does not contain a <code>@context</code> property
whose value includes a reference to the normative
<a href="https://www.w3.org/ns/activitystreams">Activity Streams 2.0 JSON-LD
Expand Down Expand Up @@ -896,8 +896,8 @@ <h2><dfn>Link</dfn></h2>
</figure>

<figure><figcaption>
Alternatively, if additional metadata is required (such as the MIME
content type of the referenced resource) a <a>Link</a> can be used:
Alternatively, if additional metadata is required (such as the
media type of the referenced resource) a <a>Link</a> can be used:
</figcaption>
<div id="ex13-jsonld" style="display: block;">
<pre class="example highlight json">{
Expand Down Expand Up @@ -2000,7 +2000,7 @@ <h2>IANA Considerations</h2>
<h2>The <code>application/activity+json</code> Media Type</h2>

<p>
This specification registers the <code><dfn>application/activity+json</dfn></code> MIME Media Type specifically for identifying documents
This specification registers the <code><dfn>application/activity+json</dfn></code> media type specifically for identifying documents
conforming to the Activity Streams 2.0 format.
</p>

Expand Down Expand Up @@ -2339,15 +2339,15 @@ <h2>Deprecated Activity Streams 1.0 Syntax</h2>

<ol>
<li>
Implementations can use the "<code>application/stream+json</code>" MIME
Implementations can use the "<code>application/stream+json</code>"
media type when producing a JSON serialization using the Activity
Streams 1.0 syntax, and "<code>application/activity+json</code>"
when producing a serialization conforming to the 2.0 syntax.
</li>
<li>
Implementations that process serializations identified using either
the "<code>application/stream+json</code>" or the more
generic "<code>application/json</code>" MIME media type MUST follow
generic "<code>application/json</code>" media type MUST follow
the syntax and processing rules set by [[AS1]]. The 2.0
syntax and processing rules apply only when handling
serializations using the "<code>application/activity+json</code>" media
Expand Down Expand Up @@ -2538,6 +2538,9 @@ <h2>Changelog</h2>
<li>
Updated context examples to include more realistic complex contexts.
</li>
<li>
Replaced "MIME media type" with the recommended terminology: "media type".
</li>
</ul>

</section>
Expand Down
2 changes: 1 addition & 1 deletion ns/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ <h3 id="links-and-relationships">Links and Relationships</h3>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-hreflang" id="hreflang">hreflang</a> </li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-latitude" id="latitude">latitude</a> (<code>xsd:float</code>)</li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-longitude" id="longitude">longitude</a> (<code>xsd:float</code>)</li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-mediatype" id="mediaType">mediaType</a> </li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-mediatype" id="mediaType">mediaType</a> (<code>xsd:string</code>)</li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-published" id="published">published</a> (<code>xsd:dateTime</code>)</li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-radius" id="radius">radius</a> (<code>xsd:float</code>)</li>
<li><a href="https://www.w3.org/TR/activitystreams-vocabulary#dfn-rating" id="rating">rating</a> (<code>xsd:float</code>)</li>
Expand Down
5 changes: 3 additions & 2 deletions vocabulary/activitystreams2.owl
Original file line number Diff line number Diff line change
Expand Up @@ -497,12 +497,13 @@ as:longitude a owl:DatatypeProperty ,
as:mediaType a owl:DatatypeProperty ,
owl:FunctionalProperty ;
rdfs:label "mediaType"@en ;
rdfs:comment "The MIME Media Type"@en ;
rdfs:comment "The media type specified by the IANA."@en ;
rdfs:range xsd:string ;
rdfs:domain [
a owl:Class ;
owl:unionOf (as:Link as:Object)
] .
] ;
rdfs:seeAlso <http://www.iana.org/assignments/media-types/> .

as:objectType a owl:DatatypeProperty ,
owl:FunctionalProperty,
Expand Down
11 changes: 7 additions & 4 deletions vocabulary/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4679,7 +4679,7 @@ <h2>Properties</h2>
The content or textual representation of the Object encoded as a
JSON string. By default, the value of <code>content</code> is
HTML. The <code><a>mediaType</a></code> property can be used in
the object to indicate a different content type.
the object to indicate a different media type.
</p>
<p>
The content MAY be expressed using multiple language-tagged
Expand Down Expand Up @@ -5049,11 +5049,11 @@ <h2>Properties</h2>
<td>Notes:</td>
<td>
<p>
When used on a <a>Link</a>, identifies the MIME media type of the
When used on a <a>Link</a>, identifies the media type of the
referenced resource.
</p>
<p>
When used on an <a>Object</a>, identifies the MIME media
When used on an <a>Object</a>, identifies the media
type of the value of the <code><a>content</a></code> property.
If not specified, the <code><a>content</a></code> property is
assumed to contain <code>text/html</code> content.
Expand All @@ -5066,7 +5066,7 @@ <h2>Properties</h2>
</tr>
<tr>
<td>Range:</td>
<td>MIME Media Type</td>
<td><code>xsd:string</code> ([[!IANA-MEDIA-TYPES]])</td>
</tr>
<tr>
<td>Functional:</td>
Expand Down Expand Up @@ -6891,6 +6891,9 @@ <h2>Changelog</h2>
<code><a>last</a></code>, and <code><a>current</a></code> properties to
<code><a>Collection</a></code>.
</li>
<li>
Replaced "MIME media type" with the recommended terminology: "media type".
</li>
</ul>

</section>
Expand Down