Merge pull request #685 from mmccool/master

fix changes3 link

index.html

@@ -5791,7 +5791,7 @@ <h3>Thing Description Ontology</h3>
 
   <section id="changes" class="appendix">
   <h1>Recent Specification Changes</h1>
-  <h2 id="changes3">Changes from Third Public Working Draft</h2>
+  <h2 id="changes-from-third-public-working-draft">Changes from Third Public Working Draft</h2>
   <ul>
     <li>General</li>
     <ul>

index.template.html

@@ -4293,7 +4293,7 @@ <h3>Thing Description Ontology</h3>
 
   <section id="changes" class="appendix">
   <h1>Recent Specification Changes</h1>
-  <h2 id="changes3">Changes from Third Public Working Draft</h2>
+  <h2 id="changes-from-third-public-working-draft">Changes from Third Public Working Draft</h2>
   <ul>
     <li>General</li>
     <ul>

ontology/hyperm.html

@@ -88,18 +88,18 @@ <h2>Introduction</h2>
 <section class="specterm"><h4><a href="#hyperm-hastarget">hyperm:hasTarget</a></h4><p>IRI: https://www.w3.org/2019/wot/hypermedia#hasTarget</p><p><strong>a OWL Class</strong></p><em>hasTarget</em> - <span>target IRI of a link or submission target of a form.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#hyperm-returns">hyperm:returns</a></h4><p>IRI: https://www.w3.org/2019/wot/hypermedia#returns</p><p><strong>a OWL Class</strong></p><em>returns</em> - <span>This optional term can be used if, e.g., the output communication metadata differ from input metdata (e.g., output contentType differ from the
      input contentType). The response name contains metadata that is only valid for the reponse messages.</span><table><tbody></tbody></table></section>
-<section class="specterm"><h4><a href="#hyperm-hasanchor">hyperm:hasAnchor</a></h4><p>IRI: https://www.w3.org/2019/wot/hypermedia#hasAnchor</p><p><strong>a OWL Class</strong></p><em>hasAnchor</em> - <span>By default, the context, or anchor, of a link conveyed in the Link header field is the URL of the representation it is associated with, as defined in RFC7231, Section 3.1.4.1, and is serialized as a URI.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>subprotocol</td><td><a href="#hyperm-forsubprotocol">hyperm:forSubProtocol</a></td></tr>
-<tr><td>response</td><td><a href="#hyperm-returns">hyperm:returns</a></td></tr>
+<section class="specterm"><h4><a href="#hyperm-hasanchor">hyperm:hasAnchor</a></h4><p>IRI: https://www.w3.org/2019/wot/hypermedia#hasAnchor</p><p><strong>a OWL Class</strong></p><em>hasAnchor</em> - <span>By default, the context, or anchor, of a link conveyed in the Link header field is the URL of the representation it is associated with, as defined in RFC7231, Section 3.1.4.1, and is serialized as a URI.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>hyperm</td><td><a href="#hyperm-hypermedia controls ontology">hyperm:Hypermedia Controls Ontology</a></td></tr>
+<tr><td>Form</td><td><a href="#hyperm-form">hyperm:Form</a></td></tr>
 <tr><td>href</td><td><a href="#hyperm-hastarget">hyperm:hasTarget</a></td></tr>
-<tr><td>hyperm</td><td><a href="#hyperm-hypermedia controls ontology">hyperm:Hypermedia Controls Ontology</a></td></tr>
-<tr><td>Link</td><td><a href="#hyperm-link">hyperm:Link</a></td></tr>
+<tr><td>subprotocol</td><td><a href="#hyperm-forsubprotocol">hyperm:forSubProtocol</a></td></tr>
+<tr><td>anchor</td><td><a href="#hyperm-hasanchor">hyperm:hasAnchor</a></td></tr>
 <tr><td>rel</td><td><a href="#hyperm-hasrelationtype">hyperm:hasRelationType</a></td></tr>
