Merge branch 'master' of https://github.com/json-ld/json-ld.org
authorFrançois Daoust <francois@joshfire.com>
Wed, 07 Nov 2012 21:53:19 +0100
changeset 954 53093d2aea42
parent 953 7c865ca3dc13 (current diff)
parent 938 70f77a964666 (diff)
child 955 b82bdd175e94
Merge branch 'master' of https://github.com/json-ld/json-ld.org
spec/latest/json-ld-syntax/index.html
--- a/spec/latest/json-ld-api/index.html	Wed Nov 07 21:50:41 2012 +0100
+++ b/spec/latest/json-ld-api/index.html	Wed Nov 07 21:53:19 2012 +0100
@@ -1517,8 +1517,6 @@
           <li>Otherwise, if the <em>property</em> is <code>@type</code>:
             <ol class="algorithm">
               <li>If <em>value</em> is a <tref>string</tref>, expand according to <a href="#iri-expansion">IRI Expansion</a>.</li>
-              <li>Otherwise, if <em>value</em> is a <tref>JSON Object</tref>, it must be empty (used for
-                <cite><a href="../json-ld-framing/#framing">Framing</a></cite>).</li>
               <li>Otherwise, if <em>value</em> is an <tref>array</tref>, all elements must be <tref>string</tref>s.
                 Expand <em>value</em> for each of its entries according to <a href="#iri-expansion">IRI Expansion</a>.</li>
             </ol>
--- a/spec/latest/json-ld-syntax/index.html	Wed Nov 07 21:50:41 2012 +0100
+++ b/spec/latest/json-ld-syntax/index.html	Wed Nov 07 21:53:19 2012 +0100
@@ -199,12 +199,10 @@
 </ul>
 
 <p>Developers that require any of the facilities listed above will find JSON-LD
-  of interest. The syntax does not necessarily require applications to change their
-  JSON, but allows one to easily add meaning by simply adding or referencing a context.
-  The syntax is designed to not disturb already deployed systems running on JSON,
-  but provide a smooth upgrade path from JSON to JSON-LD. Finally, the format is
-  intended to be easy to parse, efficient to generate, and can operate inside of
-  devices that contain very little memory.</p>
+  of interest. The syntax is designed to not disturb already deployed systems
+  running on JSON, but provide a smooth upgrade path from JSON to JSON-LD.
+  Finally, the format is intended to be easy to parse, efficient to generate,
+  and can operate inside of devices that contain very little memory.</p>
 
 
 <section>
@@ -267,11 +265,10 @@
  <dt>Zero Edits, most of the time</dt>
  <dd>JSON-LD must provide a
  <a href="#referencing-contexts-from-json-documents">mechanism</a>
- that allows developers to specify <tref>context</tref> in a way that is
- out-of-band.
- This allows organizations that have
- already deployed large JSON-based infrastructure to add meaning to their
- JSON documents in a way that is not disruptive to their day-to-day operations and is
+ that allows developers to reference <tref title="context">contexts</tref> in
+ responses using plain old JSON. This allows organizations that have
+ already deployed large JSON-based infrastructure to use JSON-LD's features
+ in a way that is not disruptive to their day-to-day operations and is
  transparent to their current customers. At times, mapping JSON to
  a graph representation can become difficult. In these instances, rather than
  having JSON-LD support an esoteric use case, we chose not to support the
@@ -664,7 +661,7 @@
 <strong>homepage</strong>, and <strong>depiction</strong>,
 are defined in a <tref>context</tref>, and that context is used to resolve the
 names in <tref title="JSON object">JSON objects</tref>, machines are able to automatically expand the terms to
-something meaningful and unambiguous, like this:</p>
+something unambiguous like this:</p>
 
 <pre class="example" data-transform="updateExample"
      title="Expanded terms">
@@ -763,8 +760,7 @@
 <p>JSON keys that do not expand to an absolute IRI are ignored, or removed
 in some cases, by the [[JSON-LD-API]]. However, JSON keys that do not include
 a mapping in the <tref>context</tref> are still considered valid expressions
-in JSON-LD documents - the keys just don't have any machine-readable,
-semantic meaning.</p>
+in JSON-LD documents - the keys just don't expand to unambiguous identifiers.</p>
 
 <p><tref title="prefix">Prefixes</tref> are expanded when the form of the value is a
   <tref>compact IRI</tref> represented as a <code>prefix:suffix</code>
@@ -2458,8 +2454,7 @@
   application-specific compacted form by first <a href="#expanded-document-form"></a>.
   While the context provided above mapped <code>http://xmlns.com/foaf/0.1/name</code>
   to <strong>name</strong>, it could have also mapped it to any arbitrary string
-  provided by the developer. This powerful mechanism, along with another
-  JSON-LD API technique called <em>framing</em>, allows the developer to
+  provided by the developer. This powerful mechanism allows the developer to
   re-shape the incoming JSON data into a format that is optimized for
   their application.</p>
 </section>