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 2012/03/22 18:35:01 UTC

svn commit: r809594 [4/9] - in /websites/staging/jena/trunk/content: ./ jena/ jena/about_jena/ jena/documentation/ jena/documentation/assembler/ jena/documentation/inference/ jena/documentation/io/ jena/documentation/javadoc/ jena/documentation/larq/ j...

Modified: websites/staging/jena/trunk/content/jena/documentation/ontology/index.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/ontology/index.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/ontology/index.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -197,7 +197,7 @@ The sections are:</p>
 <li><a href="#working_with_persistent_ontologies">Working with persistent ontologies</a></li>
 <li><a href="#experimental_ontology_tools">Experimental ontology tools</a></li>
 </ul>
-<h3 id="further_assistance">Further assistance</h3>
+<h3 id="further-assistance">Further assistance</h3>
 <p>Hopefully, this document will be sufficient to help most readers
 to get started using the Jena ontology API. For further support,
 please post questions to the <a href="/jena/help_and_support">Jena support list</a>,
@@ -206,7 +206,7 @@ or <a href="/jena/help_and_support/bugs_
 to communicate with the Jena team, rather than send email to the team
 members directly. This helps us manage Jena support more effectively,
 and facilitates contributions from other Jena community members.</em></p>
-<h2 id="general_concepts">General concepts</h2>
+<h2 id="general-concepts">General concepts</h2>
 <p>In a widely-quoted definition, an ontology is</p>
 <blockquote>
 <p>"a specification of a conceptualization"
@@ -363,7 +363,7 @@ expressiveness of DAML+OIL is comparable
 possible to
 find some DAML ontologies on the web, our recommendation is that
 Jena developers stick to OWL and RDFS as ontology languages.</p>
-<h3 id="ontology_languages_and_the_jena_ontology_api">Ontology languages and the Jena Ontology API</h3>
+<h3 id="ontology-languages-and-the-jena-ontology-api">Ontology languages and the Jena Ontology API</h3>
 <p>As we outlined above, there are various different ontology languages
 available for representing ontology information on the semantic
 web. They range from the most expressive, OWL Full, through to the
@@ -412,7 +412,7 @@ information from the underlying RDF trip
 subclass to an <code>OntClass</code> asserts an additional RDF triple, typically
 with predicate <code>rdfs:subClassOf</code> into
 the model.</p>
-<h3 id="ontologies_and_reasoning">Ontologies and reasoning</h3>
+<h3 id="ontologies-and-reasoning">Ontologies and reasoning</h3>
 <p>One of the key benefits of building an ontology-based application
 is using a reasoner to derive additional truths about the concepts
 you are modelling. We saw a simple instance of this above: the
@@ -448,7 +448,7 @@ in-memory store, a database-backed persi
 storage structure altogether &ndash; e.g. an LDAP directory &ndash; again without
 affecting the operation of the ontology model (but noting that these
 different approaches may have very different efficiency profiles).</p>
-<h3 id="rdf-level_polymorphism_and_java">RDF-level polymorphism and Java</h3>
+<h3 id="rdf-level-polymorphism-and-java">RDF-level polymorphism and Java</h3>
 <p>Deciding which Java abstract class to use to represent a given RDF
 resource can be surprisingly subtle. Consider the following RDF
 sample:</p>
@@ -517,7 +517,7 @@ support the conversion to a given facet,
 given facet with <code>canAs()</code>. This RDF-level polymorphism is used
 extensively in the Jena ontology API to allow maximum flexibility
 in handling ontology data.</p>
-<h2 id="running_example_the_eswc_ontology">Running example: the ESWC ontology</h2>
+<h2 id="running-example-the-eswc-ontology">Running example: the ESWC ontology</h2>
 <p>To illustrate the principles of using the ontology API, we will use
 examples drawn from Tom Heath's
 <a href="http://www.schemaweb.info/schema/SchemaDetails.aspx?id=282">ESWC ontology</a>.
@@ -534,7 +534,7 @@ in Figure 3:</p>
 <br />Figure 3: Classes and properties from ESWC ontology</p>
 <p>We will use elements from this ontology to illustrate the ontology
 API throughout the rest of this document.</p>
-<h2 id="creating_ontology_models">Creating ontology models</h2>
+<h2 id="creating-ontology-models">Creating ontology models</h2>
 <p>An ontology model is an extension of the Jena RDF model,
 providing extra capabilities for handling ontologies. Ontology
 models are created through the Jena
@@ -786,7 +786,7 @@ and then update the copy as necessary:</
 </pre></div>
 
 
-<h2 id="compound_ontology_documents_and_imports_processing">Compound ontology documents and imports processing</h2>
+<h2 id="compound-ontology-documents-and-imports-processing">Compound ontology documents and imports processing</h2>
 <p>The OWL and DAML ontology languages include some facilities for
 creating modular ontologies that can be re-used in a similar manner
 to software modules. In particular, one ontology can <em>import</em>
@@ -864,7 +864,7 @@ ontology A, and A imports B, we will end
 in Figure 4. Note that the imports have been flattened out. A cycle
 check is used to prevent the document handler getting stuck if, for
 example, A imports B which imports A!</p>
-<h3 id="the_ontology_document_manager">The ontology document manager</h3>
+<h3 id="the-ontology-document-manager">The ontology document manager</h3>
 <p>Each ontology model has an associated <em>document manager</em> which
 assists with the processing and handling of ontology documents and related
 concerns. For convenience, there is one global document manager
@@ -891,7 +891,7 @@ example:</p>
 was created with. Thus if you change a document manager's
 properties, it will affect models that have previously been
 constructed with that document manager.</p>
-<h3 id="document_manager_policy">Document manager policy</h3>
+<h3 id="document-manager-policy">Document manager policy</h3>
 <p>Since the document manager has a large number of configurable
 options, there are two ways in which you can customise it to your
 application requirements. Firstly, you can set the individual
@@ -922,7 +922,7 @@ that you can use in such an ontology doc
 manager will use to initialise itself, you can either pass the new
 search path as a string when creating a new document manager
 object, or call the method <code>setMetadataSearchPath()</code>.</p>
