You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by bu...@apache.org on 2013/06/20 12:18:36 UTC

svn commit: r866584 [10/21] - in /websites/staging/jena/trunk/content: ./ documentation/assembler/ documentation/inference/ documentation/io/ documentation/javadoc/arq/ documentation/javadoc/fuseki/ documentation/javadoc/jena/ documentation/javadoc/lar...

Modified: websites/staging/jena/trunk/content/documentation/query/negation.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/negation.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/negation.html Thu Jun 20 10:18:34 2013
@@ -162,12 +162,12 @@ complexity increases. ARQ supports addit
 negation.</p>
 <p>The <code>EXISTS</code> and <code>NOT EXISTS</code> are now legal SPARQL 1.1 when used inside a <code>FILTER</code>, 
 they may be used as bare graph patterns only when <code>Syntax.syntaxARQ</code> is used</p>
-<div class="codehilite"><pre><span class="c1"># Names of people who have not stated that they know anyone</span>
-<span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span>  <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-    <span class="n">OPTIONAL</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span> <span class="p">}</span> <span class="o">.</span>
-    <span class="n">FILTER</span> <span class="p">(</span><span class="o">!</span><span class="n">BOUND</span><span class="p">(?</span><span class="n">who</span><span class="p">))</span>
+<div class="codehilite"><pre><span class="c"># Names of people who have not stated that they know anyone</span>
+<span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span>  ?<span class="n">name</span> <span class="p">.</span>
+    <span class="n">OPTIONAL</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="nb">who</span> <span class="p">}</span> <span class="p">.</span>
+    <span class="n">FILTER</span> <span class="p">(</span><span class="o">!</span><span class="n">BOUND</span><span class="p">(</span>?<span class="nb">who</span><span class="p">))</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -176,21 +176,21 @@ they may be used as bare graph patterns 
 for <code>NOT EXISTS</code>) which acts at the point in the query where it is
 written. It does not bind any variables but variables aready boudn
 in the query will have their bound value.</p>
-<div class="codehilite"><pre><span class="c1"># Names of people who have not stated that they know anyone</span>
-<span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-    <span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span> <span class="p">}</span>
+<div class="codehilite"><pre><span class="c"># Names of people who have not stated that they know anyone</span>
+<span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span> ?<span class="n">name</span> <span class="p">.</span>
+    <span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="nb">who</span> <span class="p">}</span>
       <span class="p">}</span>
 </pre></div>
 
 
 <p>There is also an <code>EXISTS</code> operator.</p>
-<div class="codehilite"><pre><span class="c1"># Names of people where it is stated that they know at least one other person.</span>
-<span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-    <span class="n">EXISTS</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span> <span class="o">.</span> <span class="n">FILTER</span><span class="p">(?</span><span class="n">who</span> <span class="o">!=</span> <span class="p">?</span><span class="n">x</span><span class="p">)</span> <span class="p">}</span>
+<div class="codehilite"><pre><span class="c"># Names of people where it is stated that they know at least one other person.</span>
+<span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span> ?<span class="n">name</span> <span class="p">.</span>
+    <span class="n">EXISTS</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="nb">who</span> <span class="p">.</span> <span class="n">FILTER</span><span class="p">(</span>?<span class="nb">who</span> <span class="o">!=</span> ?<span class="n">x</span><span class="p">)</span> <span class="p">}</span>
       <span class="p">}</span>
 </pre></div>
 
@@ -201,32 +201,32 @@ will always match, possible with no addi
 <p><code>NOT EXISTS</code> and <code>EXISTS</code> can also be used in <code>FILTER</code> expressions.
 In SPARQL, <code>FILTER</code> expressions act over the whole of the basic
 graph pattern in which they occur.</p>
-<div class="codehilite"><pre><span class="c1"># Names of people who have not stated that they know anyone</span>
-<span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span> <span class="p">})</span>
+<div class="codehilite"><pre><span class="c"># Names of people who have not stated that they know anyone</span>
+<span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span> ?<span class="n">name</span> <span class="p">.</span>
+    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="nb">who</span> <span class="p">})</span>
       <span class="p">}</span>
 </pre></div>
 
 
 <p>A note of caution:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">y</span> <span class="p">})</span>
-        <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span> ?<span class="n">name</span> <span class="p">.</span>
+    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">y</span> <span class="p">})</span>
+        ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">who</span>
       <span class="p">}</span>
 </pre></div>
 
 
 <p>is the same as (it's a single basic graph pattern - the filter does
 not break it in two):</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">foaf:</span> <span class="sr">&lt;http://xmlns.com/foaf/0.1/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">name</span>
