rdf-vocab 3.1.5 → 3.1.10

data/lib/rdf/vocab/ht.rb

@@ -10,8 +10,8 @@ module RDF::Vocab
   #   #
   #   # A namespace for describing HTTP messages (http://www.w3.org/Protocols/rfc2616/rfc2616.html)
   #   # @version Working Draft 29 April 2011
-  #   # @see http://www.w3.org/TR/Content-in-RDF/
   #   # @see http://www.w3.org/WAI/intro/earl
+  #   # @see http://www.w3.org/TR/Content-in-RDF/
   #   class HT < RDF::StrictVocabulary
   #     # A connection used for HTTP transfer.
   #     # @return [RDF::Vocabulary::Term]
@@ -174,7 +174,7 @@ module RDF::Vocab
 
     # Ontology definition
     ontology :"http://www.w3.org/2011/http#",
-      comment: %(A namespace for describing HTTP messages \(http://www.w3.org/Protocols/rfc2616/rfc2616.html\)).freeze,
+      comment: "A namespace for describing HTTP messages (http://www.w3.org/Protocols/rfc2616/rfc2616.html)".freeze,
       isDefinedBy: "http://www.w3.org/TR/HTTP-in-RDF/".freeze,
       label: "HTTP in RDF".freeze,
       "owl:imports": ["cnt:".freeze, "dc:".freeze],
@@ -184,218 +184,218 @@ module RDF::Vocab
 
     # Class definitions
     term :Connection,
-      comment: %(A connection used for HTTP transfer.).freeze,
+      comment: "A connection used for HTTP transfer.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Connection".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :EntityHeader,
-      comment: %(An entity header in an HTTP message.).freeze,
+      comment: "An entity header in an HTTP message.".freeze,
       label: "Entity Header".freeze,
       subClassOf: "ht:MessageHeader".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :GeneralHeader,
-      comment: %(A general header in an HTTP message.).freeze,
+      comment: "A general header in an HTTP message.".freeze,
       label: "General Header".freeze,
       subClassOf: "ht:MessageHeader".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :HeaderElement,
-      comment: %(A part of a deconstructed header value.).freeze,
+      comment: "A part of a deconstructed header value.".freeze,
       label: "Header Element".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :HeaderName,
-      comment: %(A header name.).freeze,
+      comment: "A header name.".freeze,
       label: "Header Name".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :Message,
-      comment: %(An HTTP message.).freeze,
+      comment: "An HTTP message.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Message".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :MessageHeader,
-      comment: %(A header in an HTTP message.).freeze,
+      comment: "A header in an HTTP message.".freeze,
       label: "Message Header".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :Method,
-      comment: %(The HTTP method used for the request.).freeze,
+      comment: "The HTTP method used for the request.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Method".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :Parameter,
-      comment: %(A parameter for a part of a header value.).freeze,
+      comment: "A parameter for a part of a header value.".freeze,
       label: "Parameter".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :Request,
-      comment: %(An HTTP request.).freeze,
+      comment: "An HTTP request.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Request".freeze,
       subClassOf: "ht:Message".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :RequestHeader,
-      comment: %(A header in an HTTP request message.).freeze,
+      comment: "A header in an HTTP request message.".freeze,
       label: "Request Header".freeze,
       subClassOf: "ht:MessageHeader".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :Response,
-      comment: %(An HTTP response.).freeze,
+      comment: "An HTTP response.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Response".freeze,
       subClassOf: "ht:Message".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :ResponseHeader,
-      comment: %(A header in an HTTP response message.).freeze,
+      comment: "A header in an HTTP response message.".freeze,
       label: "Response Header".freeze,
       subClassOf: "ht:MessageHeader".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
     term :StatusCode,
-      comment: %(The status code of an HTTP response.).freeze,
+      comment: "The status code of an HTTP response.".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Status code".freeze,
       type: ["owl:Class".freeze, "rdfs:Class".freeze]
 
     # Property definitions
     property :absolutePath,
-      comment: %(The absolute path sort of request URI.).freeze,
+      comment: "The absolute path sort of request URI.".freeze,
       label: "Absolute path".freeze,
       subPropertyOf: "ht:requestURI".freeze,
       type: "rdf:Property".freeze
     property :absoluteURI,
-      comment: %(The absolute request URI.).freeze,
+      comment: "The absolute request URI.".freeze,
       label: "Absolute URI".freeze,
       subPropertyOf: "ht:requestURI".freeze,
       type: "rdf:Property".freeze
     property :authority,
-      comment: %(The authority sort of request URI.).freeze,
+      comment: "The authority sort of request URI.".freeze,
       label: "Authority".freeze,
       subPropertyOf: "ht:requestURI".freeze,
       type: "rdf:Property".freeze
     property :body,
-      comment: %(The entity body of an HTTP message.).freeze,
+      comment: "The entity body of an HTTP message.".freeze,
       domain: "ht:Message".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Entity Body".freeze,
       range: "cnt:ContentAsBase64".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :connectionAuthority,
-      comment: %(The authority of a connection used for the HTTP transfer.).freeze,
+      comment: "The authority of a connection used for the HTTP transfer.".freeze,
       domain: "ht:Connection".freeze,
       label: "Connection authority".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :elementName,
-      comment: %(The name of a header element.).freeze,
+      comment: "The name of a header element.".freeze,
       domain: "ht:HeaderElement".freeze,
       label: "Header element name".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :elementValue,
-      comment: %(The value of a header element.).freeze,
+      comment: "The value of a header element.".freeze,
       domain: "ht:HeaderElement".freeze,
       label: "Header element value".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :fieldName,
-      comment: %(The name of an HTTP header field.).freeze,
+      comment: "The name of an HTTP header field.".freeze,
       domain: "ht:MessageHeader".freeze,
       label: "Field name".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :fieldValue,
-      comment: %(The value of an HTTP header field.).freeze,
+      comment: "The value of an HTTP header field.".freeze,
       domain: "ht:MessageHeader".freeze,
       label: "Field value".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :hdrName,
-      comment: %(The name of an HTTP header.).freeze,
+      comment: "The name of an HTTP header.".freeze,
       domain: "ht:MessageHeader".freeze,
       label: "Header name".freeze,
       range: "ht:HeaderName".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :headerElements,
-      comment: %(The deconstructed parts of an HTTP header value.).freeze,
+      comment: "The deconstructed parts of an HTTP header value.".freeze,
       domain: "ht:MessageHeader".freeze,
       label: "Header elements".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :headers,
-      comment: %(The headers in an HTTP message.).freeze,
+      comment: "The headers in an HTTP message.".freeze,
       domain: "ht:Message".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Headers".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :httpVersion,
-      comment: %(The HTTP version of an HTTP message.).freeze,
+      comment: "The HTTP version of an HTTP message.".freeze,
       domain: "ht:Message".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "HTTP version".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :methodName,
-      comment: %(The HTTP method name used for the HTTP request.).freeze,
+      comment: "The HTTP method name used for the HTTP request.".freeze,
       domain: "ht:Request".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Method name".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :mthd,
-      comment: %(The HTTP method used for the HTTP request.).freeze,
+      comment: "The HTTP method used for the HTTP request.".freeze,
       domain: "ht:Request".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Method".freeze,
       range: "ht:Method".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :paramName,
-      comment: %(The name of a parameter in a part of a deconstructed HTTP header value.).freeze,
+      comment: "The name of a parameter in a part of a deconstructed HTTP header value.".freeze,
       domain: "ht:Parameter".freeze,
       label: "Parameter name".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :paramValue,
-      comment: %(The value of a parameter in a part of a deconstructed HTTP header value.).freeze,
+      comment: "The value of a parameter in a part of a deconstructed HTTP header value.".freeze,
       domain: "ht:Parameter".freeze,
       label: "Parameter value".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :params,
-      comment: %(The parameters in a part of a deconstructed HTTP header value.).freeze,
+      comment: "The parameters in a part of a deconstructed HTTP header value.".freeze,
       domain: "ht:HeaderElement".freeze,
       label: "Header parameters".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :reasonPhrase,
-      comment: %(The reason phrase \(status text\) of an HTTP response.).freeze,
+      comment: "The reason phrase (status text) of an HTTP response.".freeze,
       domain: "ht:Response".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Reason phrase".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :requestURI,
-      comment: %(The request URI of an HTTP request.).freeze,
+      comment: "The request URI of an HTTP request.".freeze,
       domain: "ht:Request".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Request URI".freeze,
       range: "rdfs:Literal".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :requests,
-      comment: %(The HTTP requests made via a connection.).freeze,
+      comment: "The HTTP requests made via a connection.".freeze,
       domain: "ht:Connection".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Requests".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :resp,
-      comment: %(The HTTP response sent in answer to an HTTP request.).freeze,
+      comment: "The HTTP response sent in answer to an HTTP request.".freeze,
       domain: "ht:Request".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Response".freeze,
       range: "ht:Response".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :sc,
-      comment: %(The status code of an HTTP response.).freeze,
+      comment: "The status code of an HTTP response.".freeze,
       domain: "ht:Response".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Status code".freeze,
       range: "ht:StatusCode".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :statusCodeNumber,
-      comment: %(The status code number.).freeze,
+      comment: "The status code number.".freeze,
       domain: "ht:StatusCode".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Status code".freeze,
@@ -403,7 +403,7 @@ module RDF::Vocab
       subPropertyOf: "dc:identifier".freeze,
       type: ["owl:ObjectProperty".freeze, "rdf:Property".freeze]
     property :statusCodeValue,
-      comment: %(The status code value of an HTTP response.).freeze,
+      comment: "The status code value of an HTTP response.".freeze,
       domain: "ht:Response".freeze,
       isDefinedBy: "http://www.ietf.org/rfc/rfc2616.txt".freeze,
       label: "Status code".freeze,

data/lib/rdf/vocab/hydra.rb

@@ -16,7 +16,11 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :ApiDocumentation
   #
-  #     # The class of Hydra classes. Hydra classes and their instances are dereferenceable resources.
+  #     # Provides a base abstract for base Uri source for Iri template resolution.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :BaseUriSource
+  #
+  #     # The class of Hydra classes.
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :Class
   #
@@ -48,7 +52,7 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :PartialCollectionView
   #
-  #     # The class of dereferenceable resources.
+  #     # The class of dereferenceable resources by means a client can attempt to dereference; however, the received responses should still be verified.
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :Resource
   #
@@ -116,6 +120,9 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :required
   #
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :resolveRelativeUsing
+  #
   #     # Name of the header returned by the operation.
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :returnsHeader
@@ -146,7 +153,7 @@ module RDF::Vocab
   #
   #     # True if the client can change the property's value, false otherwise.
   #     # @return [RDF::Vocabulary::Term]
-  #     attr_reader :writeable
+  #     attr_reader :writable
   #
   #     # An IRI template as defined by RFC6570.
   #     # @return [RDF::Vocabulary::Term]
@@ -160,6 +167,14 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :ExplicitRepresentation
   #
+  #     # States that the link's context IRI, as defined in RFC 5988, should be used as the base Uri
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :LinkContext
+  #
+  #     # States that the base Uri should be established using RFC 3986 reference resolution algorithm specified in section 5.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :Rfc3986
+  #
   #     # A link to the API documentation
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :apiDocumentation
@@ -184,7 +199,7 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :last
   #
-  #     # Semantics of each member provided by the collection.
+  #     # This predicate is left for compatibility purposes and hydra:memberAssertion should be used instead.
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :manages
   #
@@ -192,6 +207,10 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :member
   #
+  #     # Semantics of each member provided by the collection.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :memberAssertion
+  #
   #     # The resource following the current instance in an interlinked set of resources.
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :next
@@ -240,6 +259,10 @@ module RDF::Vocab
   #     # @return [RDF::Vocabulary::Term]
   #     attr_reader :view
   #
+  #     # This property is left for compatibility purposes and hydra:writable should be used instead.
+  #     # @return [RDF::Vocabulary::Term]
+  #     attr_reader :writeable
+  #
   #   end
   HYDRA = Class.new(RDF::StrictVocabulary("http://www.w3.org/ns/hydra/core#")) do
 
@@ -248,7 +271,7 @@ module RDF::Vocab
       "cc:attributionName": "Hydra W3C Community Group".freeze,
       "cc:attributionURL": "http://www.hydra-cg.com/".freeze,
       "cc:license": "http://creativecommons.org/licenses/by/4.0/".freeze,
-      comment: %(A lightweight vocabulary for hypermedia-driven Web APIs).freeze,
+      comment: "A lightweight vocabulary for hypermedia-driven Web APIs".freeze,
       "dc:description": "The Hydra Core Vocabulary is a lightweight vocabulary to create hypermedia-driven Web APIs. By specifying a number of concepts commonly used in Web APIs it enables the creation of generic API clients.".freeze,
       "dc:publisher": "Hydra W3C Community Group".freeze,
       "dc:rights": "Copyright © 2012-2014 the Contributors to the Hydra Core Vocabulary Specification".freeze,
@@ -258,107 +281,107 @@ module RDF::Vocab
 
     # Class definitions
     term :ApiDocumentation,
-      comment: %(The Hydra API documentation class).freeze,
+      comment: "The Hydra API documentation class".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "ApiDocumentation".freeze,
       subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
+    term :BaseUriSource,
+      comment: "Provides a base abstract for base Uri source for Iri template resolution.".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "Base Uri source".freeze,
+      subClassOf: "hydra:Resource".freeze,
+      type: "hydra:Class".freeze,
+      "vs:term_status": "testing".freeze
     term :Class,
-      comment: %(The class of Hydra classes. Hydra classes and their instances are dereferenceable resources.).freeze,
+      comment: "The class of Hydra classes.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Hydra Class".freeze,
-      subClassOf: ["hydra:Resource".freeze, "rdfs:Class".freeze],
+      subClassOf: "rdfs:Class".freeze,
       type: ["hydra:Resource".freeze, "rdfs:Class".freeze],
       "vs:term_status": "testing".freeze
     term :Collection,
-      comment: %(A collection holding references to a number of related resources.).freeze,
+      comment: "A collection holding references to a number of related resources.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Collection".freeze,
       subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :Error,
-      comment: %(A runtime error, used to report information beyond the returned status code.).freeze,
+      comment: "A runtime error, used to report information beyond the returned status code.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Error".freeze,
       subClassOf: "hydra:Status".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :IriTemplate,
-      comment: %(The class of IRI templates.).freeze,
+      comment: "The class of IRI templates.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "IRI Template".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :IriTemplateMapping,
-      comment: %(A mapping from an IRI template variable to a property.).freeze,
+      comment: "A mapping from an IRI template variable to a property.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "IriTemplateMapping".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :Link,
-      comment: %(The class of properties representing links.).freeze,
+      comment: "The class of properties representing links.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Link".freeze,
       subClassOf: ["hydra:Resource".freeze, "rdf:Property".freeze],
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :Operation,
-      comment: %(An operation.).freeze,
+      comment: "An operation.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Operation".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :PartialCollectionView,
-      comment: %(A PartialCollectionView describes a partial view of a Collection. Multiple PartialCollectionViews can be connected with the the next/previous properties to allow a client to retrieve all members of the collection.).freeze,
+      comment: "A PartialCollectionView describes a partial view of a Collection. Multiple PartialCollectionViews can be connected with the the next/previous properties to allow a client to retrieve all members of the collection.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "PartialCollectionView".freeze,
       subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :Resource,
-      comment: %(The class of dereferenceable resources.).freeze,
+      comment: "The class of dereferenceable resources by means a client can attempt to dereference; however, the received responses should still be verified.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Hydra Resource".freeze,
-      subClassOf: "rdfs:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :Status,
-      comment: %(Additional information about a status code that might be returned.).freeze,
+      comment: "Additional information about a status code that might be returned.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Status code description".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :SupportedProperty,
-      comment: %(A property known to be supported by a Hydra class.).freeze,
+      comment: "A property known to be supported by a Hydra class.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Supported Property".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :TemplatedLink,
-      comment: %(A templated link.).freeze,
+      comment: "A templated link.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "Templated Link".freeze,
       subClassOf: ["hydra:Resource".freeze, "rdf:Property".freeze],
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
     term :VariableRepresentation,
-      comment: %(A representation specifies how to serialize variable values into strings.).freeze,
+      comment: "A representation specifies how to serialize variable values into strings.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "VariableRepresentation".freeze,
-      subClassOf: "hydra:Resource".freeze,
       type: "hydra:Class".freeze,
       "vs:term_status": "testing".freeze
 
     # Property definitions
     property :description,
-      comment: %(A description.).freeze,
+      comment: "A description.".freeze,
       domainIncludes: ["hydra:ApiDocumentation".freeze, "hydra:Class".freeze, "hydra:Link".freeze, "hydra:Operation".freeze, "hydra:Status".freeze, "hydra:SupportedProperty".freeze, "hydra:TemplatedLink".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "description".freeze,
@@ -367,7 +390,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :expectsHeader,
-      comment: %(Specification of the header expected by the operation.).freeze,
+      comment: "Specification of the header expected by the operation.".freeze,
       domain: "hydra:Operation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "expects header".freeze,
@@ -375,7 +398,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :freetextQuery,
-      comment: %(A property representing a freetext query.).freeze,
+      comment: "A property representing a freetext query.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "freetext query".freeze,
@@ -383,14 +406,14 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :limit,
-      comment: %(Instructs to limit set only to N elements.).freeze,
+      comment: "Instructs to limit set only to N elements.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "take".freeze,
       range: "xsd:nonNegativeInteger".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :mapping,
-      comment: %(A variable-to-property mapping of the IRI template.).freeze,
+      comment: "A variable-to-property mapping of the IRI template.".freeze,
       domain: "hydra:IriTemplate".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "mapping".freeze,
@@ -398,7 +421,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :method,
-      comment: %(The HTTP method.).freeze,
+      comment: "The HTTP method.".freeze,
       domain: "hydra:Operation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "method".freeze,
@@ -406,14 +429,14 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :offset,
-      comment: %(Instructs to skip N elements of the set.).freeze,
+      comment: "Instructs to skip N elements of the set.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "skip".freeze,
       range: "xsd:nonNegativeInteger".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :pageIndex,
-      comment: %(Instructs to provide a specific page of the collection at a given index.).freeze,
+      comment: "Instructs to provide a specific page of the collection at a given index.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "page index".freeze,
       range: "xsd:nonNegativeInteger".freeze,
@@ -421,13 +444,13 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :pageReference,
-      comment: %(Instructs to provide a specific page reference of the collection.).freeze,
+      comment: "Instructs to provide a specific page reference of the collection.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "page reference".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :property,
-      comment: %(A property).freeze,
+      comment: "A property".freeze,
       domainIncludes: ["hydra:IriTemplateMapping".freeze, "hydra:SupportedProperty".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "property".freeze,
@@ -435,7 +458,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :readable,
-      comment: %(True if the client can retrieve the property's value, false otherwise.).freeze,
+      comment: "True if the client can retrieve the property's value, false otherwise.".freeze,
       domain: "hydra:SupportedProperty".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "readable".freeze,
@@ -443,15 +466,22 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :required,
-      comment: %(True if the property is required, false otherwise.).freeze,
+      comment: "True if the property is required, false otherwise.".freeze,
       domainIncludes: ["hydra:IriTemplateMapping".freeze, "hydra:SupportedProperty".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "required".freeze,
       range: "xsd:boolean".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
+    property :resolveRelativeUsing,
+      domain: "hydra:IriTemplate".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "relative Uri resolution".freeze,
+      range: "hydra:BaseUriSource".freeze,
+      type: "rdf:Property".freeze,
+      "vs:term_status": "testing".freeze
     property :returnsHeader,
-      comment: %(Name of the header returned by the operation.).freeze,
+      comment: "Name of the header returned by the operation.".freeze,
       domain: "hydra:Operation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "returns header".freeze,
@@ -459,7 +489,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :statusCode,
-      comment: %(The HTTP status code).freeze,
+      comment: "The HTTP status code".freeze,
       domain: "hydra:Status".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "status code".freeze,
@@ -467,7 +497,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :template,
-      comment: %(A templated string with placeholders. The literal's datatype indicates the template syntax; if not specified, hydra:Rfc6570Template is assumed.).freeze,
+      comment: "A templated string with placeholders. The literal's datatype indicates the template syntax; if not specified, hydra:Rfc6570Template is assumed.".freeze,
       domain: "hydra:IriTemplate".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "template".freeze,
@@ -476,7 +506,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :title,
-      comment: %(A title, often used along with a description.).freeze,
+      comment: "A title, often used along with a description.".freeze,
       domainIncludes: ["hydra:ApiDocumentation".freeze, "hydra:Class".freeze, "hydra:Link".freeze, "hydra:Operation".freeze, "hydra:Status".freeze, "hydra:SupportedProperty".freeze, "hydra:TemplatedLink".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "title".freeze,
@@ -485,7 +515,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :totalItems,
-      comment: %(The total number of items referenced by a collection.).freeze,
+      comment: "The total number of items referenced by a collection.".freeze,
       domain: "hydra:Collection".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "total items".freeze,
@@ -493,7 +523,7 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :variable,
-      comment: %(An IRI template variable).freeze,
+      comment: "An IRI template variable".freeze,
       domain: "hydra:IriTemplateMapping".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "variable".freeze,
@@ -501,25 +531,25 @@ module RDF::Vocab
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
     property :variableRepresentation,
-      comment: %(The representation format to use when expanding the IRI template.).freeze,
+      comment: "The representation format to use when expanding the IRI template.".freeze,
       domain: "hydra:IriTemplateMapping".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "variable representation".freeze,
       range: "hydra:VariableRepresentation".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
-    property :writeable,
-      comment: %(True if the client can change the property's value, false otherwise.).freeze,
+    property :writable,
+      comment: "True if the client can change the property's value, false otherwise.".freeze,
       domain: "hydra:SupportedProperty".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
-      label: "writeable".freeze,
+      label: "writable".freeze,
       range: "xsd:boolean".freeze,
       type: "rdf:Property".freeze,
       "vs:term_status": "testing".freeze
 
     # Datatype definitions
     term :Rfc6570Template,
-      comment: %(An IRI template as defined by RFC6570.).freeze,
+      comment: "An IRI template as defined by RFC6570.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "RFC6570 IRI template".freeze,
       range: "xsd:string".freeze,
@@ -529,19 +559,31 @@ module RDF::Vocab
 
     # Extra definitions
     term :BasicRepresentation,
-      comment: %(A representation that serializes just the lexical form of a variable value, but omits language and type information.).freeze,
+      comment: "A representation that serializes just the lexical form of a variable value, but omits language and type information.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "BasicRepresentation".freeze,
       type: "hydra:VariableRepresentation".freeze,
       "vs:term_status": "testing".freeze
     term :ExplicitRepresentation,
-      comment: %(A representation that serializes a variable value including its language and type information and thus differentiating between IRIs and literals.).freeze,
+      comment: "A representation that serializes a variable value including its language and type information and thus differentiating between IRIs and literals.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "ExplicitRepresentation".freeze,
       type: "hydra:VariableRepresentation".freeze,
       "vs:term_status": "testing".freeze
+    term :LinkContext,
+      comment: "States that the link's context IRI, as defined in RFC 5988, should be used as the base Uri".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "Link context".freeze,
+      type: "hydra:BaseUriSource".freeze,
+      "vs:term_status": "testing".freeze
+    term :Rfc3986,
+      comment: "States that the base Uri should be established using RFC 3986 reference resolution algorithm specified in section 5.".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "RFC 3986 based".freeze,
+      type: "hydra:BaseUriSource".freeze,
+      "vs:term_status": "testing".freeze
     term :apiDocumentation,
-      comment: %(A link to the API documentation).freeze,
+      comment: "A link to the API documentation".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "apiDocumentation".freeze,
@@ -549,15 +591,14 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :collection,
-      comment: %(Collections somehow related to this resource.).freeze,
-      domain: "hydra:Resource".freeze,
+      comment: "Collections somehow related to this resource.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "collection".freeze,
       range: "hydra:Collection".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :entrypoint,
-      comment: %(A link to main entry point of the Web API).freeze,
+      comment: "A link to main entry point of the Web API".freeze,
       domain: "hydra:ApiDocumentation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "entrypoint".freeze,
@@ -565,16 +606,15 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :expects,
-      comment: %(The information expected by the Web API.).freeze,
+      comment: "The information expected by the Web API.".freeze,
       domain: "hydra:Operation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "expects".freeze,
-      range: "hydra:Resource".freeze,
-      rangeIncludes: ["hydra:Class".freeze, "hydra:Resource".freeze],
+      rangeIncludes: ["hydra:Class".freeze, "hydra:Resource".freeze, "rdfs:Class".freeze, "rdfs:Resource".freeze],
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :first,
-      comment: %(The first resource of an interlinked set of resources.).freeze,
+      comment: "The first resource of an interlinked set of resources.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "first".freeze,
@@ -582,7 +622,7 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :last,
-      comment: %(The last resource of an interlinked set of resources.).freeze,
+      comment: "The last resource of an interlinked set of resources.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "last".freeze,
@@ -590,21 +630,26 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :manages,
-      comment: %(Semantics of each member provided by the collection.).freeze,
-      domain: "hydra:Collection".freeze,
+      comment: "This predicate is left for compatibility purposes and hydra:memberAssertion should be used instead.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "manages".freeze,
-      "vs:term_status": "testing".freeze
+      subPropertyOf: "hydra:memberAssertion".freeze,
+      "vs:term_status": "archaic".freeze
     term :member,
-      comment: %(A member of the collection).freeze,
+      comment: "A member of the collection".freeze,
       domain: "hydra:Collection".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "member".freeze,
-      range: "hydra:Resource".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
+    term :memberAssertion,
+      comment: "Semantics of each member provided by the collection.".freeze,
+      domain: "hydra:Collection".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "member assertion".freeze,
+      "vs:term_status": "testing".freeze
     term :next,
-      comment: %(The resource following the current instance in an interlinked set of resources.).freeze,
+      comment: "The resource following the current instance in an interlinked set of resources.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "next".freeze,
@@ -612,12 +657,12 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :object,
-      comment: %(The object.).freeze,
+      comment: "The object.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "object".freeze,
       "vs:term_status": "testing".freeze
     term :operation,
-      comment: %(An operation supported by the Hydra resource).freeze,
+      comment: "An operation supported by the Hydra resource".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "operation".freeze,
@@ -625,7 +670,7 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :possibleStatus,
-      comment: %(A status that might be returned by the Web API \(other statuses should be expected and properly handled as well\)).freeze,
+      comment: "A status that might be returned by the Web API (other statuses should be expected and properly handled as well)".freeze,
       domainIncludes: ["hydra:ApiDocumentation".freeze, "hydra:Operation".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "possible status".freeze,
@@ -633,7 +678,7 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :previous,
-      comment: %(The resource preceding the current instance in an interlinked set of resources.).freeze,
+      comment: "The resource preceding the current instance in an interlinked set of resources.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "previous".freeze,
@@ -641,16 +686,15 @@ module RDF::Vocab
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :returns,
-      comment: %(The information returned by the Web API on success).freeze,
+      comment: "The information returned by the Web API on success".freeze,
       domain: "hydra:Operation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "returns".freeze,
-      range: "hydra:Resource".freeze,
-      rangeIncludes: ["hydra:Class".freeze, "hydra:Resource".freeze],
+      rangeIncludes: ["hydra:Class".freeze, "hydra:Resource".freeze, "rdfs:Class".freeze, "rdfs:Resource".freeze],
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :search,
-      comment: %(A IRI template that can be used to query a collection.).freeze,
+      comment: "A IRI template that can be used to query a collection.".freeze,
       domain: "hydra:Resource".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "search".freeze,
@@ -658,41 +702,45 @@ module RDF::Vocab
       type: "hydra:TemplatedLink".freeze,
       "vs:term_status": "testing".freeze
     term :subject,
-      comment: %(The subject.).freeze,
+      comment: "The subject.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "subject".freeze,
       "vs:term_status": "testing".freeze
     term :supportedClass,
-      comment: %(A class known to be supported by the Web API).freeze,
+      comment: "A class known to be supported by the Web API".freeze,
       domain: "hydra:ApiDocumentation".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "supported classes".freeze,
-      range: "hydra:Class".freeze,
+      range: "rdfs:Class".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :supportedOperation,
-      comment: %(An operation supported by instances of the specific Hydra class or the target of the Hydra link).freeze,
-      domainIncludes: ["hydra:Class".freeze, "hydra:Link".freeze, "hydra:SupportedProperty".freeze, "hydra:TemplatedLink".freeze],
+      comment: "An operation supported by instances of the specific Hydra class or the target of the Hydra link".freeze,
+      domainIncludes: ["hydra:Class".freeze, "hydra:Link".freeze, "hydra:SupportedProperty".freeze, "hydra:TemplatedLink".freeze, "rdfs:Class".freeze],
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "supported operation".freeze,
       range: "hydra:Operation".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :supportedProperty,
-      comment: %(The properties known to be supported by a Hydra class).freeze,
-      domain: "hydra:Class".freeze,
+      comment: "The properties known to be supported by a Hydra class".freeze,
+      domain: "rdfs:Class".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "supported properties".freeze,
       range: "hydra:SupportedProperty".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
     term :view,
-      comment: %(A specific view of a resource.).freeze,
-      domain: "hydra:Resource".freeze,
+      comment: "A specific view of a resource.".freeze,
       isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
       label: "view".freeze,
-      range: "hydra:Resource".freeze,
       type: "hydra:Link".freeze,
       "vs:term_status": "testing".freeze
+    term :writeable,
+      comment: "This property is left for compatibility purposes and hydra:writable should be used instead.".freeze,
+      isDefinedBy: "http://www.w3.org/ns/hydra/core".freeze,
+      label: "writable".freeze,
+      subPropertyOf: "hydra:writable".freeze,
+      "vs:term_status": "archaic".freeze
   end
 end