-<h3 id="the_modelmaker_creating_storage_on_demand">The ModelMaker: creating storage on demand</h3>
+<h3 id="the-modelmaker-creating-storage-on-demand">The ModelMaker: creating storage on demand</h3>
 <p>In order for the document manager to build the union of the
 imported documents (which we sometimes refer to as the
 <em>imports closure</em>), there must be some means of creating new graphs
@@ -961,7 +961,7 @@ to generate new stores. The document man
 appropriate graph from the containing model. Except in cases where
 you are extending Jena's internal structures, you should think of
 <code>Model</code> as the container of RDF and ontology data.</p>
-<h3 id="controlling_imports_processing">Controlling imports processing</h3>
+<h3 id="controlling-imports-processing">Controlling imports processing</h3>
 <p>By default, loading imports during the <code>read()</code> call is automatic. To
 <code>read()</code> an ontology without building the imports closure, call the
 method <code>setProcessImports( false )</code> on the document manager object
@@ -971,7 +971,7 @@ selective, and ignore only certain URI's
 documents. To selectively skip certain named imports, call the
 method <code>addIgnoreImport( String uri )</code> on the document manager
 object, or set the <code>ignoreImport</code> property in the policy.</p>
-<h3 id="managing_file_references">Managing file references</h3>
+<h3 id="managing-file-references">Managing file references</h3>
 <p>An advantage of working with ontologies is that we can reuse work
 done by other ontologists, by importing their published ontologies
 into our own. The <code>OntModel</code> can load such referenced ontologies
@@ -1033,7 +1033,7 @@ initialised to the directory in which Je
 </pre></div>
 
 
-<h3 id="specifying_prefixes">Specifying prefixes</h3>
+<h3 id="specifying-prefixes">Specifying prefixes</h3>
 <p>A model keeps a table of URI prefixes which can be used to present
 URI's in the shortened <code>prefix:name</code> form. This is useful in
 displaying URI's in a readable way in user interfaces, and is
@@ -1042,7 +1042,7 @@ The ontology model's table of prefixes c
 table kept by the document manager, which contains the standard
 prefixes plus any that are declared by in the policy file (or added
 to subsequently by method calls).</p>
-<h3 id="caching_of_imported_models">Caching of imported models</h3>
+<h3 id="caching-of-imported-models">Caching of imported models</h3>
 <p>You can use the document manager to assist with loading ontology
 documents through its cache. Suppose two ontologies, A and B, both
 import ontology C. We would like not to have to read C twice when
@@ -1060,7 +1060,7 @@ use the policy property <code>cacheModel
 <code>setCacheModels( boolean caching )</code> with <code>caching = false</code>. The
 document manager's current model cache can be cleared at any time
 by calling <code>clearCache()</code>.</p>
-<h2 id="the_generic_ontology_type_ontresource">The generic ontology type: OntResource</h2>
+<h2 id="the-generic-ontology-type-ontresource">The generic ontology type: OntResource</h2>
 <p>All of the classes in the ontology API that represent ontology
 values have
 <a href="/jena/documentation/javadoc/com/hp/hpl/jena/ontology/OntResource.html"><code>OntResource</code></a>
@@ -1124,27 +1124,27 @@ available methods:</p>
 </thead>
 <tbody>
 <tr>
-<td>add&lt;property&gt;</td>
+<td>add&lt;property></td>
 <td>Add an additional value for the given property</td>
 </tr>
 <tr>
-<td>set&lt;property&gt;</td>
+<td>set&lt;property></td>
 <td>Remove any existing values for the property, then add the given value</td>
 </tr>
 <tr>
-<td>list&lt;property&gt;</td>
+<td>list&lt;property></td>
 <td>Return an iterator ranging over the values of the property</td>
 </tr>
 <tr>
-<td>get&lt;property&gt;</td>
+<td>get&lt;property></td>
 <td>Return the value for the given property, if the resource has one. If not, return null. If it has more than one value, an arbitrary selection is made.</td>
 </tr>
 <tr>
-<td>has&lt;property&gt;</td>
-<td>Return true if there is at least one value for the given property. Depending on the name of the property, this is sometimes is&lt;property&gt;</td>
+<td>has&lt;property></td>
+<td>Return true if there is at least one value for the given property. Depending on the name of the property, this is sometimes is&lt;property></td>
 </tr>
 <tr>
-<td>remove&lt;property&gt;</td>
+<td>remove&lt;property></td>
 <td>Removes a given value from the values of the property on this resource. Has no effect if the resource does not have that value.</td>
 </tr>
 </tbody>
@@ -1241,7 +1241,7 @@ form.</p>
 
 <p>Related methods allow the <code>rdf:type</code> to be tested, set and
 returned.</p>
-<h2 id="ontology_classes_and_basic_class_expressions">Ontology classes and basic class expressions</h2>
+<h2 id="ontology-classes-and-basic-class-expressions">Ontology classes and basic class expressions</h2>
 <p>Classes are the basic building blocks of an ontology. A simple
 class is represented in Jena by an
 <a href="/jena/documentation/javadoc/com/hp/hpl/jena/ontology/OntClass.html">OntClass</a>
@@ -1373,7 +1373,7 @@ this class among their domain classes. T
 are intended to apply to instances of this class. Using
 <code>listDeclaredProperties</code> is explained in detail in the
 <a href="/jena/documentation/notes/rdf-frames.html">RDF frames how-to</a>.</p>
-<h2 id="ontology_properties">Ontology properties</h2>
+<h2 id="ontology-properties">Ontology properties</h2>
 <p>In an ontology, a <em>property</em> denotes the name of a relationship
 between resources, or between a resource and a data value. It
 corresponds to a predicate in logic representations. One
@@ -1444,7 +1444,7 @@ the ontology will contain <code>rdfs:sub
 the sub-property resources, since this is what the language
 defines. Jena will, in general, try to allow symmetric access to
 sub-properties and sub-classes from either direction.</p>
