Merge branch 'master' into issue-430-containers

Author: gkellogg

spec/latest/common/terms.html

@@ -88,7 +88,7 @@ <h1>General Terminology</h1>
       When executing an algorithm, the graph where data should be placed
       if a <a>named graph</a> is not specified.</dd>
     <dt><dfn>default language</dfn></dt><dd>
-      The default language is set in the <a>context</a> using the <code>@language</code> key who's
+      The default language is set in the <a>context</a> using the <code>@language</code> key whose
       value MUST be a <a>string</a> representing a [[!BCP47]] language code or <a>null</a>.</dd>
     <dt><dfn>default object</dfn></dt><dd>
       A <a>default object</a> is a <a>JSON object</a> that has a <code>@default</code> member.</dd>
@@ -119,7 +119,7 @@ <h1>General Terminology</h1>
       be equivalent to the referencing key.</dd>
      <dt><dfn data-lt="index maps">index map</dfn></dt><dd>
       An <a>index map</a> is a <a>JSON object</a> value of a <a>term</a> defined with
-      <code>@container</code> set to <code>@index</code>, who's values MUST be any of the following types:
+      <code>@container</code> set to <code>@index</code>, whose values MUST be any of the following types:
         <a>string</a>,
         <a>number</a>,
         <a>true</a>,
@@ -146,7 +146,7 @@ <h1>General Terminology</h1>
       in the section titled <cite><a href="http://www.w3.org/TR/json-ld/#syntax-tokens-and-keywords">Syntax Tokens and Keywords</a></cite>.</dd>
     <dt><dfn data-lt="language maps">language map</dfn></dt><dd>
       An <a>language map</a> is a <a>JSON object</a> value of a <a>term</a> defined with
-      <code>@container</code> set to <code>@language</code>, who's keys MUST be <a>strings</a> representing
+      <code>@container</code> set to <code>@language</code>, whose keys MUST be <a>strings</a> representing
       [[!BCP47]] language codes and the values MUST be any of the following types:
         <a>null</a>,
         <a>string</a>, or
@@ -270,7 +270,7 @@ <h1>General Terminology</h1>
       A <a>value object</a> is a <a>JSON object</a> that has an <code>@value</code>
       member.</dd>
     <dt><dfn>vocabulary mapping</dfn></dt><dd>
-      The vocabulary mapping is set in the <a>context</a> using the <code>@vocab</code> key who's
+      The vocabulary mapping is set in the <a>context</a> using the <code>@vocab</code> key whose
       value MUST be an <a>absolute IRI</a> <a>null</a>.</dd>
   </dl>
 </section>

test-suite/tests/error-manifest.jsonld

@@ -317,17 +317,16 @@
       "name": "Invalid keyword in term definition",
       "purpose": "Verifies that an exception is raised on expansion when a invalid term definition is found",
       "input": "error-c001-in.jsonld",
-      "expect": "invalid term definition"
+      "expect": "invalid term definition",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm021",
       "@type": [ "jld:NegativeEvaluationTest", "jld:FlattenTest" ],
       "name": "Invalid container mapping",
       "purpose": "Verifies that an exception is raised on expansion when a invalid container mapping is found",
       "input": "error-m021-in.jsonld",
       "expect": "invalid container mapping",
-      "option": {
-        "processingMode": "json-ld-1.1"
-      }
+      "option": {"processingMode": "json-ld-1.1"}
     }
   ]
 }