-<tr><td>Form</td><td><a href="#hyperm-form">hyperm:Form</a></td></tr>
-<tr><td>type</td><td><a href="#hyperm-hintsatmediatype">hyperm:hintsAtMediaType</a></td></tr>
 <tr><td>op</td><td><a href="#hyperm-foroperationtype">hyperm:forOperationType</a></td></tr>
-<tr><td>contentCoding</td><td><a href="#hyperm-forcontentcoding">hyperm:forContentCoding</a></td></tr>
+<tr><td>type</td><td><a href="#hyperm-hintsatmediatype">hyperm:hintsAtMediaType</a></td></tr>
+<tr><td>response</td><td><a href="#hyperm-returns">hyperm:returns</a></td></tr>
+<tr><td>Link</td><td><a href="#hyperm-link">hyperm:Link</a></td></tr>
 <tr><td>contentType</td><td><a href="#hyperm-forcontenttype">hyperm:forContentType</a></td></tr>
-<tr><td>anchor</td><td><a href="#hyperm-hasanchor">hyperm:hasAnchor</a></td></tr></tbody></table></section>
+<tr><td>contentCoding</td><td><a href="#hyperm-forcontentcoding">hyperm:forContentCoding</a></td></tr></tbody></table></section>
 
 </body>
 

ontology/jsonschema.html

@@ -88,27 +88,27 @@ <h2>Introduction</h2>
 <section class="specterm"><h4><a href="#jsonschema-writeonly">jsonschema:writeOnly</a></h4><p>IRI: https://www.w3.org/2019/wot/json-schema#writeOnly</p><p><strong>a OWL Class</strong></p><em>writeOnly</em> - <span>Boolean value that is a hint to indicate whether a property interaction / value is write only (=true) or not (=false)</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#jsonschema-format">jsonschema:format</a></h4><p>IRI: https://www.w3.org/2019/wot/json-schema#format</p><p><strong>a OWL Class</strong></p><em>format</em> - <span>Allows validation based on a format pattern such as "date-time", "email", "uri", etc.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#jsonschema-readonly">jsonschema:readOnly</a></h4><p>IRI: https://www.w3.org/2019/wot/json-schema#readOnly</p><p><strong>a OWL Class</strong></p><em>readOnly</em> - <span>Boolean value that is a hint to indicate whether a property interaction / value is read only (=true) or not (=false)</span><table><tbody></tbody></table></section>
-<section class="specterm"><h4><a href="#jsonschema-required">jsonschema:required</a></h4><p>IRI: https://www.w3.org/2019/wot/json-schema#required</p><p><strong>a OWL Class</strong></p><em>required</em> - <span>Defines which members of the object type are mandatory.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>null</td><td><a href="#jsonschema-nullschema">jsonschema:NullSchema</a></td></tr>
-<tr><td>integer</td><td><a href="#jsonschema-integerschema">jsonschema:IntegerSchema</a></td></tr>
-<tr><td>enum</td><td><a href="#jsonschema-enum">jsonschema:enum</a></td></tr>
-<tr><td>oneOf</td><td><a href="#jsonschema-oneof">jsonschema:oneOf</a></td></tr>
-<tr><td>object</td><td><a href="#jsonschema-objectschema">jsonschema:ObjectSchema</a></td></tr>
+<section class="specterm"><h4><a href="#jsonschema-required">jsonschema:required</a></h4><p>IRI: https://www.w3.org/2019/wot/json-schema#required</p><p><strong>a OWL Class</strong></p><em>required</em> - <span>Defines which members of the object type are mandatory.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>required</td><td><a href="#jsonschema-required">jsonschema:required</a></td></tr>
 <tr><td>unit</td><td><a href="#jsonschema-unit">jsonschema:unit</a></td></tr>
-<tr><td>string</td><td><a href="#jsonschema-stringschema">jsonschema:StringSchema</a></td></tr>
 <tr><td>maximum</td><td><a href="#jsonschema-maximum">jsonschema:maximum</a></td></tr>