-<h3 id="object_and_datatype_properties">Object and Datatype properties</h3>
+<h3 id="object-and-datatype-properties">Object and Datatype properties</h3>
 <p>OWL refines the basic property type from RDF into two
 sub-types: <em>object properties</em> and <em>datatype properties</em> (for more
 details see
@@ -1469,7 +1469,7 @@ properties and so forth &ndash; to be ke
 hierarchy. However, when you create an object property or datatype
 property in a model, it will have the effect of asserting different
 <code>rdf:type</code> statements into the underlying triple store.</p>
-<h3 id="functional_properties">Functional properties</h3>
+<h3 id="functional-properties">Functional properties</h3>
 <p>OWL permits object and datatype properties to be <em>functional</em> &ndash;
 that is, for a given individual in the domain, the range value will
 always be the same. In particular, if <code>father</code> is a functional
@@ -1487,7 +1487,7 @@ facet. A non-functional property can be 
 <code>convertToFunctionalProperty()</code> method. When you are creating a
 property object, you also have the option of passing a Boolean
 parameter to the <code>createObjectProperty()</code> method on <code>OntModel</code>.</p>
-<h3 id="other_property_types">Other property types</h3>
+<h3 id="other-property-types">Other property types</h3>
 <p>There are several additional sub-types of ObjectProperty that
 represent additional capabilities of ontology properties. A
 <a href="/jena/documentation/javadoc/com/hp/hpl/jena/ontology/TransitiveProperty.html"><code>TransitiveProperty</code></a>
@@ -1535,7 +1535,7 @@ object: <code>myOntModel.setStrictMode( 
 <p>Finally, methods beginning <code>is...</code> (e.g. <code>isTransitiveProperty</code>)
 allow you to test whether a given property would support a given
 sub-type facet.</p>
-<h2 id="more_complex_class_expressions">More complex class expressions</h2>
+<h2 id="more-complex-class-expressions">More complex class expressions</h2>
 <p>We introduced the handling of basic, named classes above. These are
 the only kind of class descriptions available in RDFS. In OWL,
 however, there are a number of additional types of class
@@ -1543,7 +1543,7 @@ expression, which allow richer and more 
 concepts. There are two main categories of additional class
 expression: <em>restrictions</em> and <em>Boolean expressions</em>. We'll examine
 each in turn.</p>
-<h3 id="restriction_class_expressions">Restriction class expressions</h3>
+<h3 id="restriction-class-expressions">Restriction class expressions</h3>
 <p>A
 <a href="/jena/documentation/javadoc/com/hp/hpl/jena/ontology/Restriction.html">restriction</a>
 defines a class by reference to one of the properties of the
@@ -1684,7 +1684,7 @@ restriction. Assume <code>m</code> conta
 </pre></div>
 
 
-<h3 id="boolean_class_expressions">Boolean class expressions</h3>
+<h3 id="boolean-class-expressions">Boolean class expressions</h3>
 <p>Most developers are familiar with the use of Boolean operators to
 construct propositional expressions: conjunction (and), disjunction
 (or) and negation (not). OWL provides a means for constructing
@@ -1703,7 +1703,7 @@ constructing class expressions. While co
 single argument, union and intersection must necessarily take more
 than one argument. Before continuing with constructing and using
 Boolean class expressions, let's briefly to discuss lists.</p>
-<h3 id="list_expressions">List expressions</h3>
+<h3 id="list-expressions">List expressions</h3>
 <p>RDF originally had three container types: <code>Seq</code>, <code>Alt</code> and <code>Bag</code>.
 While useful, these are all open forms: it is not possible to say
 that a given container has a fixed number of values. The DAML+OIL
@@ -1791,7 +1791,7 @@ list, and so forth. For example:</p>
 </pre></div>
 
 
-<h3 id="intersection_union_and_complement_class_expressions">Intersection, union and complement class expressions</h3>
+<h3 id="intersection-union-and-complement-class-expressions">Intersection, union and complement class expressions</h3>
 <p>Given Jena's ability to construct lists, building intersection and
 union class expressions is straightforward. The <code>create</code> methods on
 OntModel allow us to construct an intersection or union directly.
@@ -1867,7 +1867,7 @@ time.</p>
 <p>Complement class expressions are very similar. The principal
 difference is that they take only a single class as operand, and
 therefore do not accept a list of operands.</p>
-<h3 id="enumerated_classes">Enumerated classes</h3>
+<h3 id="enumerated-classes">Enumerated classes</h3>
 <p>The final type class expression allows by OWL is the enumerated
 class. Recall that a class is a set of individuals. Often, we want
 to define the members of the <em>implicitly</em>: for example, "the class
@@ -1914,7 +1914,7 @@ following:</p>
 of the <code>DataRange</code> are literal values, such as integers, dates or strings. See the
 <a href="/jena/documentation/javadoc/com/hp/hpl/jena/ontology/DataRange.html"><code>DataRange</code> javadoc</a>
 for more details.</p>
-<h3 id="listing_classes">Listing classes</h3>
+<h3 id="listing-classes">Listing classes</h3>
 <p>In many applications, we need to inspect the set of classes
 in an ontology. The <code>list...</code> methods on <code>OntModel</code> provide a variety
 of means of listing types of class. The methods available include:</p>
@@ -1962,7 +1962,7 @@ exploited by the programmer: to list cla
 separately, perform the <code>listClasses()</code> and <code>listRestictions()</code>
 methods on the base model only, or on a model with no reasoner
 attached.</p>
-<h2 id="instances_or_individuals">Instances or individuals</h2>
+<h2 id="instances-or-individuals">Instances or individuals</h2>
 <p>In OWL Full any value can be an individual &ndash; and
 thus the subject of triples in the RDF graph other than ontology
 declarations. In OWL Lite and DL, the language terms and the
@@ -2002,7 +2002,7 @@ convenience: OWL and RDFS denote class m
 <code>rdf:type</code> property, and methods for manipulating and testing
 <code>rdf:type</code> are defined on <code>OntResource</code>. You may use either
 approach interchangeably.</p>
-<h2 id="ontology_meta-data">Ontology meta-data</h2>
+<h2 id="ontology-meta-data">Ontology meta-data</h2>
 <p>In OWL, but not RDFS, meta-data about the ontology
 itself is encoded as properties on an individual of class
 <code>owl:Ontology</code>. By convention,
@@ -2119,7 +2119,7 @@ meta-data to a model, for example:</p>
 document to be imported (or removed). However, by calling
 <code>OntModel.setDynamicImports(true)</code>, the model will start noticing
 the addition or removal of <code>owl:imports</code> statements.</p>
-<h2 id="ontology_inference_overview">Ontology inference: overview</h2>
+<h2 id="ontology-inference-overview">Ontology inference: overview</h2>
 <p>You have the choice of whether to use the Ontology API with Jena's
 reasoning capability turned on, and, if so, which of the various
 reasoners to use. Sometimes a reasoner will add information to the
@@ -2179,7 +2179,7 @@ available choices are described in the s
 <p>Depending on which of these choices is made, the statements
 returned from queries to a given ontology model may vary
 considerably.</p>
-<h3 id="additional_notes">Additional notes</h3>
+<h3 id="additional-notes">Additional notes</h3>
 <p>Jena's inference machinery defines some specialised services that
 are not exposed through the addition of extra triples to the model.
 These are exposed by the
@@ -2214,7 +2214,7 @@ of the ontology model:</p>
 <p>See also the note on
 <a href="common-problems.html#aBox-tBox">combining a-box and t-box data</a>
 using the OntModel.</p>
-<h2 id="working_with_persistent_ontologies">Working with persistent ontologies</h2>
+<h2 id="working-with-persistent-ontologies">Working with persistent ontologies</h2>
 <p>A common way to work with ontology data is to load the ontology
 axioms and instances at run-time from a set of source documents.
 This is a very flexible approach, but has limitations. In
@@ -2315,7 +2315,7 @@ problem.</p>
 <p>A <a href="TODO">sample program</a>
 shows the above steps combined, to create an ontology in which both
 base model and imports are stored in a persistent database.</p>
-<h2 id="experimental_ontology_tools">Experimental ontology tools</h2>
+<h2 id="experimental-ontology-tools">Experimental ontology tools</h2>
 <p>Starting with Jena release 2.6, the <code>OntTools</code> class provides a
 small collection of commonly-requested utilities for assisting with
 ontology processing. Given that this is a new feature, you should

Modified: websites/staging/jena/trunk/content/jena/documentation/ontology/toc-test.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/ontology/toc-test.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/ontology/toc-test.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/algebra.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/algebra.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/algebra.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -174,7 +174,7 @@ implementations.</p>
 package <code>com.hp.hpl.jena.sparql.algebra</code> in the <code>op</code> subpackage. 
 All the classes are names "<code>Op...</code>"; the interface that they all
 offer is "<code>Op</code>".</p>
-<h2 id="viewing_the_algebra_expression_for_a_query">Viewing the algebra expression for a Query</h2>
+<h2 id="viewing-the-algebra-expression-for-a-query">Viewing the algebra expression for a Query</h2>
 <p>The command line tool <a href="cmds.html#arq.qparse">arq.qparse</a> will print
 the algebra form of a query:</p>
 <div class="codehilite"><pre><span class="n">arq</span><span class="o">.</span><span class="n">qparse</span> <span class="o">--</span><span class="k">print</span><span class="o">=</span><span class="n">op</span> <span class="o">--</span><span class="n">query</span><span class="o">=</span><span class="n">Q</span><span class="o">.</span><span class="n">rq</span>
@@ -186,7 +186,7 @@ the algebra form of a query:</p>
 simple format for writing data structures involving RDF terms. It
 can be read back in again to produce the Java form of the algebra
 expression.</p>
-<h2 id="turning_a_query_into_an_algebra_expression">Turning a query into an algebra expression</h2>
+<h2 id="turning-a-query-into-an-algebra-expression">Turning a query into an algebra expression</h2>
 <p>Getting the algebra expression for a Query is simply a matter of
 passing the parsed Query object to the transaction function in the
 <code>Algebra</code> class:</p>
@@ -209,7 +209,7 @@ algebra.  Also, the query produced ma
 will yield the same results (for example, filters may be moved
 because the SPARQL query algebra translation in the SPARQL
 specification moves filter expressions around).</p>
-<h2 id="directly_reading_and_writing_algebra_expression">Directly reading and writing algebra expression</h2>
+<h2 id="directly-reading-and-writing-algebra-expression">Directly reading and writing algebra expression</h2>
 <p>The SSE class is a collection of functions to parse SSE expressions
 for the SPARQ algebra but also RDF terms, filter expressions and
 even dataset and graphs.</p>
@@ -233,11 +233,11 @@ output stream (it manages the conversion
 <code>IndentedWriter</code>s form for embedding in structured output.  Again,
 SSE is simply passing the calls to the writer operation from the
 <code>com.hp.hpl.jena.sparql.sse.writer</code> package.</p>
-<h2 id="creating_an_algebra_expression_programmatically">Creating an algebra expression programmatically</h2>
+<h2 id="creating-an-algebra-expression-programmatically">Creating an algebra expression programmatically</h2>
 <p>See the example in <code>src-examples/arq.examples.AlgebraExec</code>.</p>
 <p>To produce the complete javadoc for ARQ, download an ARQ
 distribution and run the ant task 'javadoc-all'.</p>
-<h2 id="evaluating_a_algebra_expression">Evaluating a algebra expression</h2>
+<h2 id="evaluating-a-algebra-expression">Evaluating a algebra expression</h2>
 <p>See the example in <code>src-examples/arq.examples.AlgebraExec</code>.</p>
 <div class="codehilite"><pre><span class="n">QueryIterator</span> <span class="n">qIter</span> <span class="o">=</span> <span class="n">Algebra</span><span class="o">.</span><span class="nb">exec</span><span class="p">(</span><span class="n">op</span><span class="p">,</span><span class="n">graph</span><span class="p">)</span> <span class="p">;</span>
 

Modified: websites/staging/jena/trunk/content/jena/documentation/query/app_api.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/app_api.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/app_api.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -161,7 +161,7 @@ engine, parsers, testing etc). Most appl
 use the main package. Only applications wishing to programmatically
 build queries or modify the behaviour of the query engine need to
 use the others packages directly.</p>
-<h2 id="key_classes">Key Classes</h2>
+<h2 id="key-classes">Key Classes</h2>
 <p>The package <code>com.hp.hpl.jena.query</code> is the main application
 package.</p>
 <ul>
@@ -183,7 +183,7 @@ package.</p>
 </ul>
 </li>
 </ul>
-<h2 id="select_queries">SELECT queries</h2>
+<h2 id="select-queries">SELECT queries</h2>
 <p>The basic steps in making a SELECT query are outlined in the
 example below. A query is created from a string using the
 <code>QueryFactory</code>. The query and model or RDF dataset to be queried
@@ -235,7 +235,7 @@ reduced to one step in some common cases
 </pre></div>
 
 
-<h3 id="example_formatting_a_result_set">Example: formatting a result set</h3>
+<h3 id="example-formatting-a-result-set">Example: formatting a result set</h3>
 <p>Instead of a loop to deal with each row in the result set, the
 application can call an operation of the ResultSetFormatter. This
 is what the command line applications do.</p>
@@ -250,7 +250,7 @@ is what the command line applications do
 </pre></div>
 
 
-<h3 id="example_processing_results">Example: Processing results</h3>
+<h3 id="example-processing-results">Example: Processing results</h3>
 <p>The results are objects from the Jena RDF API and API calls, which
 do not modify the model, can be mixed with query results
 processing:</p>
@@ -277,7 +277,7 @@ processing:</p>
 has finished. Typically, this involves collecting results of
 interest in a local datastructure and looping over that structure
 after the query execution has finished and been closed.</p>
-<h2 id="construct_queries">CONSTRUCT Queries</h2>
+<h2 id="construct-queries">CONSTRUCT Queries</h2>
 <p><code>CONSTRUCT</code> queries return a single RDF graph. As usual, the query
 execution should be closed after use.</p>
 <div class="codehilite"><pre><span class="n">Query</span> <span class="n">query</span> <span class="o">=</span> <span class="n">QueryFactory</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">queryString</span><span class="p">)</span> <span class="p">;</span>
@@ -287,7 +287,7 @@ execution should be closed after use.</p
 </pre></div>
 
 
-<h2 id="describe_queries">DESCRIBE Queries</h2>
+<h2 id="describe-queries">DESCRIBE Queries</h2>
 <p><code>DESCRIBE</code> queries return a single RDF graph. 
 <a href="extension.html#describeHandlers">Different handlers</a> for the
 <code>DESCRIBE</code> operation can be loaded by added by the application.</p>
@@ -298,7 +298,7 @@ execution should be closed after use.</p
 </pre></div>
 
 
-<h2 id="ask_queries">ASK Queries</h2>
+<h2 id="ask-queries">ASK Queries</h2>
 <p>The operation Query.execAsk() returns a boolean value indicating
 whether the query pattern matched the graph or dataset or not.</p>
 <div class="codehilite"><pre><span class="n">Query</span> <span class="n">query</span> <span class="o">=</span> <span class="n">QueryFactory</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">queryString</span><span class="p">)</span> <span class="p">;</span>
@@ -308,7 +308,7 @@ whether the query pattern matched the gr
 </pre></div>
 
 
-<h2 id="formatting_xml_results">Formatting XML results</h2>
+<h2 id="formatting-xml-results">Formatting XML results</h2>
 <p>The <code>ResultSetFormatter</code> class has methods to write out the
 <a href="http://www.w3.org/TR/rdf-sparql-XMLres/">SPARQL Query Results XML Format</a>.
 See ResultSetFormatter.outputAsXML method.</p>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/architecture.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/architecture.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/architecture.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -159,8 +159,10 @@
 <p>ARQ consists of the following parts:</p>
 <ul>
 <li>The SPARQL abstract syntax tree (AST) and the SPARQL parser</li>
-<li>The algebra generator that turns SPARQL AST into algebra
-    expressions<ul>
+<li>
+<p>The algebra generator that turns SPARQL AST into algebra
+    expressions</p>
+<ul>
 <li>Implementation of the translation in the SPARQL specification.</li>
 <li>Quad version compiling SPARQL to quad expressions, not basic
     graph patterns.</li>
@@ -182,7 +184,7 @@
     <a href="http://json.org">JSON</a> and text versions.</p>
 </li>
 </ul>
-<h2 id="main_packages">Main packages</h2>
+<h2 id="main-packages">Main packages</h2>
 <table>
 <thead>
 <tr>
@@ -229,9 +231,9 @@
 </tr>
 </tbody>
 </table>
-<h2 id="key_execution_classes">Key Execution Classes</h2>
+<h2 id="key-execution-classes">Key Execution Classes</h2>
 <h3 id="bindings">Bindings</h3>
-<h3 id="query_iterators">Query Iterators</h3>
+<h3 id="query-iterators">Query Iterators</h3>
 <h3 id="context">Context</h3>
 <p><a href="index.html">ARQ documentation index</a></p>
   </div>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/arq-query-eval.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/arq-query-eval.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/arq-query-eval.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -193,7 +193,7 @@ found in the <code>src-examples</code> d
 <li><a href="#CustomQueryEngines">Custom Query Engines</a></li>
 <li><a href="#AlgebraExtensions">Extend the algebra</a></li>
 </ul>
-<h2 id="overview_of_arq_query_processing">Overview of ARQ Query Processing</h2>
+<h2 id="overview-of-arq-query-processing">Overview of ARQ Query Processing</h2>
 <p>The sequence of actions performed by ARQ to perform a query are
 parsing, algebra generation, execution building, high-level
 optimization, low-level optimization and finally evaluation. It is
@@ -217,7 +217,7 @@ readability. It is not usually the best 
 programmatically and the AST is not normally an extension point.</p>
 <p>The query object can be used many times. It is not modified once
 created, and in particular it is not modified by query execution.</p>
-<h3 id="algebra_generation">Algebra generation</h3>
+<h3 id="algebra-generation">Algebra generation</h3>
 <p>ARQ generates the
 <a href="http://www.w3.org/TR/sparql11-query/#sparqlQuery">SPARQL algebra</a>
 expression for the query. After this a number of transformations
@@ -257,7 +257,7 @@ the internal data-structure for the alge
 at <a href="http://sparql.org/">sparql.org</a> can be used to see the algebra
 expression for a SPARQL query. This validator is also include in 
 <a href="../serving_data/">Fuseki</a>.</p>
-<h3 id="high-level_optimization_and_transformations">High-Level Optimization and Transformations</h3>
+<h3 id="high-level-optimization-and-transformations">High-Level Optimization and Transformations</h3>
 <p>There is a collection of transformations that can be applied to the
 algebra, such as replacing equality filters with a more efficient
 graph pattern and an assignment. When extending ARQ, a query
@@ -292,7 +292,7 @@ operation.</p>
 method is overridden to provide pretty printing and the static
 methods in <code>WriterOp</code> provide output to various output objects like
 <code>java.io.OutputStream</code>.</p>
-<h3 id="low-level_optimization_and_evaluation">Low-Level Optimization and Evaluation</h3>
+<h3 id="low-level-optimization-and-evaluation">Low-Level Optimization and Evaluation</h3>
 <p>The step of evaluating a query is the process of executing the
 algebra expression, as modified by any transformations applied, to
 yield a stream of pattern solutions. Low-level optimizations
@@ -311,7 +311,7 @@ incoming row. The result can be the empt
 returns false for <code>hasNext</code>). It is also common to not have to
 touch the incoming stream at all but merely to pass it to
 sub-operations.</p>
-<h3 id="query_engines_and_query_engine_factories">Query Engines and Query Engine Factories</h3>
+<h3 id="query-engines-and-query-engine-factories">Query Engines and Query Engine Factories</h3>
 <p>The steps from algebra generation to query evaluation are carried
 out when a query is executed via the <code>QueryExecution.execSelect</code> or
 other <code>QueryExecution</code> exec operation. It is possible to carry out
@@ -362,7 +362,7 @@ operation of the plan interface is to ge
 the query.</p>
 <p>See the example in
 <code>src-examples/arq.examples.engine.MyQueryEngine</code>.</p>
-<h2 id="the_main_query_engine">The Main Query Engine</h2>
+<h2 id="the-main-query-engine">The Main Query Engine</h2>
 <p>The main query engine can execute any query. It contains a number
 of basic graph pattern matching implementations including one that
 uses the <code>Graph.find</code> operation so it can work with any
@@ -395,7 +395,7 @@ algebra operation.</p>
 </ul>
 <p>The standard <code>OpExecutor</code> invokes the stage generator mechanism to
 match a basic graph pattern.</p>
-<h2 id="graph_matching_and_a_custom_stagegenerator">Graph matching and a custom StageGenerator</h2>
+<h2 id="graph-matching-and-a-custom-stagegenerator">Graph matching and a custom StageGenerator</h2>
 <p>The correct point to hook into ARQ for just extending basic graph
 pattern matching (BGPs) is to provide a custom <code>StageGenerator</code>. 
 (To hook into filtered basic graph patterns, the extension will
@@ -439,7 +439,7 @@ elements.</p>
 </pre></div>
 
 
-<h3 id="setting_the_stage_generator">Setting the Stage Generator</h3>
+<h3 id="setting-the-stage-generator">Setting the Stage Generator</h3>
 <p>An extension stage generator can be registered on a per-query
 execution basis or (more usually) in the global context.</p>
 <div class="codehilite"><pre>    <span class="n">StageBuilder</span><span class="o">.</span><span class="n">setGenerator</span><span class="p">(</span><span class="n">Context</span><span class="p">,</span> <span class="n">StageGenerator</span><span class="p">)</span>
@@ -580,7 +580,7 @@ custom query engine and overriding <code
 <p>The extension may need to provide its own dataset implementation so
 that it can detect when queries are directed to its named graph
 storage. <a href="../tdb/">TDB</a> and <a href="../sdb/">SDB</a> are examples of this.</p>
-<h2 id="mixed_graph_implementation_datasets">Mixed Graph Implementation Datasets</h2>
+<h2 id="mixed-graph-implementation-datasets">Mixed Graph Implementation Datasets</h2>
 <p>The dataset implementation used in normal operation does not work
 on quads but instead can provide a dataset with a collection of
 graphs each from different implementation sub-systems. In-memory
@@ -590,7 +590,7 @@ custom <code>OpExecutor</code> will need
 make sure it is of the right class. The pattern in the
 <code>StageGenerator</code> extension point is an example of design pattern in
 that situation.</p>
-<h2 id="custom_query_engines">Custom Query Engines</h2>
+<h2 id="custom-query-engines">Custom Query Engines</h2>
 <p>A custom query engine enables an extension to choose which datasets
 it wishes to handle. It also allows the extension to intercept
 query execution during the setup of the execution so it can modify
@@ -608,7 +608,7 @@ provides the machinery for result presen
 <code>CONSTRUCT</code>, <code>DESCRIBE</code>, <code>ASK</code>), leaving the work of pattern
 evaluation to the custom query engine. <code>QueryExecutionFactory</code>
 assumes that <code>QueryExecutionBase</code> will be used.</p>
-<h2 id="algebra_extensions">Algebra Extensions</h2>
+<h2 id="algebra-extensions">Algebra Extensions</h2>
 <p>New operators can be added to the algebra using the <code>OpExt</code> class
 as the super-class of the new operator. They can be inserted into
 the expression to be evaluated using a custom query engine to

Modified: websites/staging/jena/trunk/content/jena/documentation/query/assignment.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/assignment.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/assignment.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -175,7 +175,7 @@ form of assignment.</p>
 
 
 <p>Note: Assignment is "<strong>:=</strong>"</p>
-<h2 id="assignment_rules">Assignment Rules</h2>
+<h2 id="assignment-rules">Assignment Rules</h2>
 <p>ARQ assignment is single assignment, that is, once a variable is
 assigned a binding, then it can not be changed in the same query
 solution.</p>
@@ -197,7 +197,7 @@ scope.</p>
 matching, not to FILTER expressions. Some graph implementation only
 provide same-term graph pattern matching. FILTERs always do
 value-based comparisons for "=" for all graphs.</p>
-<h2 id="use_with_construct">Use with CONSTRUCT</h2>
+<h2 id="use-with-construct">Use with CONSTRUCT</h2>
 <p>One use is to perform some calculation prior to forming the result
 graph in a CONSTRUCT query.</p>
 <div class="codehilite"><pre><span class="n">CONSTRUCT</span> <span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="p">:</span><span class="n">lengthInCM</span> <span class="p">?</span><span class="n">cm</span> <span class="p">}</span>
