--- a/model/prov-n.html Tue Mar 27 10:19:49 2012 +0100
+++ b/model/prov-n.html Tue Mar 27 10:41:49 2012 +0100
@@ -285,9 +285,9 @@
<h3>PROV-DM Namespace</h3>
-<p>The PROV-DM namespace is <span class="name">http://www.w3.org/ns/prov/</span>.</p>
+<p>The PROV namespace is <span class="name">http://www.w3.org/ns/prov#</span>.</p>
-<p> All the elements, relations, reserved names and attributes introduced in this specification belong to the PROV-DM namespace.</p>
+<p> All the elements, relations, reserved names and attributes introduced in this specification belong to the PROV namespace.</p>
</section>
<section id="conventions">
@@ -1472,18 +1472,19 @@
<span class="name">default</span> <span class="nonterminal">IRI</span> <br/>
</div>
-<p>In PROV-N, the following prefix are reserved:
+<p>In PROV-N, the following prefixes are reserved:
<ul>
-<li> <span class="name">prov</span> denotes the PROV namespace <span class="name">http://www.w3.org/ns/prov/</span></li>
+<li> <span class="name">prov</span> denotes the PROV namespace <span class="name">http://www.w3.org/ns/prov#</span></li>
<li> <span class="name">xsd</span> denotes the XML Schema namespace <span class="name">http://www.w3.org/2001/XMLSchema</span>.
</li>
</ul>
<p>A PROV-N document MUST NOT redeclare prefixes <span class="name">prov</span> and <span class="name">xsd</span>.</p>
<div class="anexample" id="anexample-namespace">
-The following example declares two namespaces.
+<p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
<pre class="codeexample">
container
+ default <http://example.org/0/>
prefix ex1 <http://example.org/1/>
prefix ex2 <http://example.org/2/>
...
@@ -1500,7 +1501,7 @@
<h4>Identifier</h4>
<p>
-A PROV <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
+A <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
PROV-DM stipulates that a qualified name can be mapped into an IRI
by concatenating the IRI associated with the prefix and the local part.
<p>A qualified name's prefix is OPTIONAL. If a prefix occurs in a
@@ -1531,37 +1532,42 @@
<p>A PROV qualified name has a more permissive syntax then XML's <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a> [[!XML-NAMES]] since it allows any syntax for its local part provided that the concatenation with the namespace results in a valid IRI [[!IRI]]. </p>
<div class="anexample" id="anexample-qualified-name">
-Examples of articles on the BBC web site seen as entities.
+<p>Examples of articles on the BBC Web site seen as entities.</p>
<pre class="codeexample">
container
prefix bbc <http://www.bbc.co.uk/>
prefix bbcNews <http://www.bbc.co.uk/news/>
- entity(bbc:) // bbc site itself
- entity(bbc:news/) // bbc news
- entity(bbc:news/world-asia-17507976) // a given news article
+ entity(bbc:) // bbc site itself
+ entity(bbc:news/) // bbc news
+ entity(bbc:news/world-asia-17507976) // a given news article
- entity(bbcNews:) // an alternative way of referring to the bbc news site
+ entity(bbcNews:) // an alternative way of referring to the bbc news site
end
</pre>
</div>
<div class="anexample" id="anexample-qualified-name">
-Examples of entities with declared and default namespace.
+<p>Examples of entities with declared and default namespace.</p>
<pre class="codeexample">
container
+ default <http://example.org/2/>
prefix ex <http://example.org/1/>
- default <http://example.org/2/>
entity(ex:a) // corresponds to IRI http://example.org/1/a
entity(ex:a/) // corresponds to IRI http://example.org/1/a/
entity(ex:a/b) // corresponds to IRI http://example.org/1/a/b
entity(b) // corresponds to IRI http://example.org/2/b
+ entity(ex:1234) // corresponds to IRI http://example.org/2/1234
+ entity(4567) // corresponds to IRI http://example.org/2/4567
end
</pre>
</div>
+<div class="note">We need to explicitly disallow '<span class="name">-</span>' as first and only character of local part. Instead, it should be encoded as <span class="name">pct-encoded</span> [[!RFC3987]].
+</div>
+
</section>
<section id="expression-attribute">
@@ -1603,15 +1609,15 @@
<span class="nonterminal">stringLiteral</span> ::= <span class="nonterminal">quotedString</span><br/>
<span class="nonterminal">quotedString</span> ::= <em>a finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
#x5C), enclosed in a pair of " (#x22) characters</em><br/>
-<span class="nonterminal">intLiteral</span> ::= <em>a finite-length sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
+<span class="nonterminal">intLiteral</span> ::= <em>a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
</div>
<p>The non terminals <span class="nonterminal">stringLiteral</span> and
<span class="nonterminal">intLiteral</span>
-are syntactic sugar for quoted strings with datatype <span class="name">xsd:string</span> and <span class="name">xsd:int</span>, respectively.
+are syntactic sugar for quoted strings with datatype <a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a> and <a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, respectively.
</p>
-<p> In particular, a PROV-DM Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>); such IRI has no specific interpretation in the context of PROV-DM.</p>
+<p> In particular, a Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>); such IRI has no specific interpretation in the context of PROV.</p>
<table border="1" style="margin-left: auto; margin-right: auto;">
<caption id="permitted-datatypes">Permitted datatypes in literals</caption>