diff --git a/core/index.html b/core/index.html index 685dd7e..bae7046 100644 --- a/core/index.html +++ b/core/index.html @@ -262,7 +262,7 @@

Serialization

An Activity Streams Document is a JSON document whose root value is an Activity Streams Object of any type, including a - Collection, and whose MIME media type is + Collection, and whose media type ([[!IANA-MEDIA-TYPES]]) is "application/activity+json".

@@ -380,7 +380,7 @@

Context with an array

When a JSON-LD enabled Activity Streams 2.0 implementation encounters a JSON document identified using the - "application/activity+json" MIME media type, and + "application/activity+json" media type, and that document does not contain a @context property whose value includes a reference to the normative Activity Streams 2.0 JSON-LD @@ -896,8 +896,8 @@

Link

- Alternatively, if additional metadata is required (such as the MIME - content type of the referenced resource) a Link can be used: + Alternatively, if additional metadata is required (such as the + media type of the referenced resource) a Link can be used:
{
@@ -2000,7 +2000,7 @@ 

IANA Considerations

The application/activity+json Media Type

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

@@ -2339,7 +2339,7 @@

Deprecated Activity Streams 1.0 Syntax

  1. - Implementations can use the "application/stream+json" MIME + Implementations can use the "application/stream+json" media type when producing a JSON serialization using the Activity Streams 1.0 syntax, and "application/activity+json" when producing a serialization conforming to the 2.0 syntax. @@ -2347,7 +2347,7 @@

    Deprecated Activity Streams 1.0 Syntax

  2. Implementations that process serializations identified using either the "application/stream+json" or the more - generic "application/json" MIME media type MUST follow + generic "application/json" 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 "application/activity+json" media @@ -2538,6 +2538,9 @@

    Changelog

  3. Updated context examples to include more realistic complex contexts.
  4. +
  5. + Replaced "MIME media type" with the recommended terminology: "media type". +
  6. diff --git a/ns/index.html b/ns/index.html index 8367146..51e6565 100644 --- a/ns/index.html +++ b/ns/index.html @@ -594,7 +594,7 @@
  7. hreflang
  8. latitude (xsd:float)
  9. longitude (xsd:float)
  10. -
  11. mediaType
  12. +
  13. mediaType (xsd:string)
  14. published (xsd:dateTime)
  15. radius (xsd:float)
  16. rating (xsd:float)
  17. diff --git a/vocabulary/activitystreams2.owl b/vocabulary/activitystreams2.owl index af44ec6..64b7309 100644 --- a/vocabulary/activitystreams2.owl +++ b/vocabulary/activitystreams2.owl @@ -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 . as:objectType a owl:DatatypeProperty , owl:FunctionalProperty, diff --git a/vocabulary/index.html b/vocabulary/index.html index c2d391c..1f97823 100644 --- a/vocabulary/index.html +++ b/vocabulary/index.html @@ -4679,7 +4679,8 @@

    Properties

    The content or textual representation of the Object encoded as a JSON string. By default, the value of content is HTML. The mediaType property can be used in - the object to indicate a different content type. + the object to indicate a different media type for the + content property.

    The content MAY be expressed using multiple language-tagged @@ -5049,11 +5050,11 @@

    Properties

    Notes:

    - When used on a Link, identifies the MIME media type of the + When used on a Link, identifies the media type of the referenced resource.

    - When used on an Object, identifies the MIME media + When used on an Object, identifies the media type of the value of the content property. If not specified, the content property is assumed to contain text/html content. @@ -5066,7 +5067,7 @@

    Properties

    Range: - MIME Media Type + xsd:string ([[!IANA-MEDIA-TYPES]]) Functional: @@ -6891,6 +6892,9 @@

    Changelog

    last, and current properties to Collection. +
  18. + Replaced "MIME media type" with the recommended terminology: "media type". +