@@ -209,7 +209,7 @@ graph in a CONSTRUCT query.</p>
 </pre></div>
 
 
-<h2 id="use_with_bound">Use with !BOUND</h2>
+<h2 id="use-with-bound">Use with !BOUND</h2>
 <p>The OPTIONAL/!BOUND/FILTER idiom for performing limited negation of
 a pattern in SPARQL can be inconvenient because it requires a
 variable in the OPTIONAL to be assigned by pattern matching.  Using

Modified: websites/staging/jena/trunk/content/jena/documentation/query/cmds.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/cmds.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/cmds.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/download.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/download.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/download.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/explain.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/explain.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/explain.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -169,7 +169,7 @@ basic graph patterns.</p>
 <p>The effect of <a href="#Algebra_Transformations">high-level optimizations</a> can
 be seen using <code>arq.qparse</code> and the low-level runtime optimziations can
 be seen by <a href="#Execution_Logging">execution logging</a>.</p>
-<h2 id="algebra_transformations">Algebra Transformations</h2>
+<h2 id="algebra-transformations">Algebra Transformations</h2>
 <p>The preparation for a query for execution can be investigated with the
 command <code>arq.qparse --explain --query QueryFile.rq</code>. Different storage
 systems may perform different optimizations, usually chosen from the
@@ -192,7 +192,7 @@ Argument | Effect
 </pre></div>
 
 
