Merge remote-tracking branch 'origin/master' into final-cg-reports

Author: gkellogg

spec/CG-FINAL/json-ld/20180607/index.html

@@ -2050,6 +2050,7 @@ <h4 id="x4-3-1-using-the-document-base-as-the-default-vocabulary"><span class="s
       IRIs</a>.</p>
   <div class="example"><div class="example-title marker"><span>Example 21</span><span style="text-transform: none">: Using "" as the vocabulary mapping</span></div><pre class="nohighlight" data-base="http://example/document">{
   "@context": {
+    <span class="hl-bold">"@version": 1.1,</span>
     <span class="hl-bold">"@base": "http://example/document",</span>
     "@vocab": <span class="hl-bold">""</span>
   },

spec/latest/json-ld/index.html

@@ -1097,6 +1097,7 @@ <h3>Using the Document Base as the Default Vocabulary</h3>
   <!--
     {
       "@context": {
+        ****"@version": 1.1,****
         ****"@base": "http://example/document",****
         "@vocab": ****""****
       },