-<span class="n">WHERE</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:givenName</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
-        <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">y</span> <span class="o">.</span>
-    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">who</span> <span class="p">})</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">foaf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">xmlns</span><span class="p">.</span><span class="n">com</span><span class="o">/</span><span class="n">foaf</span><span class="o">/</span>0<span class="p">.</span>1<span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">name</span>
+<span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">givenName</span> ?<span class="n">name</span> <span class="p">.</span>
+        ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">y</span> <span class="p">.</span>
+    <span class="n">FILTER</span> <span class="p">(</span><span class="n">NOT</span> <span class="n">EXISTS</span> <span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">who</span> <span class="p">})</span>
       <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/jena/trunk/content/documentation/query/property_paths.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/property_paths.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/property_paths.html Thu Jun 20 10:18:34 2013
@@ -309,14 +309,14 @@ searched.</p>
 is parsed with language <code>Syntax.syntaxARQ</code>.</p>
 <p>Paths can be directly included in the query in the property
 position of a triple pattern:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span>     <span class="sr">&lt;http://example/&gt;</span>
-<span class="n">PREFIX</span> <span class="n">rdf:</span>  <span class="sr">&lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;</span>
-<span class="n">PREFIX</span> <span class="n">rdfs:</span> <span class="sr">&lt;http://www.w3.org/2000/01/rdf-schema#&gt;</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span>     <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
+<span class="n">PREFIX</span> <span class="n">rdf</span><span class="p">:</span>  <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>1999<span class="o">/</span>02<span class="o">/</span>22<span class="o">-</span><span class="n">rdf</span><span class="o">-</span><span class="n">syntax</span><span class="o">-</span><span class="n">ns</span>#<span class="o">&gt;</span>
+<span class="n">PREFIX</span> <span class="n">rdfs</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>2000<span class="o">/</span>01<span class="o">/</span><span class="n">rdf</span><span class="o">-</span><span class="n">schema</span>#<span class="o">&gt;</span>
 
-<span class="c1"># Find the types of :x, following subClassOf</span>
+# <span class="n">Find</span> <span class="n">the</span> <span class="n">types</span> <span class="n">of</span> <span class="p">:</span><span class="n">x</span><span class="p">,</span> <span class="n">following</span> <span class="n">subClassOf</span>
 <span class="n">SELECT</span> <span class="o">*</span>
 <span class="p">{</span>
-   <span class="p">:</span><span class="n">x</span>  <span class="n">rdf:type</span><span class="o">/</span><span class="n">rdfs:subClassOf</span><span class="o">*</span>  <span class="p">?</span><span class="n">t</span>
+   <span class="p">:</span><span class="n">x</span>  <span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">/</span><span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span><span class="o">*</span>  ?<span class="n">t</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -325,60 +325,60 @@ position of a triple pattern:</p>
 <h3 id="simple-paths">Simple Paths</h3>
 <p>Find the name of any people that Alice knows.</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span><span class="o">/</span><span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span><span class="o">/</span><span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Find the names of people 2 "<code>foaf:knows</code>" links away.</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span><span class="sr">/foaf:knows/</span><span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span><span class="o">/</span><span class="n">foaf</span><span class="p">:</span><span class="n">knows</span><span class="o">/</span><span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>This is the same as the strict SPARQL query:</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span>  <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span>  <span class="n">foaf:knows</span> <span class="p">[</span> <span class="n">foaf:knows</span> <span class="p">[</span> <span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span> <span class="p">]]</span><span class="o">.</span>
+  ?<span class="n">x</span>  <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span>  <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> <span class="p">[</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> <span class="p">[</span> <span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span> <span class="p">]].</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>or, with explicit variables:</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span>  <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span>  <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">a1</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">a1</span> <span class="n">foaf:knows</span> <span class="p">?</span><span class="n">a2</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">a2</span> <span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
+  ?<span class="n">x</span>  <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span>  <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">a1</span> <span class="p">.</span>
+  ?<span class="n">a1</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">a2</span> <span class="p">.</span>
+  ?<span class="n">a2</span> <span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Because someone Alice knows may well know Alice, the example above
 may include Alice herself. This could be avoided with:</p>
-<div class="codehilite"><pre><span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span><span class="o">/</span><span class="n">foaf:knows</span> <span class="p">?</span><span class="n">y</span> <span class="o">.</span>
-  <span class="n">FILTER</span> <span class="p">(</span> <span class="p">?</span><span class="n">x</span> <span class="o">!=</span> <span class="p">?</span><span class="n">y</span> <span class="p">)</span>
-  <span class="p">?</span><span class="n">y</span> <span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span>
+<div class="codehilite"><pre><span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span><span class="o">/</span><span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">y</span> <span class="p">.</span>
+  <span class="n">FILTER</span> <span class="p">(</span> ?<span class="n">x</span> !<span class="p">=</span> ?<span class="n">y</span> <span class="p">)</span>
+  ?<span class="n">y</span> <span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>These two are the same query: the second is just reversing the
 property direction which swaps the roles of subject and object.</p>
-<div class="codehilite"><pre><span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="p">}</span>
+<div class="codehilite"><pre><span class="p">{</span> ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">}</span>
 
-<span class="p">{</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">^</span><span class="n">foaf:mbox</span> <span class="p">?</span><span class="n">x</span> <span class="p">}</span>
+<span class="p">{</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> ^<span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> ?<span class="n">x</span> <span class="p">}</span>
 </pre></div>
 
 
 <p>Mutual <code>foaf:knows</code> relationships: <code>?x</code> knows someone who knows
 <code>?x</code></p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span><span class="o">^</span><span class="n">foaf:knows</span> <span class="p">?</span><span class="n">x</span> <span class="o">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span>^<span class="n">foaf</span><span class="p">:</span><span class="n">knows</span> ?<span class="n">x</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -387,11 +387,11 @@ property direction which swaps the roles
 properties that must not match. Match if there is a triple from
 <code>?x</code> to <code>?y</code> which is not <code>rdf:type</code>.</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="o">!</span><span class="n">rdf:type</span> <span class="p">?</span><span class="n">y</span> <span class="o">.</span>
+  ?<span class="n">x</span> !<span class="n">rdf</span><span class="p">:</span><span class="n">type</span> ?<span class="n">y</span> <span class="p">.</span>
 <span class="p">}</span>
 
 <span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="o">!</span><span class="p">(</span><span class="n">rdf:type</span><span class="o">|^</span><span class="n">rdf:type</span><span class="p">)</span> <span class="p">?</span><span class="n">y</span> <span class="o">.</span>
+  ?<span class="n">x</span> !<span class="p">(</span><span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">|</span>^<span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="p">)</span> ?<span class="n">y</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -402,8 +402,8 @@ property set, not a full path expression
 <p>Find the names of all the people can be reached from Alice by
 <code>foaf:knows</code>:</p>
 <div class="codehilite"><pre><span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:mbox</span> <span class="sr">&lt;mailto:alice@example&gt;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">foaf:knows</span><span class="o">+/</span><span class="n">foaf:name</span> <span class="p">?</span><span class="n">name</span> <span class="o">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">mbox</span> <span class="o">&lt;</span><span class="n">mailto</span><span class="p">:</span><span class="n">alice</span><span class="p">@</span><span class="n">example</span><span class="o">&gt;</span> <span class="p">.</span>
+  ?<span class="n">x</span> <span class="n">foaf</span><span class="p">:</span><span class="n">knows</span><span class="o">+/</span><span class="n">foaf</span><span class="p">:</span><span class="n">name</span> ?<span class="n">name</span> <span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -412,12 +412,12 @@ property set, not a full path expression
 likely to include Alice herself.</p>
 <p>Some forms of limited inference are possible as well. For example:
 all types and supertypes of a resource:</p>
-<div class="codehilite"><pre><span class="p">{</span> <span class="sr">&lt;http://example/&gt;</span> <span class="n">rdf:type</span><span class="o">/</span><span class="n">rdfs:subClassOf</span><span class="o">*</span> <span class="p">?</span><span class="n">type</span> <span class="p">}</span>
+<div class="codehilite"><pre><span class="p">{</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">/</span><span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span><span class="o">*</span> ?<span class="n">type</span> <span class="p">}</span>
 </pre></div>
 
 
 <p>All resources and all their inferred types:</p>
-<div class="codehilite"><pre><span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">rdf:type</span><span class="o">/</span><span class="n">rdfs:subClassOf</span><span class="o">*</span> <span class="p">?</span><span class="n">type</span> <span class="p">}</span>
+<div class="codehilite"><pre><span class="p">{</span> ?<span class="n">x</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">/</span><span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span><span class="o">*</span> ?<span class="n">type</span> <span class="p">}</span>
 </pre></div>
 
 
@@ -426,24 +426,24 @@ all types and supertypes of a resource:<
 <a href="extension.html#propertyFunctions">property function</a> to be
 referred to by URI. This way, when the URI is used in the predicate
 location in a triple pattern, the path expression is evaluated.</p>
-<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="o">=</span> <span class="o">...</span>
-<span class="n">String</span> <span class="n">uri</span> <span class="o">=</span> <span class="o">...</span>
-<span class="n">PathLib</span><span class="o">.</span><span class="n">install</span><span class="p">(</span><span class="n">uri</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="p">=</span> <span class="p">...</span>
+<span class="n">String</span> <span class="n">uri</span> <span class="p">=</span> <span class="p">...</span>
+<span class="n">PathLib</span><span class="p">.</span><span class="n">install</span><span class="p">(</span><span class="n">uri</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
 </pre></div>
 
 
 <p>For example:</p>
-<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="o">=</span> <span class="n">PathParser</span><span class="o">.</span><span class="n">parse</span><span class="p">(</span><span class="s">&quot;rdf:type/rdfs:subClassOf*&quot;</span><span class="p">,</span> <span class="n">PrefixMapping</span><span class="o">.</span><span class="n">Standard</span><span class="p">)</span> <span class="p">;</span>
-<span class="n">String</span> <span class="n">uri</span> <span class="o">=</span> <span class="s">&quot;http://example/ns#myType&quot;</span> <span class="p">;</span>
-<span class="n">PathLib</span><span class="o">.</span><span class="n">install</span><span class="p">(</span><span class="n">uri</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="p">=</span> <span class="n">PathParser</span><span class="p">.</span><span class="n">parse</span><span class="p">(</span>&quot;<span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">/</span><span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span><span class="o">*</span>&quot;<span class="p">,</span> <span class="n">PrefixMapping</span><span class="p">.</span><span class="n">Standard</span><span class="p">)</span> <span class="p">;</span>
+<span class="n">String</span> <span class="n">uri</span> <span class="p">=</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/</span><span class="n">ns</span>#<span class="n">myType</span>&quot; <span class="p">;</span>
+<span class="n">PathLib</span><span class="p">.</span><span class="n">install</span><span class="p">(</span><span class="n">uri</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
 </pre></div>
 
 
 <p>and the SPARQL query:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="sr">&lt;http://example/&gt;</span>
-<span class="n">PREFIX</span> <span class="n">ns:</span> <span class="sr">&lt;http://example/ns#&gt;</span>
-<span class="c1"># Find the types of :x, following subClassOf</span>
-<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span> <span class="p">:</span><span class="n">x</span> <span class="n">ns:myType</span> <span class="p">?</span><span class="n">t</span><span class="p">}</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
+<span class="n">PREFIX</span> <span class="n">ns</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/</span><span class="n">ns</span>#<span class="o">&gt;</span>
+# <span class="n">Find</span> <span class="n">the</span> <span class="n">types</span> <span class="n">of</span> <span class="p">:</span><span class="n">x</span><span class="p">,</span> <span class="n">following</span> <span class="n">subClassOf</span>
+<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span> <span class="p">:</span><span class="n">x</span> <span class="n">ns</span><span class="p">:</span><span class="n">myType</span> ?<span class="n">t</span><span class="p">}</span>
 </pre></div>
 
 
@@ -452,8 +452,8 @@ a path expression is not interpreted as 
 for example, <code>rdf:type</code> can be redefined as a path that also
 considers RDFS sub -class relationships. The path is a complex path
 so the property function for <code>rdf:type</code> is not triggered.</p>
-<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="o">=</span> <span class="n">PathParser</span><span class="o">.</span><span class="n">parse</span><span class="p">(</span><span class="s">&quot;rdf:type/rdfs:subClassOf*&quot;</span><span class="p">,</span> <span class="n">PrefixMapping</span><span class="o">.</span><span class="n">Standard</span><span class="p">)</span> <span class="p">;</span>
-<span class="n">PathLib</span><span class="o">.</span><span class="n">install</span><span class="p">(</span><span class="n">RDF</span><span class="o">.</span><span class="n">type</span><span class="o">.</span><span class="n">getURI</span><span class="p">(),</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre><span class="n">Path</span> <span class="n">path</span> <span class="p">=</span> <span class="n">PathParser</span><span class="p">.</span><span class="n">parse</span><span class="p">(</span>&quot;<span class="n">rdf</span><span class="p">:</span><span class="n">type</span><span class="o">/</span><span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span><span class="o">*</span>&quot;<span class="p">,</span> <span class="n">PrefixMapping</span><span class="p">.</span><span class="n">Standard</span><span class="p">)</span> <span class="p">;</span>
+<span class="n">PathLib</span><span class="p">.</span><span class="n">install</span><span class="p">(</span><span class="n">RDF</span><span class="p">.</span><span class="n">type</span><span class="p">.</span><span class="n">getURI</span><span class="p">(),</span> <span class="n">path</span><span class="p">)</span> <span class="p">;</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/select_expr.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/select_expr.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/select_expr.html Thu Jun 20 10:18:34 2013
@@ -170,19 +170,19 @@ encouraged.</p>
 variable in the results.  That is, the illegal expression is
 silently skipped.</p>
 <p>Examples:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="sr">&lt;http://example/&gt;</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
 
-<span class="n">SELECT</span> <span class="p">(?</span><span class="n">p</span><span class="o">+</span><span class="mi">1</span> <span class="n">AS</span> <span class="p">?</span><span class="sx">q)</span>
-<span class="sx">{</span>
-<span class="sx">  :x :p ?p</span>
-<span class="sx">}</span>
+<span class="n">SELECT</span> <span class="p">(</span>?<span class="n">p</span><span class="o">+</span>1 <span class="n">AS</span> ?<span class="n">q</span><span class="p">)</span>
+<span class="p">{</span>
+  <span class="p">:</span><span class="n">x</span> <span class="p">:</span><span class="n">p</span> ?<span class="n">p</span>
+<span class="p">}</span>
 
-<span class="sx">PREFIX rdf: &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;</span>
-<span class="sx">PREFIX :    &lt;http://example/&gt;</span>
+<span class="n">PREFIX</span> <span class="n">rdf</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>1999<span class="o">/</span>02<span class="o">/</span>22<span class="o">-</span><span class="n">rdf</span><span class="o">-</span><span class="n">syntax</span><span class="o">-</span><span class="n">ns</span>#<span class="o">&gt;</span>
+<span class="n">PREFIX</span> <span class="p">:</span>    <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
 
-<span class="sx">SELECT (count(*)</span> <span class="n">AS</span> <span class="p">?</span><span class="n">count</span><span class="p">)</span>
+<span class="n">SELECT</span> <span class="p">(</span><span class="n">count</span><span class="p">(</span><span class="o">*</span><span class="p">)</span> <span class="n">AS</span> ?<span class="n">count</span><span class="p">)</span>
 <span class="p">{</span>
-  <span class="p">:</span><span class="n">x</span> <span class="n">rdf:type</span> <span class="p">:</span><span class="n">Class</span>
+  <span class="p">:</span><span class="n">x</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span> <span class="p">:</span><span class="n">Class</span>
 <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/jena/trunk/content/documentation/query/service.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/service.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/service.html Thu Jun 20 10:18:34 2013
@@ -174,29 +174,29 @@ query is parsed with language <code>Synt
 language in ARQ. This keyword causes the sub-pattern to be sent to
 a named SPARQL service endpoint, and not matched against a local
 graph.</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="sr">&lt;http://example/&gt;</span>
-<span class="n">PREFIX</span>  <span class="n">dc:</span>     <span class="sr">&lt;http://purl.org/dc/elements/1.1/&gt;</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
+<span class="n">PREFIX</span>  <span class="n">dc</span><span class="p">:</span>     <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">purl</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dc</span><span class="o">/</span><span class="n">elements</span><span class="o">/</span>1<span class="p">.</span>1<span class="o">/&gt;</span>
 
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">a</span>
-<span class="n">FROM</span> <span class="sr">&lt;mybooks.rdf&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">a</span>
+<span class="n">FROM</span> <span class="o">&lt;</span><span class="n">mybooks</span><span class="p">.</span><span class="n">rdf</span><span class="o">&gt;</span>
 <span class="p">{</span>
-  <span class="p">?</span><span class="n">b</span> <span class="n">dc:title</span> <span class="p">?</span><span class="n">title</span> <span class="o">.</span>
-  <span class="n">SERVICE</span> <span class="sr">&lt;http://sparql.org/books&gt;</span>
-     <span class="p">{</span> <span class="p">?</span><span class="n">s</span> <span class="n">dc:title</span> <span class="p">?</span><span class="n">title</span> <span class="o">.</span> <span class="p">?</span><span class="n">s</span> <span class="n">dc:creator</span> <span class="p">?</span><span class="n">a</span> <span class="p">}</span>
+  ?<span class="n">b</span> <span class="n">dc</span><span class="p">:</span><span class="n">title</span> ?<span class="n">title</span> <span class="p">.</span>
+  <span class="n">SERVICE</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">sparql</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">books</span><span class="o">&gt;</span>
+     <span class="p">{</span> ?<span class="n">s</span> <span class="n">dc</span><span class="p">:</span><span class="n">title</span> ?<span class="n">title</span> <span class="p">.</span> ?<span class="n">s</span> <span class="n">dc</span><span class="p">:</span><span class="n">creator</span> ?<span class="n">a</span> <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <h2 id="algebra">Algebra</h2>
 <p>There is a new operator in the algebra.</p>
-<div class="codehilite"><pre><span class="p">(</span><span class="n">prefix</span> <span class="p">((</span><span class="n">dc:</span> <span class="sr">&lt;http://purl.org/dc/elements/1.1/&gt;</span><span class="p">))</span>
-  <span class="p">(</span><span class="n">project</span> <span class="p">(?</span><span class="n">a</span><span class="p">)</span>
-    <span class="p">(</span><span class="nb">join</span>
-      <span class="p">(</span><span class="n">BGP</span> <span class="p">[</span><span class="n">triple</span> <span class="p">?</span><span class="n">b</span> <span class="n">dc:title</span> <span class="p">?</span><span class="n">title</span><span class="p">])</span>
-      <span class="p">(</span><span class="n">service</span> <span class="sr">&lt;http://sparql.org/books&gt;</span>
+<div class="codehilite"><pre><span class="p">(</span><span class="n">prefix</span> <span class="p">((</span><span class="n">dc</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">purl</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dc</span><span class="o">/</span><span class="n">elements</span><span class="o">/</span>1<span class="p">.</span>1<span class="o">/&gt;</span><span class="p">))</span>
+  <span class="p">(</span><span class="n">project</span> <span class="p">(</span>?<span class="n">a</span><span class="p">)</span>
+    <span class="p">(</span><span class="n">join</span>
+      <span class="p">(</span><span class="n">BGP</span> <span class="p">[</span><span class="n">triple</span> ?<span class="n">b</span> <span class="n">dc</span><span class="p">:</span><span class="n">title</span> ?<span class="n">title</span><span class="p">])</span>
+      <span class="p">(</span><span class="n">service</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">sparql</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">books</span><span class="o">&gt;</span>
           <span class="p">(</span><span class="n">BGP</span>
-            <span class="p">[</span><span class="n">triple</span> <span class="p">?</span><span class="n">s</span> <span class="n">dc:title</span> <span class="p">?</span><span class="n">title</span><span class="p">]</span>
-            <span class="p">[</span><span class="n">triple</span> <span class="p">?</span><span class="n">s</span> <span class="n">dc:creator</span> <span class="p">?</span><span class="n">a</span><span class="p">]</span>
+            <span class="p">[</span><span class="n">triple</span> ?<span class="n">s</span> <span class="n">dc</span><span class="p">:</span><span class="n">title</span> ?<span class="n">title</span><span class="p">]</span>
+            <span class="p">[</span><span class="n">triple</span> ?<span class="n">s</span> <span class="n">dc</span><span class="p">:</span><span class="n">creator</span> ?<span class="n">a</span><span class="p">]</span>
           <span class="p">))</span>
       <span class="p">)))</span>
 </pre></div>

Modified: websites/staging/jena/trunk/content/documentation/query/sparql-remote.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/sparql-remote.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/sparql-remote.html Thu Jun 20 10:18:34 2013
@@ -178,7 +178,7 @@ processed as usual.</p>
 <h2 id="from-the-command-line">From the command line</h2>
 <p>The <a href="cmds.html#arq.sparql"><code>arq.sparql</code> command</a> can issue remote
 query requests using the <code>--service</code> argument:</p>
-<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="o">...</span> <span class="n">arq</span><span class="o">.</span><span class="n">query</span> <span class="o">--</span><span class="n">service</span> <span class="s">&#39;http://host/service&#39;</span> <span class="s">&#39;SELECT ?s WHERE {?s [] []}&#39;</span>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="p">...</span> <span class="n">arq</span><span class="p">.</span><span class="n">query</span> <span class="o">--</span><span class="n">service</span> <span class="s">&#39;http://host/service&#39;</span> <span class="s">&#39;SELECT ?s WHERE {?s [] []}&#39;</span>
 </pre></div>
 
 
@@ -193,17 +193,17 @@ outgoing requests.</p>
 <p>If, to use your web browser, you need to set a proxy, you need to
 do so for a Java program.</p>
 <p>Simple examples include:</p>
-<div class="codehilite"><pre><span class="o">-</span><span class="n">DsocksProxyHost</span><span class="o">=</span><span class="n">YourSocksServer</span>
+<div class="codehilite"><pre><span class="o">-</span><span class="n">DsocksProxyHost</span><span class="p">=</span><span class="n">YourSocksServer</span>
 
-<span class="o">-</span><span class="n">DsocksProxyHost</span><span class="o">=</span><span class="n">YourSocksServer</span> <span class="o">-</span><span class="n">DsocksProxyPort</span><span class="o">=</span><span class="n">port</span>
+<span class="o">-</span><span class="n">DsocksProxyHost</span><span class="p">=</span><span class="n">YourSocksServer</span> <span class="o">-</span><span class="n">DsocksProxyPort</span><span class="p">=</span><span class="n">port</span>
 
-<span class="o">-</span><span class="n">Dhttp</span><span class="o">.</span><span class="n">proxyHost</span><span class="o">=</span><span class="n">WebProxy</span> <span class="o">-</span><span class="n">Dhttp</span><span class="o">.</span><span class="n">proxyPort</span><span class="o">=</span><span class="n">Port</span>
+<span class="o">-</span><span class="n">Dhttp</span><span class="p">.</span><span class="n">proxyHost</span><span class="p">=</span><span class="n">WebProxy</span> <span class="o">-</span><span class="n">Dhttp</span><span class="p">.</span><span class="n">proxyPort</span><span class="p">=</span><span class="n">Port</span>
 </pre></div>
 
 
 <p>This can be done in the application
 <em>if it is done before any network connection are made</em>:</p>
-<div class="codehilite"><pre>   <span class="n">System</span><span class="o">.</span><span class="n">setProperty</span><span class="p">(</span><span class="s">&quot;socksProxyHost&quot;</span><span class="p">,</span> <span class="s">&quot;socks.corp.com&quot;</span><span class="p">);</span>
+<div class="codehilite"><pre>   <span class="n">System</span><span class="p">.</span><span class="n">setProperty</span><span class="p">(</span>&quot;<span class="n">socksProxyHost</span>&quot;<span class="p">,</span> &quot;<span class="n">socks</span><span class="p">.</span><span class="n">corp</span><span class="p">.</span><span class="n">com</span>&quot;<span class="p">);</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/sub-select.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/sub-select.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/sub-select.html Thu Jun 20 10:18:34 2013
@@ -162,12 +162,12 @@
 table that is used within the outer query. A nested SELECT
 statement is enclosed in {} and is the only element in that group.</p>
 <p>Example: find toys with more than five orders:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="sr">&lt;http://example/&gt;</span>
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">x</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/&gt;</span>
+<span class="n">SELECT</span> ?<span class="n">x</span>
 <span class="p">{</span>
-  <span class="p">?</span><span class="n">x</span> <span class="n">a</span> <span class="p">:</span><span class="n">Toy</span> <span class="o">.</span>
-  <span class="p">{</span> <span class="n">SELECT</span> <span class="p">?</span><span class="n">x</span> <span class="p">(</span> <span class="n">count</span><span class="p">(?</span><span class="n">order</span><span class="p">)</span> <span class="n">as</span> <span class="p">?</span><span class="sx">q ) </span><span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="p">:</span><span class="n">order</span> <span class="p">?</span><span class="n">order</span> <span class="p">}</span> <span class="n">GROUP</span> <span class="n">BY</span> <span class="p">?</span><span class="n">x</span> <span class="p">}</span>
-  <span class="n">FILTER</span> <span class="p">(</span> <span class="p">?</span><span class="sx">q &gt; </span><span class="mi">5</span> <span class="p">)</span>
+  ?<span class="n">x</span> <span class="n">a</span> <span class="p">:</span><span class="n">Toy</span> <span class="p">.</span>
+  <span class="p">{</span> <span class="n">SELECT</span> ?<span class="n">x</span> <span class="p">(</span> <span class="n">count</span><span class="p">(</span>?<span class="n">order</span><span class="p">)</span> <span class="n">as</span> ?<span class="n">q</span> <span class="p">)</span> <span class="p">{</span> ?<span class="n">x</span> <span class="p">:</span><span class="n">order</span> ?<span class="n">order</span> <span class="p">}</span> <span class="n">GROUP</span> <span class="n">BY</span> ?<span class="n">x</span> <span class="p">}</span>
+  <span class="n">FILTER</span> <span class="p">(</span> ?<span class="n">q</span> <span class="o">&gt;</span> 5 <span class="p">)</span>
 <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/jena/trunk/content/documentation/query/text-query.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/text-query.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/text-query.html Thu Jun 20 10:18:34 2013
@@ -171,12 +171,12 @@ for a large scale enterprise search appl
 (the index needs to correctly configured) and limits the output
 to 10 matches; it then looks in the RDF data for
 the actual label.  More details are given below.</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">text:</span> <span class="sr">&lt;http://jena.apache.org/text#&gt;</span>
-<span class="n">PREFIX</span> <span class="n">rdfs:</span> <span class="sr">&lt;http://www.w3.org/2000/01/rdf-schema#&gt;</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">text</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jena</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">text</span>#<span class="o">&gt;</span>
+<span class="n">PREFIX</span> <span class="n">rdfs</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>2000<span class="o">/</span>01<span class="o">/</span><span class="n">rdf</span><span class="o">-</span><span class="n">schema</span>#<span class="o">&gt;</span>
 
-<span class="n">SELECT</span> <span class="p">?</span><span class="n">s</span>
-<span class="p">{</span> <span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="p">(</span><span class="n">rdfs:label</span> <span class="s">&#39;word&#39;</span> <span class="mi">10</span><span class="p">)</span> <span class="p">;</span> 
-     <span class="n">rdfs:label</span> <span class="p">?</span><span class="n">label</span> 
+<span class="n">SELECT</span> ?<span class="n">s</span>
+<span class="p">{</span> ?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">(</span><span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="s">&#39;word&#39;</span> 10<span class="p">)</span> <span class="p">;</span> 
+     <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> ?<span class="n">label</span> 
 <span class="p">}</span>
 </pre></div>
 
@@ -221,17 +221,17 @@ text index with SPARQL search.</p>
 <h2 id="query-with-sparql">Query with SPARQL</h2>
 <p>The property function is <code>http://jena.apache.org/text#query</code> more
 conveniently writtern:</p>
-<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">text:</span> <span class="sr">&lt;http://jena.apache.org/text#&gt;</span>
+<div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">text</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jena</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">text</span>#<span class="o">&gt;</span>
 
-<span class="o">...</span>   <span class="n">text:query</span> <span class="o">...</span>
+<span class="p">...</span>   <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">...</span>
 </pre></div>
 
 
 <p>This is different to LARQ v1.</p>
 <p>The following forms are all legal:</p>
-<div class="codehilite"><pre><span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="s">&#39;word&#39;</span>              <span class="c1"># query</span>
-<span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="p">(</span><span class="n">rdfs:label</span> <span class="s">&#39;word&#39;</span><span class="p">)</span> <span class="c1"># query specific property if multiple</span>
-<span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="p">(</span><span class="s">&#39;word&#39;</span> <span class="mi">10</span><span class="p">)</span>         <span class="c1"># with limit on results</span>
+<div class="codehilite"><pre>?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="s">&#39;word&#39;</span>              # <span class="n">query</span>
+?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">(</span><span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="s">&#39;word&#39;</span><span class="p">)</span> # <span class="n">query</span> <span class="n">specific</span> <span class="n">property</span> <span class="k">if</span> <span class="n">multiple</span>
+?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">(</span><span class="s">&#39;word&#39;</span> 10<span class="p">)</span>         # <span class="n">with</span> <span class="n">limit</span> <span class="n">on</span> <span class="n">results</span>
 </pre></div>
 
 
@@ -272,10 +272,10 @@ better to use one of two styles.</p>
 <p>Access to the index is first in the query and used to find a number of
 items of interest; further information is obtained about these items from
 the RDF data.</p>
-<div class="codehilite"><pre><span class="n">SELECT</span> <span class="p">?</span><span class="n">s</span>
-<span class="p">{</span> <span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="p">(</span><span class="n">rdfs:label</span> <span class="s">&#39;word&#39;</span> <span class="mi">10</span><span class="p">)</span> <span class="p">;</span> 
-     <span class="n">rdfs:label</span> <span class="p">?</span><span class="n">label</span> <span class="p">;</span>
-     <span class="n">rdf:type</span>   <span class="p">?</span><span class="n">type</span> 
+<div class="codehilite"><pre><span class="n">SELECT</span> ?<span class="n">s</span>
+<span class="p">{</span> ?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">(</span><span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="s">&#39;word&#39;</span> 10<span class="p">)</span> <span class="p">;</span> 
+     <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> ?<span class="n">label</span> <span class="p">;</span>
+     <span class="n">rdf</span><span class="p">:</span><span class="n">type</span>   ?<span class="n">type</span> 
 <span class="p">}</span>
 </pre></div>
 
@@ -285,10 +285,10 @@ more higher scoring results.</p>
 <h4 id="query-pattern-2-wzxhzdk15-filter">Query pattern 2 &ndash; Filter</h4>
 <p>By finding items of interest first in the RDF data, the text search can be
 used to restrict the items found stil further.</p>
-<div class="codehilite"><pre><span class="n">SELECT</span> <span class="p">?</span><span class="n">s</span>
-<span class="p">{</span> <span class="p">?</span><span class="n">s</span> <span class="n">rdf:type</span>     <span class="p">:</span><span class="n">book</span> <span class="p">;</span>
-     <span class="n">dc:createor</span>  <span class="s">&quot;John&quot;</span> <span class="o">.</span>
-  <span class="p">?</span><span class="n">s</span> <span class="n">text:query</span>   <span class="p">(</span><span class="n">dc:title</span> <span class="s">&#39;word&#39;</span><span class="p">)</span> <span class="p">;</span> 
+<div class="codehilite"><pre><span class="n">SELECT</span> ?<span class="n">s</span>
+<span class="p">{</span> ?<span class="n">s</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span>     <span class="p">:</span><span class="n">book</span> <span class="p">;</span>
+     <span class="n">dc</span><span class="p">:</span><span class="n">createor</span>  &quot;<span class="n">John</span>&quot; <span class="p">.</span>
+  ?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span>   <span class="p">(</span><span class="n">dc</span><span class="p">:</span><span class="n">title</span> <span class="s">&#39;word&#39;</span><span class="p">)</span> <span class="p">;</span> 
 <span class="p">}</span>
 </pre></div>
 
@@ -303,65 +303,65 @@ index field.</p>
 <p>The usual way to describe an index is with a
 <a href="../assembler/index.html">Jena assembler description</a>.</p>
 <h3 id="assemblers">Assemblers</h3>
-<div class="codehilite"><pre><span class="nv">@prefix</span> <span class="p">:</span>        <span class="sr">&lt;http://localhost/jena_example/#&gt;</span> <span class="o">.</span>
-<span class="nv">@prefix</span> <span class="n">rdf:</span>     <span class="sr">&lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;</span> <span class="o">.</span>
-<span class="nv">@prefix</span> <span class="n">rdfs:</span>    <span class="sr">&lt;http://www.w3.org/2000/01/rdf-schema#&gt;</span> <span class="o">.</span>
-<span class="nv">@prefix</span> <span class="n">tdb:</span>     <span class="sr">&lt;http://jena.hpl.hp.com/2008/tdb#&gt;</span> <span class="o">.</span>
-<span class="nv">@prefix</span> <span class="n">ja:</span>      <span class="sr">&lt;http://jena.hpl.hp.com/2005/11/Assembler#&gt;</span> <span class="o">.</span>
-<span class="nv">@prefix</span> <span class="n">text:</span>    <span class="sr">&lt;http://jena.apache.org/text#&gt;</span> <span class="o">.</span>
-
-<span class="c1">## Example of a TDB dataset and text index</span>
-<span class="c1">## Initialize TDB</span>
-<span class="o">[]</span> <span class="n">ja:loadClass</span> <span class="s">&quot;com.hp.hpl.jena.tdb.TDB&quot;</span> <span class="o">.</span>
-<span class="n">tdb:DatasetTDB</span>  <span class="n">rdfs:subClassOf</span>  <span class="n">ja:RDFDataset</span> <span class="o">.</span>
-<span class="n">tdb:GraphTDB</span>    <span class="n">rdfs:subClassOf</span>  <span class="n">ja:Model</span> <span class="o">.</span>
-
-<span class="c1">## Initialize text query</span>
-<span class="o">[]</span> <span class="n">ja:loadClass</span>       <span class="s">&quot;org.apache.jena.query.text.TextQuery&quot;</span> <span class="o">.</span>
-<span class="c1"># A TextDataset is a regular dataset with a text index.</span>
-<span class="n">text:TextDataset</span>      <span class="n">rdfs:subClassOf</span>   <span class="n">ja:RDFDataset</span> <span class="o">.</span>
-<span class="c1"># Lucene index</span>
-<span class="n">text:TextIndexLucene</span>  <span class="n">rdfs:subClassOf</span>   <span class="n">text:TextIndex</span> <span class="o">.</span>
-<span class="c1"># Solr index</span>
-<span class="n">text:TextIndexSolrne</span>  <span class="n">rdfs:subClassOf</span>   <span class="n">text:TextIndex</span> <span class="o">.</span>
-
-<span class="c1">## ---------------------------------------------------------------</span>
-<span class="c1">## This URI must be fixed - it&#39;s used to assemble the text dataset.</span>
-
-<span class="p">:</span><span class="n">text_dataset</span> <span class="n">rdf:type</span>     <span class="n">text:TextDataset</span> <span class="p">;</span>
-    <span class="n">text:dataset</span>   <span class="sr">&lt;#dataset&gt;</span> <span class="p">;</span>
-    <span class="n">text:index</span>     <span class="sr">&lt;#indexLucene&gt;</span> <span class="p">;</span>
-    <span class="o">.</span>
-
-<span class="c1"># A TDB datset used for RDF storage</span>
-<span class="sr">&lt;#dataset&gt;</span> <span class="n">rdf:type</span>      <span class="n">tdb:DatasetTDB</span> <span class="p">;</span>
-    <span class="n">tdb:location</span> <span class="s">&quot;DB&quot;</span> <span class="p">;</span>
-    <span class="n">tdb:unionDefaultGraph</span> <span class="n">true</span> <span class="p">;</span> <span class="c1"># Optional</span>
-    <span class="o">.</span>
-
-<span class="c1"># Text index description</span>
-<span class="sr">&lt;#indexLucene&gt;</span> <span class="n">a</span> <span class="n">text:TextIndexLucene</span> <span class="p">;</span>
-    <span class="n">text:directory</span> <span class="sr">&lt;file:Lucene&gt;</span> <span class="p">;</span>
-    <span class="c1">##text:directory &quot;mem&quot; ;</span>
-    <span class="n">text:entityMap</span> <span class="sr">&lt;#entMap&gt;</span> <span class="p">;</span>
-    <span class="o">.</span>
-
-<span class="c1"># Mapping in the index</span>
-<span class="c1"># URI stored in filed &quot;uri&quot;</span>
-<span class="c1"># rdfs:label is mapped to field &quot;text&quot;</span>
-<span class="sr">&lt;#entMap&gt;</span> <span class="n">a</span> <span class="n">text:EntityMap</span> <span class="p">;</span>
-    <span class="n">text:entityField</span>      <span class="s">&quot;uri&quot;</span> <span class="p">;</span>
-    <span class="n">text:defaultField</span>     <span class="s">&quot;text&quot;</span> <span class="p">;</span>
-    <span class="n">text:map</span> <span class="p">(</span>
-         <span class="p">[</span> <span class="n">text:field</span> <span class="s">&quot;text&quot;</span> <span class="p">;</span> <span class="n">text:predicate</span> <span class="n">rdfs:label</span> <span class="p">]</span>
-         <span class="p">)</span> <span class="o">.</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">prefix</span> <span class="p">:</span>        <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="o">/</span><span class="n">jena_example</span><span class="o">/</span>#<span class="o">&gt;</span> <span class="p">.</span>
+<span class="p">@</span><span class="n">prefix</span> <span class="n">rdf</span><span class="p">:</span>     <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>1999<span class="o">/</span>02<span class="o">/</span>22<span class="o">-</span><span class="n">rdf</span><span class="o">-</span><span class="n">syntax</span><span class="o">-</span><span class="n">ns</span>#<span class="o">&gt;</span> <span class="p">.</span>
+<span class="p">@</span><span class="n">prefix</span> <span class="n">rdfs</span><span class="p">:</span>    <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">w3</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>2000<span class="o">/</span>01<span class="o">/</span><span class="n">rdf</span><span class="o">-</span><span class="n">schema</span>#<span class="o">&gt;</span> <span class="p">.</span>
+<span class="p">@</span><span class="n">prefix</span> <span class="n">tdb</span><span class="p">:</span>     <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jena</span><span class="p">.</span><span class="n">hpl</span><span class="p">.</span><span class="n">hp</span><span class="p">.</span><span class="n">com</span><span class="o">/</span>2008<span class="o">/</span><span class="n">tdb</span>#<span class="o">&gt;</span> <span class="p">.</span>
+<span class="p">@</span><span class="n">prefix</span> <span class="n">ja</span><span class="p">:</span>      <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jena</span><span class="p">.</span><span class="n">hpl</span><span class="p">.</span><span class="n">hp</span><span class="p">.</span><span class="n">com</span><span class="o">/</span>2005<span class="o">/</span>11<span class="o">/</span><span class="n">Assembler</span>#<span class="o">&gt;</span> <span class="p">.</span>
+<span class="p">@</span><span class="n">prefix</span> <span class="n">text</span><span class="p">:</span>    <span class="o">&lt;</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jena</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">text</span>#<span class="o">&gt;</span> <span class="p">.</span>
+
+## <span class="n">Example</span> <span class="n">of</span> <span class="n">a</span> <span class="n">TDB</span> <span class="n">dataset</span> <span class="n">and</span> <span class="n">text</span> <span class="n">index</span>
+## <span class="n">Initialize</span> <span class="n">TDB</span>
+<span class="p">[]</span> <span class="n">ja</span><span class="p">:</span><span class="n">loadClass</span> &quot;<span class="n">com</span><span class="p">.</span><span class="n">hp</span><span class="p">.</span><span class="n">hpl</span><span class="p">.</span><span class="n">jena</span><span class="p">.</span><span class="n">tdb</span><span class="p">.</span><span class="n">TDB</span>&quot; <span class="p">.</span>
+<span class="n">tdb</span><span class="p">:</span><span class="n">DatasetTDB</span>  <span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span>  <span class="n">ja</span><span class="p">:</span><span class="n">RDFDataset</span> <span class="p">.</span>
+<span class="n">tdb</span><span class="p">:</span><span class="n">GraphTDB</span>    <span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span>  <span class="n">ja</span><span class="p">:</span><span class="n">Model</span> <span class="p">.</span>
+
+## <span class="n">Initialize</span> <span class="n">text</span> <span class="n">query</span>
+<span class="p">[]</span> <span class="n">ja</span><span class="p">:</span><span class="n">loadClass</span>       &quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">jena</span><span class="p">.</span><span class="n">query</span><span class="p">.</span><span class="n">text</span><span class="p">.</span><span class="n">TextQuery</span>&quot; <span class="p">.</span>
+# <span class="n">A</span> <span class="n">TextDataset</span> <span class="n">is</span> <span class="n">a</span> <span class="n">regular</span> <span class="n">dataset</span> <span class="n">with</span> <span class="n">a</span> <span class="n">text</span> <span class="n">index</span><span class="p">.</span>
+<span class="n">text</span><span class="p">:</span><span class="n">TextDataset</span>      <span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span>   <span class="n">ja</span><span class="p">:</span><span class="n">RDFDataset</span> <span class="p">.</span>
+# <span class="n">Lucene</span> <span class="n">index</span>
+<span class="n">text</span><span class="p">:</span><span class="n">TextIndexLucene</span>  <span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span>   <span class="n">text</span><span class="p">:</span><span class="n">TextIndex</span> <span class="p">.</span>
+# <span class="n">Solr</span> <span class="n">index</span>
+<span class="n">text</span><span class="p">:</span><span class="n">TextIndexSolrne</span>  <span class="n">rdfs</span><span class="p">:</span><span class="n">subClassOf</span>   <span class="n">text</span><span class="p">:</span><span class="n">TextIndex</span> <span class="p">.</span>
+
+## <span class="o">---------------------------------------------------------------</span>
+## <span class="n">This</span> <span class="n">URI</span> <span class="n">must</span> <span class="n">be</span> <span class="n">fixed</span> <span class="o">-</span> <span class="n">it</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">used</span> <span class="n">to</span> <span class="n">assemble</span> <span class="n">the</span> <span class="n">text</span> <span class="n">dataset</span><span class="p">.</span>
+
+<span class="p">:</span><span class="n">text_dataset</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span>     <span class="n">text</span><span class="p">:</span><span class="n">TextDataset</span> <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">dataset</span>   <span class="o">&lt;</span>#<span class="n">dataset</span><span class="o">&gt;</span> <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">index</span>     <span class="o">&lt;</span>#<span class="n">indexLucene</span><span class="o">&gt;</span> <span class="p">;</span>
+    <span class="p">.</span>
+
+# <span class="n">A</span> <span class="n">TDB</span> <span class="n">datset</span> <span class="n">used</span> <span class="k">for</span> <span class="n">RDF</span> <span class="n">storage</span>
+<span class="o">&lt;</span>#<span class="n">dataset</span><span class="o">&gt;</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span>      <span class="n">tdb</span><span class="p">:</span><span class="n">DatasetTDB</span> <span class="p">;</span>
+    <span class="n">tdb</span><span class="p">:</span><span class="n">location</span> &quot;<span class="n">DB</span>&quot; <span class="p">;</span>
+    <span class="n">tdb</span><span class="p">:</span><span class="n">unionDefaultGraph</span> <span class="n">true</span> <span class="p">;</span> # <span class="n">Optional</span>
+    <span class="p">.</span>
+
+# <span class="n">Text</span> <span class="n">index</span> <span class="n">description</span>
+<span class="o">&lt;</span>#<span class="n">indexLucene</span><span class="o">&gt;</span> <span class="n">a</span> <span class="n">text</span><span class="p">:</span><span class="n">TextIndexLucene</span> <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">directory</span> <span class="o">&lt;</span><span class="n">file</span><span class="p">:</span><span class="n">Lucene</span><span class="o">&gt;</span> <span class="p">;</span>
+    ##<span class="n">text</span><span class="p">:</span><span class="n">directory</span> &quot;<span class="n">mem</span>&quot; <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">entityMap</span> <span class="o">&lt;</span>#<span class="n">entMap</span><span class="o">&gt;</span> <span class="p">;</span>
+    <span class="p">.</span>
+
+# <span class="n">Mapping</span> <span class="n">in</span> <span class="n">the</span> <span class="n">index</span>
+# <span class="n">URI</span> <span class="n">stored</span> <span class="n">in</span> <span class="n">filed</span> &quot;<span class="n">uri</span>&quot;
+# <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="n">is</span> <span class="n">mapped</span> <span class="n">to</span> <span class="n">field</span> &quot;<span class="n">text</span>&quot;
+<span class="o">&lt;</span>#<span class="n">entMap</span><span class="o">&gt;</span> <span class="n">a</span> <span class="n">text</span><span class="p">:</span><span class="n">EntityMap</span> <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">entityField</span>      &quot;<span class="n">uri</span>&quot; <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">defaultField</span>     &quot;<span class="n">text</span>&quot; <span class="p">;</span>
+    <span class="n">text</span><span class="p">:</span><span class="n">map</span> <span class="p">(</span>
+         <span class="p">[</span> <span class="n">text</span><span class="p">:</span><span class="n">field</span> &quot;<span class="n">text</span>&quot; <span class="p">;</span> <span class="n">text</span><span class="p">:</span><span class="n">predicate</span> <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="p">]</span>
+         <span class="p">)</span> <span class="p">.</span>
 </pre></div>
 
 
 <p>then use code such as:</p>
-<div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="o">=</span> <span class="n">DatasetFactory</span><span class="o">.</span><span class="n">assemble</span><span class="p">(</span>
-    <span class="s">&quot;text-config.ttl&quot;</span><span class="p">,</span> 
-    <span class="s">&quot;http://localhost/jena_example/#text_dataset&quot;</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="n">DatasetFactory</span><span class="p">.</span><span class="n">assemble</span><span class="p">(</span>
+    &quot;<span class="n">text</span><span class="o">-</span><span class="n">config</span><span class="p">.</span><span class="n">ttl</span>&quot;<span class="p">,</span> 
+    &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="o">/</span><span class="n">jena_example</span><span class="o">/</span>#<span class="n">text_dataset</span>&quot;<span class="p">)</span> <span class="p">;</span>
 </pre></div>
 
 
@@ -370,35 +370,35 @@ the text dataset, one for the base data.
 needs to identify the text dataset by it's URI
 <code>http://localhost/jena_example/#text_dataset</code>.</p>
 <h3 id="build-with-code">Build with code</h3>
-<div class="codehilite"><pre>    <span class="sr">//</span> <span class="n">Example</span> <span class="n">of</span> <span class="n">building</span> <span class="n">a</span> <span class="n">text</span> <span class="n">dadaset</span> <span class="n">with</span> <span class="n">code</span><span class="o">.</span>
-    <span class="sr">//</span> <span class="n">Example</span> <span class="n">is</span> <span class="n">in</span><span class="o">-</span><span class="n">memory</span><span class="o">.</span>
-    <span class="sr">//</span> <span class="n">Base</span> <span class="n">data</span>
-    <span class="n">Dataset</span> <span class="n">ds1</span> <span class="o">=</span> <span class="n">DatasetFactory</span><span class="o">.</span><span class="n">createMem</span><span class="p">()</span> <span class="p">;</span>
+<div class="codehilite"><pre>    <span class="o">//</span> <span class="n">Example</span> <span class="n">of</span> <span class="n">building</span> <span class="n">a</span> <span class="n">text</span> <span class="n">dadaset</span> <span class="n">with</span> <span class="n">code</span><span class="p">.</span>
+    <span class="o">//</span> <span class="n">Example</span> <span class="n">is</span> <span class="n">in</span><span class="o">-</span><span class="n">memory</span><span class="p">.</span>
+    <span class="o">//</span> <span class="n">Base</span> <span class="n">data</span>
+    <span class="n">Dataset</span> <span class="n">ds1</span> <span class="p">=</span> <span class="n">DatasetFactory</span><span class="p">.</span><span class="n">createMem</span><span class="p">()</span> <span class="p">;</span>
 
-    <span class="n">EntityDefinition</span> <span class="n">entDef</span> <span class="o">=</span> <span class="k">new</span> <span class="n">EntityDefinition</span><span class="p">(</span><span class="s">&quot;uri&quot;</span><span class="p">,</span> <span class="s">&quot;text&quot;</span><span class="p">,</span> <span class="n">RDFS</span><span class="o">.</span><span class="n">label</span><span class="o">.</span><span class="n">asNode</span><span class="p">())</span> <span class="p">;</span>
+    <span class="n">EntityDefinition</span> <span class="n">entDef</span> <span class="p">=</span> <span class="n">new</span> <span class="n">EntityDefinition</span><span class="p">(</span>&quot;<span class="n">uri</span>&quot;<span class="p">,</span> &quot;<span class="n">text</span>&quot;<span class="p">,</span> <span class="n">RDFS</span><span class="p">.</span><span class="n">label</span><span class="p">.</span><span class="n">asNode</span><span class="p">())</span> <span class="p">;</span>
 
-    <span class="sr">//</span> <span class="n">Lucene</span><span class="p">,</span> <span class="n">in</span> <span class="n">memory</span><span class="o">.</span>
-    <span class="n">Directory</span> <span class="n">dir</span> <span class="o">=</span>  <span class="k">new</span> <span class="n">RAMDirectory</span><span class="p">();</span>
+    <span class="o">//</span> <span class="n">Lucene</span><span class="p">,</span> <span class="n">in</span> <span class="n">memory</span><span class="p">.</span>
+    <span class="n">Directory</span> <span class="n">dir</span> <span class="p">=</span>  <span class="n">new</span> <span class="n">RAMDirectory</span><span class="p">();</span>
 
-    <span class="sr">//</span> <span class="n">Join</span> <span class="n">together</span> <span class="n">into</span> <span class="n">a</span> <span class="n">dataset</span>
-    <span class="n">Dataset</span> <span class="n">ds</span> <span class="o">=</span> <span class="n">TextDatasetFactory</span><span class="o">.</span><span class="n">createLucene</span><span class="p">(</span><span class="n">ds1</span><span class="p">,</span> <span class="n">dir</span><span class="p">,</span> <span class="n">entDef</span><span class="p">)</span> <span class="p">;</span>
+    <span class="o">//</span> <span class="n">Join</span> <span class="n">together</span> <span class="n">into</span> <span class="n">a</span> <span class="n">dataset</span>
+    <span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="n">TextDatasetFactory</span><span class="p">.</span><span class="n">createLucene</span><span class="p">(</span><span class="n">ds1</span><span class="p">,</span> <span class="n">dir</span><span class="p">,</span> <span class="n">entDef</span><span class="p">)</span> <span class="p">;</span>
 </pre></div>
 
 
 <h2 id="fuseki">Fuseki</h2>
 <p>The Fuseki configuration simply points to the text dataset as the
 <code>fuseki:dataset</code> of the service.</p>
-<div class="codehilite"><pre><span class="sr">&lt;#service_text_tdb&gt;</span> <span class="n">rdf:type</span> <span class="n">fuseki:Service</span> <span class="p">;</span>
-    <span class="n">rdfs:label</span>                      <span class="s">&quot;TDB/text service&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:name</span>                     <span class="s">&quot;ds&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceQuery</span>             <span class="s">&quot;query&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceQuery</span>             <span class="s">&quot;sparql&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceUpdate</span>            <span class="s">&quot;update&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceUpload</span>            <span class="s">&quot;upload&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceReadGraphStore</span>    <span class="s">&quot;get&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:serviceReadWriteGraphStore</span>    <span class="s">&quot;data&quot;</span> <span class="p">;</span>
-    <span class="n">fuseki:dataset</span>                  <span class="p">:</span><span class="n">text_dataset</span> <span class="p">;</span>
-    <span class="o">.</span>
+<div class="codehilite"><pre><span class="o">&lt;</span>#<span class="n">service_text_tdb</span><span class="o">&gt;</span> <span class="n">rdf</span><span class="p">:</span><span class="n">type</span> <span class="n">fuseki</span><span class="p">:</span><span class="n">Service</span> <span class="p">;</span>
+    <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span>                      &quot;<span class="n">TDB</span><span class="o">/</span><span class="n">text</span> <span class="n">service</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">name</span>                     &quot;<span class="n">ds</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceQuery</span>             &quot;<span class="n">query</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceQuery</span>             &quot;<span class="n">sparql</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceUpdate</span>            &quot;<span class="n">update</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceUpload</span>            &quot;<span class="n">upload</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceReadGraphStore</span>    &quot;<span class="n">get</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">serviceReadWriteGraphStore</span>    &quot;<span class="n">data</span>&quot; <span class="p">;</span>
+    <span class="n">fuseki</span><span class="p">:</span><span class="n">dataset</span>                  <span class="p">:</span><span class="n">text_dataset</span> <span class="p">;</span>
+    <span class="p">.</span>
 </pre></div>
 
 
@@ -412,9 +412,9 @@ entries is not available. </p>
 text index, then check in the RDF data.  Indeed, this may be necessary
 anyway because a text search does not necessarily give only exact matches.</p>
 <p>In the initial example:</p>
-<div class="codehilite"><pre><span class="n">SELECT</span> <span class="p">?</span><span class="n">s</span> <span class="p">?</span><span class="n">label</span>
-<span class="p">{</span> <span class="p">?</span><span class="n">s</span> <span class="n">text:query</span> <span class="p">(</span><span class="n">rdfs:label</span> <span class="s">&#39;word&#39;</span> <span class="mi">10</span><span class="p">)</span> <span class="p">;</span> 
-     <span class="n">rdfs:label</span> <span class="p">?</span><span class="n">label</span> 
+<div class="codehilite"><pre><span class="n">SELECT</span> ?<span class="n">s</span> ?<span class="n">label</span>
+<span class="p">{</span> ?<span class="n">s</span> <span class="n">text</span><span class="p">:</span><span class="n">query</span> <span class="p">(</span><span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> <span class="s">&#39;word&#39;</span> 10<span class="p">)</span> <span class="p">;</span> 
+     <span class="n">rdfs</span><span class="p">:</span><span class="n">label</span> ?<span class="n">label</span> 
 <span class="p">}</span>
 </pre></div>