-<h2 id="execution_logging">Execution Logging</h2>
+<h2 id="execution-logging">Execution Logging</h2>
 <p>ARQ can log query and update execution details globally or for an
 individual operations. This adds another level of control on top of the
 logger level controls.</p>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/extension.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/extension.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/extension.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -183,20 +183,20 @@ can
 <p>The <a href="lucene-arq.html">free text support in ARQ</a> is provided by
 <a href="http://lucene.apache.org/java/docs/index.html">Lucene</a>, using
 property functions.</p>
-<h2 id="filter_functions">Filter Functions</h2>
+<h2 id="filter-functions">Filter Functions</h2>
 <p>A SPARQL custom function is implementation dependent. Most details
 of the ARQ query engine do not have to be understood to write a
 function; it is a matter of implementing one interface.  This is
 made simpler for many cases by a number of base classes that
 provide much of the machinery needed.</p>
-<h3 id="function_registry">Function Registry</h3>
+<h3 id="function-registry">Function Registry</h3>
 <p>Functions can be installed into the function registry by the
 application. The function registry is a mapping from URI to a
 factory class for functions (each time a function is mentioned in a
 query, a new instance is created) and there is an auto-factory
 class so just registering a Java class will work. A function can
 access the queried dataset.</p>
-<h3 id="dynamically_loaded_functions">Dynamically Loaded Functions</h3>
+<h3 id="dynamically-loaded-functions">Dynamically Loaded Functions</h3>
 <p>The ARQ function library uses this mechanism.  The namespace of the
 ARQ function library is &lt;<code>http://jena.hpl.hp.com/ARQ/function#&gt;</code>.</p>
 <div class="codehilite"><pre><span class="n">PREFIX</span> <span class="n">afn:</span> <span class="sr">&lt;http://jena.hpl.hp.com/ARQ/function#&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><span class="n">SELECT</span> <span class="p">?</span><span class="n">v</span><span class="p">{</span> <span class="p">?</span><span class="n">x</span> <span class="n">dc:date</span> <span class="p">?</span><span class="n">date</span> <span class="o">.</span> <span class="n">FILTER</span> <span class="p">(?</span><span class="n">date</span> <span class="o">&lt;</span> <span class="n">afn:now</span><span class="p">()</span> <span class="p">)}</span>
