--- a/spec/latest/json-ld-syntax/index.html	Tue Apr 10 11:44:23 2012 +0800
+++ b/spec/latest/json-ld-syntax/index.html	Tue Apr 10 11:58:28 2012 +0800
@@ -563,11 +563,11 @@
 <section>
 <h3>The Context</h3>
 
-<p>In JSON-LD, a <tdef>context</tdef> is used to map <tref>term</tref>s, i.e., keys with associated values
-  in an JSON document, to <tref>IRI</tref>s. A <tdef>term</tdef> is a short word that expands to an
-  <tref>IRI</tref>. A <tref>term</tref> MUST have the lexical form of <cite><a
-  href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-NCName">NCName</a></cite>
-  (see [[XML-NAMES]]).</p>
+<p>In JSON-LD, a <tdef>context</tdef> is used to map <tref>term</tref>s, i.e., properties with associated
+  values in an JSON document, to <tref>IRI</tref>s. A <tdef>term</tdef> is a short word that expands to an
+  <tref>IRI</tref>. <tref>Term</tref>s MAY be defined as any valid JSON <tref>string</tref>. To avoid
+  forward-compatibility issues, <tref>term</tref>s starting with an <code>@</code> character SHOULD NOT be used
+  as they might be used as <a href="#syntax-tokens-and-keywords">keywords</a> in future versions of JSON-LD.</p>
 <p>The Web uses <tref title="IRI">IRIs</tref> for unambiguous identification. The
   idea is that these <tref>term</tref>s mean something that may be of use to other developers and that it is useful to
   give them an unambiguous identifier. That is, it is useful for <tref>term</tref>s to expand to IRIs so that