+<tr><td>items</td><td><a href="#jsonschema-items">jsonschema:items</a></td></tr>
+<tr><td>boolean</td><td><a href="#jsonschema-booleanschema">jsonschema:BooleanSchema</a></td></tr>
 <tr><td>number</td><td><a href="#jsonschema-numberschema">jsonschema:NumberSchema</a></td></tr>
-<tr><td>minimum</td><td><a href="#jsonschema-minimum">jsonschema:minimum</a></td></tr>
-<tr><td>DataSchema</td><td><a href="#jsonschema-dataschema">jsonschema:DataSchema</a></td></tr>
+<tr><td>jsonschema</td><td><a href="#jsonschema-">jsonschema:</a></td></tr>
 <tr><td>writeOnly</td><td><a href="#jsonschema-writeonly">jsonschema:writeOnly</a></td></tr>
-<tr><td>properties</td><td><a href="#jsonschema-properties">jsonschema:properties</a></td></tr>
+<tr><td>enum</td><td><a href="#jsonschema-enum">jsonschema:enum</a></td></tr>
+<tr><td>array</td><td><a href="#jsonschema-arrayschema">jsonschema:ArraySchema</a></td></tr>
+<tr><td>object</td><td><a href="#jsonschema-objectschema">jsonschema:ObjectSchema</a></td></tr>
 <tr><td>readOnly</td><td><a href="#jsonschema-readonly">jsonschema:readOnly</a></td></tr>
-<tr><td>minItems</td><td><a href="#jsonschema-minitems">jsonschema:minItems</a></td></tr>
-<tr><td>jsonschema</td><td><a href="#jsonschema-">jsonschema:</a></td></tr>
-<tr><td>items</td><td><a href="#jsonschema-items">jsonschema:items</a></td></tr>
-<tr><td>required</td><td><a href="#jsonschema-required">jsonschema:required</a></td></tr>
-<tr><td>boolean</td><td><a href="#jsonschema-booleanschema">jsonschema:BooleanSchema</a></td></tr>
+<tr><td>minimum</td><td><a href="#jsonschema-minimum">jsonschema:minimum</a></td></tr>
+<tr><td>properties</td><td><a href="#jsonschema-properties">jsonschema:properties</a></td></tr>
+<tr><td>integer</td><td><a href="#jsonschema-integerschema">jsonschema:IntegerSchema</a></td></tr>
+<tr><td>DataSchema</td><td><a href="#jsonschema-dataschema">jsonschema:DataSchema</a></td></tr>
 <tr><td>maxItems</td><td><a href="#jsonschema-maxitems">jsonschema:maxItems</a></td></tr>
-<tr><td>array</td><td><a href="#jsonschema-arrayschema">jsonschema:ArraySchema</a></td></tr>
+<tr><td>null</td><td><a href="#jsonschema-nullschema">jsonschema:NullSchema</a></td></tr>
+<tr><td>oneOf</td><td><a href="#jsonschema-oneof">jsonschema:oneOf</a></td></tr>
+<tr><td>string</td><td><a href="#jsonschema-stringschema">jsonschema:StringSchema</a></td></tr>
+<tr><td>minItems</td><td><a href="#jsonschema-minitems">jsonschema:minItems</a></td></tr>
 <tr><td>const</td><td><a href="#jsonschema-const">jsonschema:const</a></td></tr></tbody></table></section>
 
 </body>

ontology/td.html