@@ -209,7 +209,7 @@ ARQ function library is &lt;<code>http:/
 <p>URIs for functions in the (fake)
 <a href="java-uri.html">URI scheme <code>java:</code></a> are dynamically loaded. The
 class name forms the scheme specific part of the URI.</p>
-<h2 id="property_functions">Property functions</h2>
+<h2 id="property-functions">Property functions</h2>
 <p>Property functions, sometimes called "magic properties", are
 properties that cause triple matching to happen by executing some
 piece of code, determined by the property URI, and not by the usual
@@ -263,7 +263,7 @@ be turned off by the Java code:</p>
 <p>URIs for functions in the (fake)
 <a href="java-uri.html">URI scheme <code>java:</code></a> are dynamically loaded. The
 class name forms the scheme specific part of the URI.</p>
-<h2 id="describe_handlers">DESCRIBE handlers</h2>
+<h2 id="describe-handlers">DESCRIBE handlers</h2>
 <p>The <code>DESCRIBE</code> result form in SPARQL does not define an exact form
 of RDF to return. Instead, it allows the server or query processor
 to return what it considers to be an appropriate description of the
@@ -278,7 +278,7 @@ result forms.</p>
 <p>Application-specific handlers can be added to the
 <code>DescribeHandlerRegistry</code>. The handler will be called for each
 resource (not literals) identified by the <code>DESCRIBE</code> query.</p>