@@ -100,40 +100,40 @@ <h2>Introduction</h2>
 <section class="specterm"><h4><a href="#td-modified">td:modified</a></h4><p>IRI: https://www.w3.org/2019/wot/td#modified</p><p><strong>a OWL Class</strong></p><em>modified</em> - <span>Provides information when the TD instance was last modified.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#td-isobservable">td:isObservable</a></h4><p>IRI: https://www.w3.org/2019/wot/td#isObservable</p><p><strong>a OWL Class</strong></p><em>isObservable</em> - <span>A hint that indicates whether Servients hosting the Thing and Intermediaries should provide a Protocol Binding that supports the <code>observeproperty</code> operation for this Property.</span><table><tbody></tbody></table></section>
 <section class="specterm"><h4><a href="#td-instance">td:instance</a></h4><p>IRI: https://www.w3.org/2019/wot/td#instance</p><p><strong>a OWL Class</strong></p><em>instance</em> - <span>Provides a version identicator of this TD instance.</span><table><tbody></tbody></table></section>
-<section class="specterm"><h4><a href="#td-created">td:created</a></h4><p>IRI: https://www.w3.org/2019/wot/td#created</p><p><strong>a OWL Class</strong></p><em>created</em> - <span>Provides information when the TD instance was created.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>descriptions</td><td><a href="#td-descriptions">td:descriptions</a></td></tr>
+<section class="specterm"><h4><a href="#td-created">td:created</a></h4><p>IRI: https://www.w3.org/2019/wot/td#created</p><p><strong>a OWL Class</strong></p><em>created</em> - <span>Provides information when the TD instance was created.</span><table><tbody></tbody></table></section></section></section><section><h2>Term Mapping</h2><table><thead><tr><th>JSON String</th><th>Ontology Term</th></tr></thead><tbody><tr><td>base</td><td><a href="#td-baseuri">td:baseUri</a></td></tr>
 <tr><td>td</td><td><a href="#td-">td:</a></td></tr>
-<tr><td>links</td><td><a href="#td-haslink">td:hasLink</a></td></tr>
-<tr><td>securityDefinitions</td><td><a href="#td-securitydefinitions">td:securityDefinitions</a></td></tr>
-<tr><td>safe</td><td><a href="#td-issafe">td:isSafe</a></td></tr>
-<tr><td>instance</td><td><a href="#td-instance">td:instance</a></td></tr>
 <tr><td>name</td><td><a href="#td-name">td:name</a></td></tr>
-<tr><td>unit</td><td><a href="#td-defaultunit">td:defaultUnit</a></td></tr>
-<tr><td>idempotent</td><td><a href="#td-isidempotent">td:isIdempotent</a></td></tr>
-<tr><td>VersionInfo</td><td><a href="#td-versioninfo">td:VersionInfo</a></td></tr>
-<tr><td>subscription</td><td><a href="#td-hassubscriptionschema">td:hasSubscriptionSchema</a></td></tr>
-<tr><td>Thing</td><td><a href="#td-thing">td:Thing</a></td></tr>
-<tr><td>output</td><td><a href="#td-hasoutputschema">td:hasOutputSchema</a></td></tr>
-<tr><td>security</td><td><a href="#td-hassecurityconfiguration">td:hasSecurityConfiguration</a></td></tr>
+<tr><td>instance</td><td><a href="#td-instance">td:instance</a></td></tr>
+<tr><td>descriptions</td><td><a href="#td-descriptions">td:descriptions</a></td></tr>
+<tr><td>forms</td><td><a href="#td-hasform">td:hasForm</a></td></tr>
 <tr><td>modified</td><td><a href="#td-modified">td:modified</a></td></tr>
+<tr><td>created</td><td><a href="#td-created">td:created</a></td></tr>
+<tr><td>securityDefinitions</td><td><a href="#td-securitydefinitions">td:securityDefinitions</a></td></tr>
+<tr><td>PropertyAffordance</td><td><a href="#td-propertyaffordance">td:PropertyAffordance</a></td></tr>
+<tr><td>output</td><td><a href="#td-hasoutputschema">td:hasOutputSchema</a></td></tr>
 <tr><td>ActionAffordance</td><td><a href="#td-actionaffordance">td:ActionAffordance</a></td></tr>