-<h2 id="blank_node_labels">Blank Node Labels</h2>
+<h2 id="blank-node-labels">Blank Node Labels</h2>
 <p>URIs from with scheme name "_" (which is illegal) are created as
 blank node labels for directly accessing a blank node in the
 queried graph or dataset. This are constant terms in the query -

Modified: websites/staging/jena/trunk/content/jena/documentation/query/faq.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/faq.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/faq.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/function_forms.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/function_forms.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/function_forms.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/group-by.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/group-by.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/group-by.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -158,7 +158,7 @@
     <p>ARQ includes support for GROUP BY and counting.</p>
 <p>This involves is syntactic extension and is available if the query
 is parsed with language <code>Syntax.syntaxARQ</code>.</p>
-<h2 id="group_by">GROUP BY</h2>
+<h2 id="group-by">GROUP BY</h2>
 <p>A <code>GROUP BY</code> clause transforms a result set so that only one row
 will appear for each unique set of grouping variables. All other
 variables from the query pattern are projected away and are not

Modified: websites/staging/jena/trunk/content/jena/documentation/query/index.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/index.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/index.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -160,7 +160,7 @@ supports the
 <a href="http://www.w3.org/TR/sparql11-query/">SPARQL RDF Query language</a>.
 SPARQL is the query language developed by the W3C
 <a href="http://www.w3.org/2001/sw/DataAccess/">RDF Data Access Working Group</a>.</p>
-<h2 id="arq_features">ARQ Features</h2>
+<h2 id="arq-features">ARQ Features</h2>
 <ul>
 <li>Standard SPARQL</li>
 <li>Free text search via Lucene</li>