-<tr><td>title</td><td><a href="#td-title">td:title</a></td></tr>
-<tr><td>actions</td><td><a href="#td-hasactionaffordance">td:hasActionAffordance</a></td></tr>
-<tr><td>forms</td><td><a href="#td-hasform">td:hasForm</a></td></tr>
-<tr><td>base</td><td><a href="#td-baseuri">td:baseUri</a></td></tr>
-<tr><td>events</td><td><a href="#td-haseventaffordance">td:hasEventAffordance</a></td></tr>
+<tr><td>Thing</td><td><a href="#td-thing">td:Thing</a></td></tr>
+<tr><td>EventAffordance</td><td><a href="#td-eventaffordance">td:EventAffordance</a></td></tr>
 <tr><td>data</td><td><a href="#td-hasnotificationschema">td:hasNotificationSchema</a></td></tr>
-<tr><td>created</td><td><a href="#td-created">td:created</a></td></tr>
+<tr><td>properties</td><td><a href="#td-haspropertyaffordance">td:hasPropertyAffordance</a></td></tr>
 <tr><td>description</td><td><a href="#td-description">td:description</a></td></tr>
-<tr><td>EventAffordance</td><td><a href="#td-eventaffordance">td:EventAffordance</a></td></tr>
-<tr><td>InteractionAffordance</td><td><a href="#td-interactionaffordance">td:InteractionAffordance</a></td></tr>
+<tr><td>safe</td><td><a href="#td-issafe">td:isSafe</a></td></tr>
+<tr><td>cancellation</td><td><a href="#td-hascancellationschema">td:hasCancellationSchema</a></td></tr>
+<tr><td>security</td><td><a href="#td-hassecurityconfiguration">td:hasSecurityConfiguration</a></td></tr>
 <tr><td>version</td><td><a href="#td-versioninfo">td:versionInfo</a></td></tr>
-<tr><td>uriVariables</td><td><a href="#td-hasuritemplatevariable">td:hasUriTemplateVariable</a></td></tr>
+<tr><td>links</td><td><a href="#td-haslink">td:hasLink</a></td></tr>
 <tr><td>input</td><td><a href="#td-hasinputschema">td:hasInputSchema</a></td></tr>
+<tr><td>uriVariables</td><td><a href="#td-hasuritemplatevariable">td:hasUriTemplateVariable</a></td></tr>
+<tr><td>idempotent</td><td><a href="#td-isidempotent">td:isIdempotent</a></td></tr>
 <tr><td>observable</td><td><a href="#td-isobservable">td:isObservable</a></td></tr>
-<tr><td>support</td><td><a href="#td-supportcontact">td:supportContact</a></td></tr>
-<tr><td>PropertyAffordance</td><td><a href="#td-propertyaffordance">td:PropertyAffordance</a></td></tr>
-<tr><td>cancellation</td><td><a href="#td-hascancellationschema">td:hasCancellationSchema</a></td></tr>
-<tr><td>properties</td><td><a href="#td-haspropertyaffordance">td:hasPropertyAffordance</a></td></tr></tbody></table></section>
+<tr><td>title</td><td><a href="#td-title">td:title</a></td></tr>
+<tr><td>unit</td><td><a href="#td-defaultunit">td:defaultUnit</a></td></tr>
+<tr><td>actions</td><td><a href="#td-hasactionaffordance">td:hasActionAffordance</a></td></tr>
+<tr><td>VersionInfo</td><td><a href="#td-versioninfo">td:VersionInfo</a></td></tr>
+<tr><td>subscription</td><td><a href="#td-hassubscriptionschema">td:hasSubscriptionSchema</a></td></tr>
+<tr><td>InteractionAffordance</td><td><a href="#td-interactionaffordance">td:InteractionAffordance</a></td></tr>
+<tr><td>events</td><td><a href="#td-haseventaffordance">td:hasEventAffordance</a></td></tr>
+<tr><td>support</td><td><a href="#td-supportcontact">td:supportContact</a></td></tr></tbody></table></section>
 
     <section>
         <h2>Examples</h2>