@@ -187,12 +187,14 @@ SPARQL is the query language developed b
 <li><a href="explain.html">Explaining queries</a></li>
 <li><a href="manipulating_sparql_using_arq.html">Tutorial: manipulating SPARQL using ARQ</a></li>
 </ul>
-<h2 id="advanced_sparql_use">Advanced SPARQL use</h2>
+<h2 id="advanced-sparql-use">Advanced SPARQL use</h2>
 <p>Features of ARQ that are legal SPARQL syntax.</p>
 <ul>
 <li><a href="../larq/">Free text searches</a></li>
 <li><a href="rdf_lists.html">Accessing lists</a> (RDF collections)</li>
-<li><a href="extension.html">Extension mechanisms</a><ul>
+<li>
+<p><a href="extension.html">Extension mechanisms</a></p>
+<ul>
 <li><a href="extension.html#valueFunctions">Filter Functions</a></li>
 <li><a href="extension.html#propertyFunctions">Property Functions</a></li>
 </ul>
@@ -235,13 +237,13 @@ support for the submission is for legacy
 <li><a href="http://www.w3.org/Submission/SPARQL-Update/">SPARQL/Update Submission</a></li>
 <li><a href="update.html">The ARQ SPARQL/Update API</a></li>
 </ul>
-<h2 id="see_also">See Also</h2>
+<h2 id="see-also">See Also</h2>
 <ul>
 <li><a href="http://www.joseki.org">Joseki</a> - Server implementation of the SPARQL protocol.</li>
 <li><a href="../tdb">TDB - A SPARQL database for Jena</a>, a pure Java persistence layer for large graphs, high performance applications and embedded use.</li>
 <li><a href="../sdb">SDB - A SPARQL database for Jena</a>, using SQL databases.</li>
 </ul>
-<h2 id="w3c_documents">W3C Documents</h2>
+<h2 id="w3c-documents">W3C Documents</h2>
 <ul>
 <li><a href="http://www.w3.org/TR/sparql11-query/">SPARQL Query Language specification</a></li>
 <li><a href="http://www.w3.org/TR/rdf-sparql-XMLres/">SPARQL Query Results XML Format</a></li>
@@ -262,12 +264,12 @@ support for the submission is for legacy
 <li><a href="http://www.ldodds.com/blog/archives/000252.html">Writing an ARQ Extension Function</a>
     (by Leigh Dodds)</li>
 </ul>
-<h2 id="miscellaneous_resources">Miscellaneous Resources</h2>
+<h2 id="miscellaneous-resources">Miscellaneous Resources</h2>
 <ul>
 <li><a href="http://www.w3.org/TeamSubmission/turtle/">Turtle</a> - a non-XML
     RDF serialization</li>
 </ul>
-<h2 id="online_demo">Online Demo</h2>
+<h2 id="online-demo">Online Demo</h2>
 <p>Online <a href="http://www.sparql.org/query.html">Query Form</a> for
 experimenting with SPARQL queries.</p>
   </div>

Modified: websites/staging/jena/trunk/content/jena/documentation/query/java-uri.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/query/java-uri.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/query/java-uri.html Thu Mar 22 17:34:58 2012
@@ -47,7 +47,7 @@
   </div>
 
   <div id="navigation" class="clear">
-  <h1 id="quick_links">Quick links</h1>
+  <h1 id="quick-links">Quick links</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/download/index.html">Downloads</a></li>
@@ -57,7 +57,7 @@
 <li><a href="/jena/getting_involved/index.html">Getting involved</a></li>
 <li><a href="/jena/documentation/">Documentation</a></li>
 </ul>
-<h1 id="about_jena">About Jena</h1>
+<h1 id="about-jena">About Jena</h1>
 <ul>
 <li><a href="/jena/index.html">Home</a></li>
 <li><a href="/jena/about_jena/about.html">About Jena</a></li>
@@ -72,12 +72,12 @@
 <li><a href="/jena/download/maven.html">Using Maven</a></li>
 <li><a href="/jena/download/osgi.html">Using OSGi</a></li>
 </ul>
-<h1 id="help_and_support">Help and support</h1>
+<h1 id="help-and-support">Help and support</h1>
 <ul>
 <li><a href="/jena/help_and_support/index.html">Getting help</a></li>
 <li><a href="/jena/help_and_support/bugs_and_suggestions.html">Bugs and suggestions</a></li>
 </ul>
-<h1 id="getting_started">Getting Started</h1>
+<h1 id="getting-started">Getting Started</h1>
 <ul>
 <li><a href="/jena/getting_started/index.html">A first Jena project</a></li>
 <li><a href="/jena/getting_started/rdf_api.html">RDF API overview</a></li>
@@ -108,7 +108,7 @@
 </ul>
 </li>
 <li><a href="/jena/documentation/sdb/index.html">SDB</a></li>
-<li><a href="/jena/documentation/larq/index.html">LARQ</a></li>
+<li><a href="/jena/documentation/larq/index.html">LARQ: Free Text Search</a></li>
 <li><a href="/jena/documentation/serving_data/index.html">Fuseki: Serving Data</a></li>
 <li><a href="/jena/documentation/ontology/index.html">Ontology</a></li>
 <li><a href="/jena/documentation/inference/index.html">Inference</a></li>
@@ -139,11 +139,11 @@
 </ul>
 </li>
 </ul>
-<h1 id="getting_involved">Getting Involved</h1>
+<h1 id="getting-involved">Getting Involved</h1>
 <ul>
 <li><a href="/jena/getting_involved/index.html">Contributing to Jena</a></li>
 </ul>
-<h1 id="asf_links">ASF links</h1>
+<h1 id="asf-links">ASF links</h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
@@ -163,7 +163,7 @@ the class when needed. For functions and
 also wraps it in the necessary factory code. A new instance of the
 function or property function is created for each mention of the
 name in each query.</p>
-<h2 id="dynamic_code_loading">Dynamic Code Loading</h2>
+<h2 id="dynamic-code-loading">Dynamic Code Loading</h2>
 <p>Any classes loaded by ARQ must already be on the java classpath.
 ARQ does not create any new class loaders, nor modify the Java
 class path in any way. The class path must be set up to include any