You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/05/10 15:19:52 UTC

[1/8] jena git commit: JENA-1546: Fix for JDK10 javadoc

Repository: jena
Updated Branches:
  refs/heads/master 379c4c693 -> 0e18451fe


http://git-wip-us.apache.org/repos/asf/jena/blob/7e2879c2/jena-iri/src/main/xml/org/apache/jena/iri/impl/violations.xml
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/xml/org/apache/jena/iri/impl/violations.xml b/jena-iri/src/main/xml/org/apache/jena/iri/impl/violations.xml
index f687793..5323d51 100644
--- a/jena-iri/src/main/xml/org/apache/jena/iri/impl/violations.xml
+++ b/jena-iri/src/main/xml/org/apache/jena/iri/impl/violations.xml
@@ -110,7 +110,7 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
 <pre>
 ftpurl = "ftp://" login [ "/" fpath [ ";type=" ftptype ]]
 fpath = fsegment *[ "/" fsegment ]
-fsegment = *[ uchar | "?" | ":" | "@" | "&amp;" | "=" ]
+fsegment = *[ uchar | "?" | ":" | "@" | "&amp;amp;" | "=" ]
 ftptype = "A" | "I" | "D" | "a" | "i" | "d"
 </pre>
 <pre>
@@ -152,7 +152,7 @@ login = [ user [ ":" password ] "@" ] hostport
 <pre>
      mailtoURL  =  "mailto:" [ to ] [ headers ]
      to         =  #mailbox
-     headers    =  "?" header *( "&amp;" header )
+     headers    =  "?" header *( "&amp;amp;" header )
      header     =  hname "=" hvalue
      hname      =  *urlc
      hvalue     =  *urlc
@@ -166,7 +166,7 @@ login = [ user [ ":" password ] "@" ] hostport
 newsurl = "news:" grouppart
 grouppart = "*" | group | article
 group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
-article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;" | "=" ] "@" host
+article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;amp;" | "=" ] "@" host
 </pre>
 <pre>
 safe = "$" | "-" | "_" | "." | "+"
@@ -183,7 +183,7 @@ uchar = unreserved | escape
 newsurl = "news:" grouppart
 grouppart = "*" | group | article
 group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
-article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;" | "=" ] "@" host
+article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;amp;" | "=" ] "@" host
 </pre>
 </text></prohibit>
            <require component="PATH" section="5"><text>
@@ -191,7 +191,7 @@ article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;" | "=" ] "@" host
 newsurl = "news:" grouppart
 grouppart = "*" | group | article
 group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
-article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;" | "=" ] "@" host
+article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;amp;" | "=" ] "@" host
 </pre>
 </text></require>
            <pattern component="PATHQUERY" reserved="~@">[^@]+@@{host}|[*]|[a-zA-Z][-a-zA-Z0-9.+_]*</pattern>
@@ -248,7 +248,7 @@ fileurl = "file://" [ host | "localhost" ] "/" fpath
 </pre>
 <pre>
 fpath = fsegment *[ "/" fsegment ]
-fsegment = *[ uchar | "?" | ":" | "@" | "&amp;" | "=" ]
+fsegment = *[ uchar | "?" | ":" | "@" | "&amp;amp;" | "=" ]
 </pre>
 <pre>
 safe = "$" | "-" | "_" | "." | "+"
@@ -370,27 +370,27 @@ fileurl = "file://" [ host | "localhost" ] "/" fpath
   <defn section="2">
    All URNs have the following syntax (phrases enclosed in quotes are REQUIRED):
 <pre>
-&lt;URN> ::= "urn:" &lt;NID> ":" &lt;NSS>
+&lt;URN&amp;gt; ::= "urn:" &lt;NID&amp;gt; ":" &lt;NSS&amp;gt;
 </pre>
 </defn>
 <defn section="2.1">
 <pre>
-&lt;NID>         ::= &lt;let-num> [ 1,31&lt;let-num-hyp> ]
+&lt;NID&amp;gt;         ::= &lt;let-num&amp;gt; [ 1,31&lt;let-num-hyp&amp;gt; ]
 
-&lt;let-num-hyp> ::= &lt;upper> | &lt;lower> | &lt;number> | "-"
+&lt;let-num-hyp&amp;gt; ::= &lt;upper&amp;gt; | &lt;lower&amp;gt; | &lt;number&amp;gt; | "-"
 
-&lt;let-num>     ::= &lt;upper> | &lt;lower> | &lt;number>
+&lt;let-num&amp;gt;     ::= &lt;upper&amp;gt; | &lt;lower&amp;gt; | &lt;number&amp;gt;
 </pre>
 </defn>
 <defn section="2.2">
 <pre>
-&lt;NSS>         ::= 1*&lt;URN chars>
+&lt;NSS&amp;gt;         ::= 1*&lt;URN chars&amp;gt;
 
-&lt;URN chars>   ::= &lt;trans> | "%" &lt;hex> &lt;hex>
+&lt;URN chars&amp;gt;   ::= &lt;trans&amp;gt; | "%" &lt;hex&amp;gt; &lt;hex&amp;gt;
 
-&lt;trans>       ::= &lt;upper> | &lt;lower> | &lt;number> | &lt;other> | &lt;reserved>
+&lt;trans&amp;gt;       ::= &lt;upper&amp;gt; | &lt;lower&amp;gt; | &lt;number&amp;gt; | &lt;other&amp;gt; | &lt;reserved&amp;gt;
 
-&lt;other>       ::= "(" | ")" | "+" | "," | "-" | "." |
+&lt;other&amp;gt;       ::= "(" | ")" | "+" | "," | "-" | "." |
                   ":" | "=" | "@" | ";" | "$" |
                   "_" | "!" | "*" | "'"
 </pre>
@@ -405,12 +405,12 @@ but rather use the appropriate %-encoding for each character.
            <prohibit component="AUTHORITY">
            <text section="2">
 <pre>
-&lt;URN> ::= "urn:" &lt;NID> ":" &lt;NSS>
+&lt;URN&amp;gt; ::= "urn:" &lt;NID&amp;gt; ":" &lt;NSS&amp;gt;
 </pre>
 </text>
 <text section="2.1">
 <pre>
-&lt;NID>         ::= &lt;let-num> [ 1,31&lt;let-num-hyp> ]
+&lt;NID&amp;gt;         ::= &lt;let-num&amp;gt; [ 1,31&lt;let-num-hyp&amp;gt; ]
 </pre>
 </text></prohibit>
 
@@ -418,7 +418,7 @@ but rather use the appropriate %-encoding for each character.
            <require component="PATH">
            <text section="2">
 <pre>
-&lt;URN> ::= "urn:" &lt;NID> ":" &lt;NSS>
+&lt;URN&amp;gt; ::= "urn:" &lt;NID&amp;gt; ":" &lt;NSS&amp;gt;
 </pre>
 </text></require>
            
@@ -616,7 +616,7 @@ In addition, octet 0 (0 hex) should NEVER be used, in either unencoded or %-enco
 	    <spec ref="IRI">
              <text fragment="page-13">
               Systems accepting IRIs MAY also deal with the printable characters in US-ASCII 
-              that are not allowed in URIs, namely "&lt;", ">", '"', space, "{", "}", "|", "\", 
+              that are not allowed in URIs, namely "&lt;", "&amp;gt;", '"', space, "{", "}", "|", "\", 
               "^", and "`", in step 2 above. If these characters are found but are not converted, 
               then the conversion SHOULD fail. 
              </text>
@@ -624,7 +624,7 @@ In addition, octet 0 (0 hex) should NEVER be used, in either unencoded or %-enco
 	    <also ref="URI" fragment="page-49"/>
 	    <bad>http://example.org/fo|o</bad>
 	    <bad>http://example.org/fo&lt;o</bad>
-	    <bad>http://example.org/fo>o</bad>
+	    <bad>http://example.org/fo&amp;gt;o</bad>
 	    <bad>http://example.org/fo"o</bad>
 	    <bad>http://example.org/fo`o</bad>
     </violation>
@@ -954,13 +954,13 @@ Whitespace characters
 	    <spec ref="Schema">
 <text fragment="schema">
 <pre>
-&lt;xs:simpleType name=&quot;anyURI&quot; id=&quot;anyURI&quot;&gt;
+&lt;xs:simpleType name=&quot;anyURI&quot; id=&quot;anyURI&quot;&amp;gt;
 		    [...]
-    &lt;xs:restriction base=&quot;xs:anySimpleType&quot;&gt;
-      &lt;xs:whiteSpace fixed=&quot;true&quot; value=&quot;collapse&quot; id=&quot;anyURI.whiteSpace&quot;/&gt;
+    &lt;xs:restriction base=&quot;xs:anySimpleType&quot;&amp;gt;
+      &lt;xs:whiteSpace fixed=&quot;true&quot; value=&quot;collapse&quot; id=&quot;anyURI.whiteSpace&quot;/&amp;gt;
 
-    &lt;/xs:restriction&gt;
-&lt;/xs:simpleType&gt;
+    &lt;/xs:restriction&amp;gt;
+&lt;/xs:simpleType&amp;gt;
 </pre>
   </text>
             </spec>
@@ -1552,7 +1552,7 @@ A component using right-to-left characters SHOULD start and end
            <text section="3.3">
         The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:
 <pre>
-      &lt;prefix>'-'&lt;tree-specific identifier>
+      &lt;prefix&amp;gt;'-'&lt;tree-specific identifier&amp;gt;
 </pre>
 For instance, the "foo" tree would allow creation of scheme names of the form: "foo-blahblah:" and "foo-bar:", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix. 
  </text>
@@ -1580,7 +1580,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
            <text section="3.3">
         The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:
 <pre>
-      &lt;prefix>'-'&lt;tree-specific identifier>
+      &lt;prefix&amp;gt;'-'&lt;tree-specific identifier&amp;gt;
 </pre>
 For instance, the "foo" tree would allow creation of scheme names of the form: "foo-blahblah:" and "foo-bar:", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix. 
  </text>


[3/8] jena git commit: JENA-1546: Set surefire to 2.21.0. Clean-up some javadoc

Posted by an...@apache.org.
JENA-1546: Set surefire to 2.21.0. Clean-up some javadoc


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f754a311
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f754a311
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f754a311

Branch: refs/heads/master
Commit: f754a3112e15045a298578e6debcb171e9f0b424
Parents: 7e2879c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 9 22:29:10 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 9 22:29:10 2018 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/atlas/json/JSON.java   |  2 +-
 .../org/apache/jena/atlas/json/JsonBuilder.java |  2 +-
 .../main/java/org/apache/jena/query/ARQ.java    | 10 ++++----
 .../org/apache/jena/query/QuerySolutionMap.java |  2 +-
 .../org/apache/jena/riot/RDFParserBuilder.java  |  4 +--
 .../java/org/apache/jena/riot/WebContent.java   |  2 +-
 .../jena/riot/lang/BlankNodeAllocatorHash.java  |  2 +-
 .../apache/jena/riot/system/IRIResolver.java    |  2 +-
 .../org/apache/jena/riot/system/RiotLib.java    |  2 +-
 .../java/org/apache/jena/sparql/SystemARQ.java  |  4 +--
 .../jena/sparql/algebra/optimize/Optimize.java  |  4 +--
 .../optimize/TransformPromoteTableEmpty.java    | 18 +++++++-------
 .../jena/sparql/core/TxnDataset2Graph.java      |  4 +--
 .../jena/sparql/engine/http/HttpQuery.java      |  4 +--
 .../java/org/apache/jena/sparql/expr/Expr.java  |  4 +--
 .../org/apache/jena/sparql/expr/ExprList.java   |  2 +-
 .../org/apache/jena/sparql/expr/NodeValue.java  |  2 +-
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java   | 16 ++++++------
 .../jena/sparql/graph/NodeTransformLib.java     | 12 ++++-----
 .../apache/jena/sparql/lib/RDFTerm2Json.java    |  2 +-
 .../org/apache/jena/atlas/io/OutStreamUTF8.java |  2 +-
 .../org/apache/jena/atlas/iterator/Iter.java    |  4 +--
 .../java/org/apache/jena/atlas/lib/Bytes.java   |  4 +--
 .../apache/jena/atlas/lib/RefCountingMap.java   |  2 +-
 .../apache/jena/atlas/lib/tuple/TupleMap.java   | 26 ++++++++++----------
 jena-cmds/src/main/java/jena/rdfcat.java        |  2 +-
 .../java/org/apache/jena/enhanced/EnhNode.java  |  2 +-
 .../java/org/apache/jena/ontology/OntTools.java |  2 +-
 .../apache/jena/rdf/model/impl/RDFListImpl.java |  2 +-
 .../apache/jena/rdf/model/impl/ReifierStd.java  |  2 +-
 .../org/apache/jena/rdf/model/impl/Util.java    |  4 +--
 .../org/apache/jena/shared/PrefixMapping.java   |  4 +--
 .../java/org/apache/jena/util/OneToManyMap.java |  2 +-
 .../org/apache/jena/util/ResourceUtils.java     |  2 +-
 .../org/apache/jena/vocabulary/RDFTest.java     |  2 +-
 .../apache/jena/dboe/base/record/Record.java    |  8 +++---
 .../jena/dboe/transaction/TransInteger.java     |  1 -
 .../dboe/transaction/TransactionalInteger.java  |  2 +-
 .../org/apache/jena/tdb2/solver/SolverLib.java  |  2 +-
 .../apache/jena/tdb2/store/NodeIdInline.java    |  2 +-
 .../jena/tdb2/store/nodetable/NodeTable.java    |  2 +-
 .../jena/fuseki/build/RefCountingMap.java       |  2 +-
 .../org/apache/jena/fuseki/package-info.java    |  2 +-
 .../apache/jena/fuseki/server/RequestLog.java   |  2 +-
 jena-tdb/pom.xml                                |  1 -
 .../org/apache/jena/tdb/base/record/Record.java |  8 +++---
 .../jena/tdb/setup/StoreParamsDynamic.java      |  4 +--
 .../org/apache/jena/tdb/solver/SolverLib.java   |  4 +--
 pom.xml                                         | 17 +++++--------
 49 files changed, 106 insertions(+), 113 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
index 2ddc912..8111a40 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
@@ -189,7 +189,7 @@ public class JSON
 
     /** Build a JsonObject.  The outer object is created and then the {@code setup} function called to fill in the contents.
      * <pre>
-     * buildObject(builder->{
+     * buildObject(builder-&gt;{
      *     builder.pair("key", 1234);
      * });
      * </pre>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
index 9347e98..85e6dab 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
@@ -92,7 +92,7 @@ public class JsonBuilder {
 
     /** Build a JsonObject.  The outer object is created and then the {@code setup} function called to fill in the contents.
      * <pre>
-     * buildObject(builder->{
+     * buildObject(builder-&gt;{
      *     builder.pair("key", 1234);
      * });
      * </pre>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index fa99256..099b0fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -236,9 +236,9 @@ public class ARQ
 
     /** 
      * Use this Symbol to allow passing additional query parameters to a 
-     * SERVICE <IRI> call.
-     * Parameters need to be grouped by SERVICE <IRI>,  
-     * a Map<String, Map<String,List<String>>> is assumed.
+     * {@literal SERVICE <IRI>} call.
+     * Parameters need to be grouped by {@literal SERVICE <IRI>},  
+     * a {@literal Map<String, Map<String,List<String>>>} is assumed.
      * The key of the first map is the SERVICE IRI, the value is a Map 
      * which maps the name of a query string parameters to its values.
      * 
@@ -317,7 +317,7 @@ public class ARQ
     
     /** 
      *  Context key controlling whether the main query engine flattens simple paths
-     *  (e.g. <tt>?x :p/:q ?z => ?x :p ?.0 . ?.0 ?q ?z</tt>)   
+     *  (e.g. <tt>?x :p/:q ?z =&gt; ?x :p ?.0 . ?.0 ?q ?z</tt>)   
      *  <p>Default is "true"
      */  
     public static final Symbol optPathFlatten = SystemARQ.allocSymbol("optPathFlatten") ;
@@ -408,7 +408,7 @@ public class ARQ
 
     /** 
      *  Context key controlling whether the standard optimizer applies
-     *  optimizations to conjunctions (&&) in filters.
+     *  optimizations to conjunctions (&amp;&amp;) in filters.
      *  <p>By default, this transformation is applied.
      */  
     public static final Symbol optFilterConjunction = SystemARQ.allocSymbol("optFilterConjunction") ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java b/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
index e2d5098..da2884d 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
@@ -58,7 +58,7 @@ public class QuerySolutionMap extends QuerySolutionBase
      * to the <code>QuerySolutionMap</code> and later changes to either <code>Map</code>
      * or <code>QuerySolutionMap</code> will not reflected in the other.  
      * 
-     * @return Map<String, RDFNode>
+     * @return {@literal Map<String, RDFNode>}
      */
     public Map<String, RDFNode> asMap() { 
         return new HashMap<>(map) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
index 6a596bf..8b59be5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
@@ -321,8 +321,8 @@ public class RDFParserBuilder {
      * </pre>
      * 
      * The canonical forms follow XSD 1.1
-     * <href="https://www.w3.org/TR/xmlschema11-2/#canonical-lexical-representation">2.3.1
-     * Canonical Mapping</a> except in the case of xsd:decimal where it follows the older
+     * {@literal <href="https://www.w3.org/TR/xmlschema11-2/#canonical-lexical-representation">2.3.1
+     * Canonical Mapping</a>} except in the case of xsd:decimal where it follows the older
      * XSD 1.0 which makes it legal for Turtle's short form ({@code "1.0"^^xsd:Decimal}
      * rather than {@code "1"^^xsd:decimal}). See XSD 1.0 <a href=
      * "https://www.w3.org/TR/xmlschema-2/#decimal-canonical-representation">3.2.3.2

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
index 1928e36..76f043e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
@@ -229,7 +229,7 @@ public class WebContent
      *  </p><p>
      *  The decision is 
      *  <blockquote>
-     *  <i>Content type</i> (but not text/plain) > <i>hint</i> > <i>file extension</i>.
+     *  <i>Content type</i> (but not text/plain) {@literal >} <i>hint</i> {@literal >} <i>file extension</i>.
      *  </blockquote>
      *  We make content type (via content negotiation) strongest because a server
      *  may return something unexpected because that is all it can do. We are

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
index 32e02bf..69bad35 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
@@ -39,7 +39,7 @@ import org.apache.jena.graph.NodeFactory;
  * fed to a digest to give a bit string, (currently MD5, to get a 128bit bit
  * string) that is used to form a bNode AnonId of hex digits.
  * <p>
- * In addition there is a cache of label->node allocations, using the natural
+ * In addition, there is a cache of label{@literal ->}node allocations, using the natural
  * tendency to locality in a database dump. (subject bNodes, bNodes in lists
  * and other data values structures like unit values).
  * <p>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index fd35aa9..5d4993a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -125,7 +125,7 @@ public abstract class IRIResolver
     
     /** The IRI checker setup, focused on parsing and languages.
      *  This is a clean version of jena-iri {@link IRIFactory#iriImplementation()} 
-     *  modified to allow unregistered schemes and allow <file:relative> IRIs.
+     *  modified to allow unregistered schemes and allow {@code <file:relative>} IRIs.
      *  
      *  @see IRIFactory
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index dc46ccf..eb51b9c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -60,7 +60,7 @@ public class RiotLib
     private final static String bNodeLabelStart = "_:";
     private final static boolean skolomizedBNodes = ARQ.isTrue(ARQ.constantBNodeLabels);
     
-    /** Implement <_:....> as a "Node IRI"
+    /** Implement {@code <_:....>} as a "Node IRI"
      * that is, use the given label as the BNode internal label.
      * Use with care.
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java b/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
index b607a20..27a96aa 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
@@ -50,11 +50,11 @@ public class SystemARQ
     public static boolean ValueExtensions       = true ;
 
     /**
-     * Under strict F&O, dateTimes and dates with no timezone have one magically applied. 
+     * Under strict {@literal F&O}, dateTimes and dates with no timezone have one magically applied. 
      * This default timezone is implementation dependent and can lead to different answers
      * to queries depending on the timezone. Normally, ARQ uses XMLSchema dateTime comparions,
      * which an yield "indeterminate", which in turn is an evaluation error. 
-     * F&O insists on true/false and so can lead to false positves and negatives. 
+     * {@literal F&O} insists on true/false and so can lead to false positves and negatives. 
      */
     public static boolean StrictDateTimeFO      = false ;
     

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
index dd3524e..a5c4f76 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
@@ -29,10 +29,10 @@ import org.apache.jena.sparql.util.Context ;
  * <p>
  *  New optimization processes can be installed via a global change:
  *  <pre>
- *    Optimize.setFactory((cxt)->new MyOptimizer(cxt)) ;</pre>
+ *    Optimize.setFactory((cxt)-&gt;new MyOptimizer(cxt)) ;</pre>
  *  or on a per-context basis: 
  *  <pre>
- *    Optimize.RewriterFactory f = (cxt)->new MyOptimizer(cxt) ;
+ *    Optimize.RewriterFactory f = (cxt)-&gt;new MyOptimizer(cxt) ;
  *    context.set(ARQConstants.sysOptimizerFactory, f) ;<pre>
  */
 public class Optimize

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
index 54d260e..1593d4f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
@@ -51,25 +51,25 @@ import org.apache.jena.sparql.algebra.op.* ;
  * The optimizer makes the following promotions:
  * </p>
  * <ul>
- * <li>Graph over table empty => table empty</li>
- * <li>Assign/Extend over table empty => table empty</li>
- * <li>Join where either side is table empty => table empty</li>
+ * <li>Graph over table empty {@literal =>} table empty</li>
+ * <li>Assign/Extend over table empty {@literal =>} table empty</li>
+ * <li>Join where either side is table empty {@literal =>} table empty</li>
  * <li>Left Join:
  * <ul>
- * <li>If LHS is table empty => table empty</li>
- * <li>If RHS is table empty => LHS</li>
+ * <li>If LHS is table empty {@literal =>} table empty</li>
+ * <li>If RHS is table empty {@literal =>} LHS</li>
  * </ul>
  * </li>
  * <li>Union:
  * <ul>
- * <li>If both sides are table empty => table empty</li>
- * <li>If one side is table empty => other side</li>
+ * <li>If both sides are table empty {@literal =>} table empty</li>
+ * <li>If one side is table empty {@literal =>} other side</li>
  * </ul>
  * </li>
  * <li>Minus:
  * <ul>
- * <li>If LHS is table empty => table empty</li>
- * <li>If RHS is table empty => LHS</li>
+ * <li>If LHS is table empty {@literal =>} table empty</li>
+ * <li>If RHS is table empty {@literal =>} LHS</li>
  * </ul>
  * </li>
  * </ul>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
index 4d84b70..182ec15 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
@@ -51,8 +51,8 @@ import org.apache.jena.sparql.JenaTransactionException;
  * Best practice is to change the graph membership outside of any transaction,
  * ideally at setup time of the object using this class. (Caution: SPARQL Update
  * can create graphs.)   
- * @See {@link DatasetGraphMapLink}
- * @See {@link DatasetGraphOne}
+ * @see DatasetGraphMapLink
+ * @see DatasetGraphOne
  */
 public class TxnDataset2Graph extends TransactionalLock {
     /**

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
index 524374e..ca6c038 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
@@ -232,7 +232,7 @@ public class HttpQuery extends Params {
     }
 
     /**
-     * Sets HTTP Connection timeout, any value <= 0 is taken to mean no timeout
+     * Sets HTTP Connection timeout, any value {@literal <=} 0 is taken to mean no timeout
      * 
      * @param timeout
      *            Connection Timeout
@@ -251,7 +251,7 @@ public class HttpQuery extends Params {
     }
 
     /**
-     * Sets HTTP Read timeout, any value <= 0 is taken to mean no timeout
+     * Sets HTTP Read timeout, any value {@literal <=} 0 is taken to mean no timeout
      * 
      * @param timeout
      *            Read Timeout

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
index 2646d38..5454275 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
@@ -72,7 +72,7 @@ public interface Expr
     public Expr copySubstitute(Binding binding) ;
 
     /**
-     * Rewrite, applying a node->node transformation
+     * Rewrite, applying a node{@literal ->}node transformation
      */
     public Expr applyNodeTransform(NodeTransform transform) ;
 
@@ -121,7 +121,7 @@ public interface Expr
      * must be different syntax, <code>equalsBySyntax</code> implies <code>equals</code>
      * (by alegbra).
      * <p>
-     * Hence, different <code>hashCode</code> => not <code>equalsBySyntax<code>.
+     * Hence, different <code>hashCode</code> {@literal =>} not <code>equalsBySyntax<code>.
      */ 
     @Override
     public int hashCode() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
index 9e60e2c..899b3d6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
@@ -85,7 +85,7 @@ public class ExprList implements Iterable<Expr>
     }
     
     /**
-     * Rewrite, applying a node->node transformation
+     * Rewrite, applying a node{@literal ->}node transformation
      */
     public ExprList applyNodeTransform(NodeTransform transform) {
         ExprList x = new ExprList() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 23b5c79..718a973 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -582,7 +582,7 @@ public abstract class NodeValue extends ExprNode
     }
     
     /** Compare by value (and only value) if possible.
-     *  Supports <, <=, >, >= but not = nor != (which are sameValueAs and notSameValueAs)
+     *  Supports &lt;, &lt;=, &gt;, &gt;= but not = nor != (which are sameValueAs and notSameValueAs)
      * @param nv1
      * @param nv2
      * @return negative, 0 , or positive for not possible, less than, equal, greater than.

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
index e7ac670..80dfa7b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
@@ -203,20 +203,20 @@ public class XSDFuncOp
         return nv1 ;
     }
 
-    /** F&O fn:not */
+    /** {@literal F&O} fn:not */
     public static NodeValue not(NodeValue nv) {
         boolean b = XSDFuncOp.booleanEffectiveValue(nv) ;
         return NodeValue.booleanReturn(!b) ;
     }    
     
-    /** F&O fn:boolean */
+    /** {@literal F&O} fn:boolean */
     public static NodeValue booleanEffectiveValueAsNodeValue(NodeValue nv) {
         if ( nv.isBoolean() ) // "Optimization" (saves on object churn)
             return nv ;
         return NodeValue.booleanReturn(booleanEffectiveValue(nv)) ;
     }
     
-    /** F&O fn:boolean */
+    /** {@literal F&O} fn:boolean */
     public static boolean booleanEffectiveValue(NodeValue nv) {
         // Apply the "boolean effective value" rules
         // boolean: value of the boolean (strictly, if derived from xsd:boolean)
@@ -686,7 +686,7 @@ public class XSDFuncOp
         return NodeValue.makeString(encStr) ;
     }
 
-    /** F&O fn:concat (implicit cast to strings). */
+    /** {@literal F&O} fn:concat (implicit cast to strings). */
     public static NodeValue fnConcat(List<NodeValue> args) {
         StringBuilder sb = new StringBuilder() ;
 
@@ -990,7 +990,7 @@ public class XSDFuncOp
     public static final String defaultTimezone = "Z" ;
     
     
-    /** Strict F&O handling of compare date(times).
+    /** Strict {@literal F&O} handling of compare date(times).
      * But that means applying the "local" timezone if there is no TZ.
      * The data may have come from different timezones to the query. 
      */
@@ -1160,7 +1160,7 @@ public class XSDFuncOp
         return nv.hasDateTime() ;
     }
     
-    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
      *  <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
      *  Throws an exception on incorrect case.
      *   
@@ -1172,7 +1172,7 @@ public class XSDFuncOp
         return dateTimeCast(nv, t) ;
     }
 
-    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
      *  <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
      *  Throws an exception on incorrect case.
      *   
@@ -1199,7 +1199,7 @@ public class XSDFuncOp
         return tzStr ;
     }
     
-    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+    /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
      *  <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
      *  Throws an exception on incorrect case.
      *   

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
index e4d4f3a..ac5af98 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
@@ -41,14 +41,14 @@ import org.apache.jena.sparql.expr.ExprTransform;
 
 public class NodeTransformLib
 {
-    /** Do a node->node conversion of an Op - return original BGP for "no change" */
+    /** Do a node{@literal ->}node conversion of an Op - return original BGP for "no change" */
     public static Op transform(NodeTransform nodeTransform, Op op) {
         Transform opTransform = new NodeTransformOp(nodeTransform) ;
         ExprTransform exprTransform = new NodeTransformExpr(nodeTransform) ;
         return Transformer.transform(opTransform, exprTransform, op);
     }
     
-    /** Do a node->node conversion of a BGP - return original BGP for "no change" */
+    /** Do a node{@literal ->}node conversion of a BGP - return original BGP for "no change" */
     public static BasicPattern transform(NodeTransform nodeTransform, BasicPattern pattern) {
         BasicPattern bgp2 = new BasicPattern() ;
         boolean changed = false ;
@@ -64,7 +64,7 @@ public class NodeTransformLib
         return bgp2 ;
     }
 
-    /** Do a node->node conversion of a QuadPattern - return original QuadPattern for "no change" */
+    /** Do a node{@literal ->}node conversion of a QuadPattern - return original QuadPattern for "no change" */
     public static QuadPattern transform(NodeTransform nodeTransform, QuadPattern pattern) {
         QuadPattern qp2 = new QuadPattern() ;
         boolean changed = false ;
@@ -80,7 +80,7 @@ public class NodeTransformLib
         return qp2 ;
     }
 
-    /** Do a node->node conversion of a Triple - return original Triple for "no change" */
+    /** Do a node{@literal ->}node conversion of a Triple - return original Triple for "no change" */
     public static Triple transform(NodeTransform nodeTransform, Triple triple) {
         boolean change = false ;
         Node s = triple.getSubject() ;
@@ -99,7 +99,7 @@ public class NodeTransformLib
         return new Triple(s,p,o) ;
     }
 
-    /** Do a node->node conversion of a Quad - return original Quad for "no change" */
+    /** Do a node{@literal ->}node conversion of a Quad - return original Quad for "no change" */
     public static Quad transform(NodeTransform nodeTransform, Quad quad) {
         boolean change = false ;
         Node s = quad.getSubject() ;
@@ -146,7 +146,7 @@ public class NodeTransformLib
 
 
 
-    /** Do a node->node conversion of a List&lt;Quad&gt; - return original List&lt;Quad&gt; for "no change" */
+    /** Do a node{@literal ->}node conversion of a List&lt;Quad&gt; - return original List&lt;Quad&gt; for "no change" */
     public static List<Quad> transformQuads(NodeTransform nodeTransform, List<Quad> quads) {
         List<Quad> x = new ArrayList<>() ;
         boolean changed = false ; 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java b/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
index bcf1fd1..020211d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
@@ -31,7 +31,7 @@ import org.apache.jena.sparql.function.js.NV;
  * <p>
  * This is a one way, lossy, conversion from an RDF Term to the best available JSON value.
  * <p> 
- * This is not SPARQL results in JSON ({@locde application/result-sets+json}).
+ * This is not SPARQL results in JSON ({@code application/result-sets+json}).
  * 
  * <table>
  * <tr><th>RDF Term</th><th>JSON value</th></tr>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
index d4d15d4..36c078f 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
@@ -23,7 +23,7 @@ import java.io.OutputStream ;
 import java.io.Writer ;
 
 /** Output UTF-8 encoded data.
- *  This class implements the "Modified UTF8" encoding rules (null -> C0 80)
+ *  This class implements the "Modified UTF8" encoding rules (null {@literal ->} C0 80)
  *  It will encode any 16 bit value.  
  *  It can be used as a pure UTf-8 encoder. 
  * 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index cb9871b..5e615ed 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -39,7 +39,7 @@ import org.apache.jena.atlas.lib.Sink ;
  * <pre>
  *  import static org.apache.jena.atlas.iterator.Iter.* ;
  *  
- *  filter(map(iterator, <i>function></i>), <i>predicate</i>)
+ *  filter(map(iterator, function), predicate)
  * </pre>
  * 
  * Style 2: Stream-like: The class {@code Iter} provides methods to call on an iterator.
@@ -47,7 +47,7 @@ import org.apache.jena.atlas.lib.Sink ;
  * <pre>
  * import static org.apache.jena.atlas.iterator.Iter.iter ;
  * 
- * iter(iterator).map(...).filter(...)}
+ * iter(iterator).map(...).filter(...)
  * </pre>
  *
  * @param <T> the type of element over which an instance of {@code Iter} iterates,

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
index 71f78d6..bf2c32e 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
@@ -26,8 +26,8 @@ import java.nio.charset.CharsetEncoder ;
 import java.nio.charset.CoderResult ;
 
 /** Byte-oriented operations.  Packing and unpacking integers
- *  is in network order (Big endian - which is the preferred order in Java)
- *  {@link "http://en.wikipedia.org/wiki/Endianness"}
+ *  is in network order (Big endian - which is the preferred order in Java).
+ *  See <a href="http://en.wikipedia.org/wiki/Endianness">wikipedia Endianness</a>.
  */  
 
 public class Bytes

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
index 4cfe37d..a4adaf4 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
@@ -24,7 +24,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * A key -> value 'map' which reference counts entries.  
+ * A key {@literal ->} value 'map' which reference counts entries.  
  * 
  * <p>
  *   The same (key,value) pair can be added to the map several times and then 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
index 59a0a8a..6012ac8 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
@@ -43,9 +43,9 @@ import org.apache.jena.atlas.lib.StrUtils ;
  * 
  * A {@code TupleMap} holds twp maps: the "getTransform" and the "putTransform".
  * The "getTransform" is here to get the item from in the mapper Tuple.
- * In the case is {@code SPO->POS} this is 
- * {@code 0<-1, 1<-2, 2<-0} 
- * and the "putTransform" is where to place the items: {@code 0->2, 1->0, 2->1}.
+ * In the case is {@code SPO{@literal ->}POS} this is 
+ * {@code 0{@literal <-}1, 1{@literal <-}2, 2{@literal <-}0} 
+ * and the "putTransform" is where to place the items: {@code 0{@literal ->}2, 1{@literal ->}0, 2{@literal ->}1}.
  */
 final
 public class TupleMap {
@@ -114,8 +114,8 @@ public class TupleMap {
 
     /**
      * Construct a mapping - the elements are the mappings of a tuple
-     * originally in the order 0,1,2,... so SPO->POS is 2,0,1 (SPO->POS so S->2,
-     * P->0, O->1) and not 1,2,0 (which is the extraction mapping). The label is
+     * originally in the order 0,1,2,... so SPO{@literal ->}POS is 2,0,1 (SPO{@literal ->}POS so S{@literal ->}2,
+     * P{@literal ->}0, O{@literal ->}1) and not 1,2,0 (which is the extraction mapping). The label is
      * just a label and is not interpreted here.
      */
     private TupleMap(String label, int... elements) {
@@ -165,7 +165,7 @@ public class TupleMap {
 
     /** 
      * Get the index of the i'th slot as it appears from a mapping : for
-     * SPO->POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
+     * SPO{@literal ->}POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
      * The 0'th mapped slot is {@code tuple.get(tupleMap.getSlotIdx(0))}.
      */
     public int getSlotIdx(int idx) {
@@ -173,7 +173,7 @@ public class TupleMap {
     }
 
     /**
-     * Get the index of the i'th slot as it appears after unmapping : SPO->POS :
+     * Get the index of the i'th slot as it appears after unmapping : SPO{@literal ->}POS :
      * 0'th slot is S from POS so 0 returns 2
      */
     public int putSlotIdx(int idx) {
@@ -182,7 +182,7 @@ public class TupleMap {
 
     /** 
      * Get the index of the i'th slot as it appears from a mapping : for
-     * SPO->POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
+     * SPO{@literal ->}POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
      * Equivalent to {@link #getSlotIdx}.<br/>
      * The 0'th mapped slot is {@code tuple.get(tupleMap.mapIdx(0))}.<br/>
      * Mapping a tuple is {@code map(tuple) == create(tuple.mapIdx(0) , tuple.mapIdx(1), ... tuple.mapIdx(n-1))}<br/>   
@@ -192,7 +192,7 @@ public class TupleMap {
     }
 
     /**
-     * Get the index of the i'th slot as it appears after unmapping : SPO->POS :
+     * Get the index of the i'th slot as it appears after unmapping : SPO{@literal ->}POS :
      * 0'th slot is S from POS so 0 returns 2
      * Equivalent to {@link #putSlotIdx}.<br/>
      * The 0'th unmapped slot is {@code tuple.get(tupleMap.unmapIdx(0))}.<br/>
@@ -282,7 +282,7 @@ public class TupleMap {
 
     /**
      * Apply to an <em>unmapped</em> tuple to get the i'th slot after mapping :
-     * SPO->POS : 0'th slot is P from SPO
+     * SPO{@literal ->}POS : 0'th slot is P from SPO
      */
     public <T> T mapSlot(int idx, Tuple<T> tuple) {
         checkLength(tuple) ;
@@ -292,7 +292,7 @@ public class TupleMap {
 
     /**
      * Apply to a <em>mapped</em> tuple to get the i'th slot as it appears after
-     * mapping : SPO->POS : 0'th slot is S from POS
+     * mapping : SPO{@literal ->}POS : 0'th slot is S from POS
      */
     public <T> T unmapSlot(int idx, Tuple<T> tuple) {
         checkLength(tuple) ;
@@ -302,7 +302,7 @@ public class TupleMap {
 
     /**
      * Apply to an <em>unmapped</em> tuple to get the i'th slot after mapping :
-     * SPO->POS : 0'th slot is P from SPO
+     * SPO{@literal ->}POS : 0'th slot is P from SPO
      */
     public <T> T mapSlot(int idx, T[] tuple) {
         return tuple[getSlotIdx(idx)] ;
@@ -310,7 +310,7 @@ public class TupleMap {
 
     /**
      * Apply to a <em>mapped</em> tuple to get the i'th slot as it appears after
-     * mapping : SPO->POS : 0'th slot is S from POS
+     * mapping : SPO{@literal ->}POS : 0'th slot is S from POS
      */
     public <T> T unmapSlot(int idx, T[] tuple) {
         return tuple[putSlotIdx(idx)] ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-cmds/src/main/java/jena/rdfcat.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/jena/rdfcat.java b/jena-cmds/src/main/java/jena/rdfcat.java
index efe16dc..cb3ad6d 100644
--- a/jena-cmds/src/main/java/jena/rdfcat.java
+++ b/jena-cmds/src/main/java/jena/rdfcat.java
@@ -108,7 +108,7 @@ import org.apache.jena.vocabulary.RDFS ;
  * java jena.rdfcat in1 -out N3 &gt; out.n3
  *
  * Join two owl files one N3, one XML, and their imports, into a single NTRIPLE file:
- * java jena.rdfcat -out NTRIPLE -include in1.owl -n in2.owl > out.ntriple
+ * java jena.rdfcat -out NTRIPLE -include in1.owl -n in2.owl &gt; out.ntriple
  *
  * Concatenate two N3-serving http URL's as N-TRIPLE
  * java jena.rdfcat -in N3 -out N-TRIPLE http://example.com/a http://example.com/b

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
index a975f6d..7b851f8 100644
--- a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
+++ b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
@@ -102,7 +102,7 @@ public class EnhNode extends Polymorphic<RDFNode> implements FrontsNode
         return asInternal( t ); 
     }
     
-    /** allow subclasses to implement RDFNode & its subinterface */
+    /** allow subclasses to implement RDFNode &amp; its subinterface */
     public <T extends RDFNode> T as( Class<T> t )
         { return asInternal( t ); }
       

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index 1f80448..f398059 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -138,7 +138,7 @@ public class OntTools
      * and the object of the last statement in the list is <code>end</code>.</p>
      * <p>The <code>onPath</code> argument is a {@link Predicate}, which accepts a statement and returns
      * true if the statement should be considered to be on the path. To search for an unconstrained
-     * path, pass <code>()->true</code> as an argument. To search for a path whose predicates match a
+     * path, pass {@code ()->true} as an argument. To search for a path whose predicates match a
      * fixed restricted set of property names, pass an instance of {@link PredicatesFilter}.</p>
      * <p>If there is more than one path of minimal length from <code>start</code> to <code>end</code>,
      * this method returns an arbitrary one. The algorithm is blind breadth-first search,

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
index d9f5e6d..2eb8b82 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
@@ -313,7 +313,7 @@ public class RDFListImpl
      * Add the given value to the end of the list. This is a side-effecting 
      * operation on the underlying model that is only defined if this is not the
      * empty list.  If this list is the empty (nil) list, we cannot perform a 
-     * side-effecting update without changing the URI of this node (from <code>rdf:nil</code)
+     * side-effecting update without changing the URI of this node (from <code>rdf:nil</code>)
      * to a blank-node for the new list cell) without violating a Jena invariant.
      * Therefore, this update operation will throw an exception if an attempt is
      * made to add to the nil list.  Safe ways to add to an empty list include

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
index 4b5fe76..88442ff 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
@@ -115,7 +115,7 @@ public class ReifierStd
     }
     
     /**
-    @return true iff there's > 0 mappings to this triple
+    @return true iff there's {@literal >} 0 mappings to this triple
      */
     public static boolean hasTriple(Graph graph, Triple t)
     {

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
index 64dc047..680b7e1 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
@@ -228,8 +228,8 @@ public class Util extends Object {
     }
     
     /** Return true if the literal is a simple string.
-     *  <p>RDF 1.0 => it is a plain literal, with no language tag
-     *  <p>RDF 1.1 => it has datatype xsd:string
+     *  <p>RDF 1.0 {@literal =>} it is a plain literal, with no language tag
+     *  <p>RDF 1.1 {@literal =>} it has datatype xsd:string
      */ 
     public static boolean isSimpleString(Literal lit) {
         Objects.requireNonNull(lit) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java b/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
index 133db07..0e0da64 100644
--- a/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
+++ b/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
@@ -131,7 +131,7 @@ public interface PrefixMapping
         Return a copy of the internal mapping from names to URI strings. Updating
         this copy will have no effect on the PrefixMap.
 
-        @return a copy of the internal String -> String mapping
+        @return a copy of the internal String {@literal ->} String mapping
     */
     Map<String, String> getNsPrefixMap();
 
@@ -147,7 +147,7 @@ public interface PrefixMapping
 
     /**
         Compress the URI using the prefix mappings if possible. If there is a
-        prefix mapping Name -> URIStart, and uri is URIStart+Tail, return Name:Tail;
+        prefix mapping Name {@literal ->} URIStart, and uri is URIStart+Tail, return Name:Tail;
         otherwise return uri unchanged. If there are multiple applicable mappings
         available, the "most recent" is chosen if that is possible, otherwise
         one is picked "at random".

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java b/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
index fac1044..a19268a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
+++ b/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
@@ -457,7 +457,7 @@ public class OneToManyMap<From, To> implements Map<From, To>
          * More formally, two entries e1 and e2 represent the same mapping if
          * <code><pre>
          *      (e1.getKey()==null ?
-         *                         e2.getKey()==null : e1.getKey().equals(e2.getKey()))  &&
+         *                         e2.getKey()==null : e1.getKey().equals(e2.getKey()))  &amp;&amp;
          *      (e1.getValue()==null ?
          *                         e2.getValue()==null : e1.getValue().equals(e2.getValue()))
          * </pre></code>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java b/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
index 6308b94..9ac555a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
+++ b/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
@@ -146,7 +146,7 @@ public class ResourceUtils {
      * input list of resources.  The equivalence relation is the predicate p.
      * So, two resources <code>a</code> and <code>b</code>
      * will be in the same partition iff
-     * <code>(a p b) && (b p a)</code>.</p>
+     * {@code (a p b) && (b p a)}.</p>
      * @param <T>
      * @param l A list of resources
      * @param p An equivalence predicate

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
index 94c542e..d05eaae 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
@@ -87,7 +87,7 @@ public class RDFTest {
     public static final Property document = m_model.createProperty( "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#document" );
     
     /** <p>This manifest entry is used to describe test cases that do not fall into one 
-     *  of the categories. It may have several associated files, indicated in <test:document> 
+     *  of the categories. It may have several associated files, indicated in {@literal <test:document>} 
      *  elements.</p>
      */
     public static final Resource MiscellaneousTest = m_model.createResource( "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#MiscellaneousTest" );

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
index 8459aaa..a6bab1b 100644
--- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
+++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
@@ -91,28 +91,28 @@ public class Record //implements Comparable<Record>
         return x != 0 ;
     }
 
-    /** Is the key of record1 < key of record2 */
+    /** Is the key of record1 {@literal <} key of record2 */
     public static boolean keyLT(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x < 0 ;
     }
 
-    /** Is the key of record1 <= key of record2 */
+    /** Is the key of record1 {@literal <=} key of record2 */
     public static boolean keyLE(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x <= 0 ;
     }
     
-    /** Is the key of record1 >= key of record2 */
+    /** Is the key of record1 {@literal >=} key of record2 */
     public static boolean keyGE(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x >= 0 ;
     }
     
-    /** Is the key of record1 > key of record2 */
+    /** Is the key of record1 {@literal >} key of record2 */
     public static boolean keyGT(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
index 3a44301..a84a2b6 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
@@ -33,7 +33,6 @@ import org.apache.jena.dboe.transaction.txn.TxnId;
 import org.apache.jena.query.ReadWrite ;
 
 /** A transaction component with an integer supporting MR+SW (=one writer AND many readers).
- * @see TransactionalInteger
  */
 public class TransInteger extends TransactionalComponentLifecycle<TransInteger.IntegerState> {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
index d3f1e04..1170ff3 100644
--- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
+++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
@@ -25,7 +25,7 @@ import org.apache.jena.dboe.transaction.txn.TransactionalBase;
 /** 
  * A Transactional (unit of begin/commit) of a single integer component.
  * Testing support.  Use {@link TransInteger} for application code.
- * @see TransInteger 
+ * @see TransInteger
  */
 public class TransactionalInteger extends TransactionalBase {
     final private TransInteger integer ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
index 160c8be..86e25fa 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
@@ -232,7 +232,7 @@ public class SolverLib
         return binding -> SolverLib.convert(binding, nodeTable);
     }
     
-    /** Binding ==> BindingNodeId, given a NodeTable */
+    /** Binding {@literal ->} BindingNodeId, given a NodeTable */
     public static BindingNodeId convert(Binding binding, NodeTable nodeTable) 
     {
         if ( binding instanceof BindingTDB )

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
index 436b9c1..dfee9d4 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
@@ -137,7 +137,7 @@ public class NodeIdInline {
 
     /** Return true if this node has a datatype that look like it is inlineable.
      * The node may still be out of range (e.g. very large integer).
-     * Only inline(Node)->NodeId can determine that. 
+     * Only inline(Node){@literal ->}NodeId can determine that. 
      */
     public static boolean hasInlineDatatype(Node node) {
         if ( ! node.isLiteral() )

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
index a7d217c..e6b5612 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
@@ -27,7 +27,7 @@ import org.apache.jena.atlas.lib.Sync ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.tdb2.store.NodeId;
 
-/** Node table - conceptually a two way mapping of Node<->NodeId 
+/** Node table - conceptually a two way mapping of Node{@literal <->}NodeId 
  *  where Nodes can be stored and a NodeId allocated
  *  @see NodeId
  */ 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
index cfb0ebe..b960905 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
@@ -24,7 +24,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * A key -> value 'map' which reference counts entries.  
+ * A key {@literal ->} value 'map' which reference counts entries.  
  * 
  * <p>
  *   The same (key,value) pair can be added to the map several times and then 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
index 34d6339..d058671 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
@@ -35,7 +35,7 @@
  * <li><em>ServiceRouterServlet</em> :: Routes requests to the appropriate service (i.e. implementing servlet).</li>
  * <li><em>ActionBase</em> :: Creates a basic {@code HttpAction} and defines {@code execCommonWorker}.</li>
  * <li><em>ActionService</em> :: Fills in {@code HttpAction} with dataset and endpoint. Calls {@code setRequest} on an {@code HttpAction}. 
- * It implements {@code execCommonWorker} as a lifecycle => {@code executeAction} => {@code executeLifecycle} => {@code validate - perform}
+ * It implements {@code execCommonWorker} as a lifecycle =&gt; {@code executeAction} =&gt; {@code executeLifecycle} =&gt; {@code validate - perform}
  * <li><em>ServiceRouter</em> :: Routing of request to the cocrete servlet implementations.
  * </ul> 
  * <p>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
index 60f5082..a5fc722 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
@@ -61,7 +61,7 @@ NCSA extended/combined log format
     }
 
     /** NCSA combined log format *
-     * LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b  \"%{Referer}i\" \"%{User-Agent}i\"" combinedfwd
+     * LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %&gt;s %b  \"%{Referer}i\" \"%{User-Agent}i\"" combinedfwd
      * XXX.XXX.XXX.XXX - - [01/Feb/2014:03:19:09 +0000] "GET / HTTP/1.1" 200 6190  "-" "check_http/v1.4.16 (nagios-plugins 1.4.16)"
      */
     public static String combinedNCSA(HttpAction action) {

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index f61d75c..d351b17 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -152,7 +152,6 @@
         <configuration>
           <version>true</version>
           <show>public</show>
-          <quiet>true</quiet>
           <encoding>UTF-8</encoding>
           <windowtitle>Apache Jena TDB</windowtitle>
           <doctitle>Apache Jena TDB ${project.version}</doctitle>

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
index 82a9950..a5cbf37 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
@@ -117,28 +117,28 @@ public class Record //implements Comparable<Record>
         return x != 0 ;
     }
 
-    /** Is the key of record1 < key of record2 */
+    /** Is the key of record1 {@literal <} key of record2 */
     public static boolean keyLT(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x < 0 ;
     }
 
-    /** Is the key of record1 <= key of record2 */
+    /** Is the key of record1 {@literal <=} key of record2 */
     public static boolean keyLE(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x <= 0 ;
     }
     
-    /** Is the key of record1 >= key of record2 */
+    /** Is the key of record1 {@literal >=} key of record2 */
     public static boolean keyGE(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;
         return x >= 0 ;
     }
     
-    /** Is the key of record1 > key of record2 */
+    /** Is the key of record1 {@literal >} key of record2 */
     public static boolean keyGT(Record record1, Record record2)
     {
         int x = compareByKey(record1, record2) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
index 9023d49..67408ba 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
@@ -39,11 +39,11 @@ public interface StoreParamsDynamic {
     public Integer getBlockWriteCacheSize() ;
     public boolean isSetBlockWriteCacheSize() ;
     
-    /** Node cache for Node->NodeId. */
+    /** Node cache for Node{@literal ->}NodeId. */
     public Integer getNode2NodeIdCacheSize() ;
     public boolean isSetNode2NodeIdCacheSize() ;
     
-    /** Node cache for NodeId->Node. Important for SPARQL results. */
+    /** Node cache for NodeId{@literal ->}Node. Important for SPARQL results. */
     public Integer getNodeId2NodeCacheSize() ;
     public boolean isSetNodeId2NodeCacheSize() ;
 

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
index 912f1e9..ff54d73 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
@@ -103,7 +103,7 @@ public class SolverLib
         
         List<Triple> triples = pattern.getList() ;
         boolean anyGraph = (graphNode==null ? false : (Node.ANY.equals(graphNode))) ;
-        
+
         int tupleLen = nodeTupleTable.getTupleTable().getTupleLen() ;
         if ( graphNode == null ) {
             if ( 3 != tupleLen )
@@ -235,7 +235,7 @@ public class SolverLib
         return binding -> SolverLib.convert(binding, nodeTable);
     }
     
-    /** Binding ==> BindingNodeId, given a NodeTable */
+    /** Binding {@literal ->} BindingNodeId, given a NodeTable */
     public static BindingNodeId convert(Binding binding, NodeTable nodeTable) 
     {
         if ( binding instanceof BindingTDB )

http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 750ddb8..443268e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,7 +262,7 @@
         <!-- Slow building modules -->
         <module>jena-jdbc</module>
         <!--  Fails when building with Java9 JDK because it requires 
-             system jar jdk.tools which is not available in Java9.
+             system jar jdk.tools which is not available in Java9 onwards
         -->
         <module>jena-elephas</module>
         <module>apache-jena-osgi</module>
@@ -744,7 +744,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20.1</version>
+          <version>2.21.0</version>
         </plugin>
 
         <plugin>
@@ -780,20 +780,16 @@
             </execution>
           </executions>
           <configuration>
-
-            <!-- Java8 and later -->
-            <!-- javadoc-plug v2.x way to do this
-                 <additionalparam>-Xdoclint:none</additionalparam>
+            <!-- Java 10
+                 <additionalOptions>-html5</additionalOptions>
             -->
-            <!-- The javadoc-plugin v3 way to do this -->
+
             <doclint>none</doclint>
-            
             <!-- To allow the build to keep going despite javadoc problems:
                  <failOnError>false</failOnError>
             -->
             <version>true</version>
             <show>public</show>
-            <quiet>true</quiet>
             <encoding>UTF-8</encoding>
             <windowtitle>${project.name} ${project.version}</windowtitle>
             <doctitle>${project.name} ${project.version}</doctitle>
@@ -803,11 +799,10 @@
               <link>http://jena.apache.org/documentation/javadoc/arq/</link>
               <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
               <link>http://jena.apache.org/documentation/javadoc/text/</link>
-              <link>http://jena.apache.org/documentation/javadoc/spatial/</link>
+              <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
               <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
               <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
               <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
-              <link>http://jena.apache.org/documentation/javadoc/elephas/</link>
             </links>
           </configuration>
         </plugin>


[5/8] jena git commit: JENA-1546: Javadoc fixes (jena-core)

Posted by an...@apache.org.
JENA-1546: Javadoc fixes (jena-core)


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5d32a5c2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5d32a5c2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5d32a5c2

Branch: refs/heads/master
Commit: 5d32a5c28f7f74ed108c5e9be09a7e5dca2a8b3f
Parents: d8667f6
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 10 14:42:11 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 10 14:42:33 2018 +0100

----------------------------------------------------------------------
 .../apache/jena/ext/xerces/impl/Constants.java  |  2 +-
 .../ext/xerces/impl/dv/DatatypeException.java   |  2 +-
 .../impl/xpath/regex/RegularExpression.java     | 32 ++++++++++----------
 .../org/apache/jena/ext/xerces/util/URI.java    |  2 +-
 .../jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java  |  2 +-
 .../AbsWantLiteralValueOrDescription.java       |  2 +-
 .../rdfxml/xmlinput/states/AbsXMLLiteral.java   |  6 ++--
 .../jena/reasoner/rulesys/FBRuleReasoner.java   |  1 -
 .../jena/reasoner/rulesys/OWLMicroReasoner.java |  2 +-
 .../rulesys/OWLMicroReasonerFactory.java        |  2 +-
 .../jena/reasoner/rulesys/OWLMiniReasoner.java  |  2 +-
 .../rulesys/OWLMiniReasonerFactory.java         |  2 +-
 .../org/apache/jena/reasoner/rulesys/Rule.java  |  6 ++--
 13 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/Constants.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/Constants.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/Constants.java
index 74399c9..b104195 100644
--- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/Constants.java
+++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/Constants.java
@@ -457,7 +457,7 @@ public final class Constants {
     
     /**
      * Boolean indicating whether a character is a probable white space
-     * character (ch <= 0x20) that was the replacement text of a character 
+     * character (ch {@literal <=} 0x20) that was the replacement text of a character 
      * reference is stored in augmentations using the string "CHAR_REF_PROBABLE_WS". 
      * The absence of this augmentation indicates that the character is not 
      * probable white space and/or was not included from a character reference.

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/DatatypeException.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/DatatypeException.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/DatatypeException.java
index 68ade2e..839782f 100644
--- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/DatatypeException.java
+++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/DatatypeException.java
@@ -74,7 +74,7 @@ public class DatatypeException extends Exception {
     }
     
     /**
-     * Overrides this method to get the formatted&localized error message.
+     * Overrides this method to get the formatted and localized error message.
      * 
      * REVISIT: the system locale is used to load the property file.
      *          do we want to allow the appilcation to specify a

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java
index ea77556..b75675a 100644
--- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java
+++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/xpath/regex/RegularExpression.java
@@ -53,7 +53,7 @@ import org.apache.jena.ext.xerces.util.IntStack;
  * <h4>Case-insensitive matching</h4>
  * <pre>
  * RegularExpression re = new RegularExpression(<var>regex</var>, "i");
- * if (re.matches(text) >= 0) { ...}
+ * if (re.matches(text) {@literal >=} 0) { ...}
  * </pre>
  *
  * <h4>Options</h4>
@@ -69,12 +69,12 @@ import org.apache.jena.ext.xerces.util.IntStack;
  *   <dt><a name="S_OPTION"><code>"s"</code></a>
  *   <dd class="REGEX"><kbd>.</kbd> matches any one character.
  *   <dt><a name="U_OPTION"><code>"u"</code></a>
- *   <dd class="REGEX">Redefines <Kbd>\d \D \w \W \s \S \b \B \&lt; \></kbd> as becoming to Unicode.
+ *   <dd class="REGEX">Redefines <Kbd>\d \D \w \W \s \S \b \B \&lt; \&gt;</kbd> as becoming to Unicode.
  *   <dt><a name="W_OPTION"><code>"w"</code></a>
- *   <dd class="REGEX">By this option, <kbd>\b \B \&lt; \></kbd> are processed with the method of
+ *   <dd class="REGEX">By this option, <kbd>\b \B \&lt; \&gt;</kbd> are processed with the method of
  *      'Unicode Regular Expression Guidelines' Revision 4.
  *      When "w" and "u" are specified at the same time,
- *      <kbd>\b \B \&lt; \></kbd> are processed for the "w" option.
+ *      <kbd>\b \B \&lt; \&gt;</kbd> are processed for the "w" option.
  *   <dt><a name="COMMA_OPTION"><code>","</code></a>
  *   <dd>The parser treats a comma in a character class as a range separator.
  *      <kbd class="REGEX">[a,b]</kbd> matches <kbd>a</kbd> or <kbd>,</kbd> or <kbd>b</kbd> without this option.
@@ -163,17 +163,17 @@ import org.apache.jena.ext.xerces.util.IntStack;
  *
  *   <li>Character class
  *     <dl>
-+ *       <dt class="REGEX"><kbd>[</kbd><var>R<sub>1</sub></var><var>R<sub>2</sub></var><var>...</var><var>R<sub>n</sub></var><kbd>]</kbd> (without <a href="#COMMA_OPTION">"," option</a>)
-+ *       <dt class="REGEX"><kbd>[</kbd><var>R<sub>1</sub></var><kbd>,</kbd><var>R<sub>2</sub></var><kbd>,</kbd><var>...</var><kbd>,</kbd><var>R<sub>n</sub></var><kbd>]</kbd> (with <a href="#COMMA_OPTION">"," option</a>)
+ *       <dt class="REGEX"><kbd>[</kbd><var>R<sub>1</sub></var><var>R<sub>2</sub></var><var>...</var><var>R<sub>n</sub></var><kbd>]</kbd> (without <a href="#COMMA_OPTION">"," option</a>)
+ *       <dt class="REGEX"><kbd>[</kbd><var>R<sub>1</sub></var><kbd>,</kbd><var>R<sub>2</sub></var><kbd>,</kbd><var>...</var><kbd>,</kbd><var>R<sub>n</sub></var><kbd>]</kbd> (with <a href="#COMMA_OPTION">"," option</a>)
  *       <dd>Positive character class.  It matches a character in ranges.
  *       <dd><var>R<sub>n</sub></var>:
  *       <ul>
  *         <li class="REGEX">A character (including <Kbd>\e \f \n \r \t</kbd> <kbd>\u005cx</kbd><var>HH</var> <kbd>\u005cx{</kbd><var>HHHH</var><kbd>}</kbd> <!--kbd>\u005c u</kbd><var>HHHH</var--> <kbd>\u005cv</kbd><var>HHHHHH</var>)
  *             <p>This range matches the character.
  *         <li class="REGEX"><var>C<sub>1</sub></var><kbd>-</kbd><var>C<sub>2</sub></var>
- *             <p>This range matches a character which has a code point that is >= <var>C<sub>1</sub></var>'s code point and &lt;= <var>C<sub>2</sub></var>'s code point.
-+ *         <li class="REGEX">A POSIX character class: <Kbd>[:alpha:] [:alnum:] [:ascii:] [:cntrl:] [:digit:] [:graph:] [:lower:] [:print:] [:punct:] [:space:] [:upper:] [:xdigit:]</kbd>,
-+ *             and negative POSIX character classes in Perl like <kbd>[:^alpha:]</kbd>
+ *             <p>This range matches a character which has a code point that is &gt;= <var>C<sub>1</sub></var>'s code point and &lt;= <var>C<sub>2</sub></var>'s code point.
+ *         <li class="REGEX">A POSIX character class: <Kbd>[:alpha:] [:alnum:] [:ascii:] [:cntrl:] [:digit:] [:graph:] [:lower:] [:print:] [:punct:] [:space:] [:upper:] [:xdigit:]</kbd>,
+ *             and negative POSIX character classes in Perl like <kbd>[:^alpha:]</kbd>
  *             <p>...
  *         <li class="REGEX"><kbd>\d \D \s \S \w \W \p{</kbd><var>name</var><kbd>} \P{</kbd><var>name</var><kbd>}</kbd>
  *             <p>These expressions specifies the same ranges as the following expressions.
@@ -186,9 +186,9 @@ import org.apache.jena.ext.xerces.util.IntStack;
  *       <dd>Negative character class.  It matches a character not in ranges.
  *
  *       <dt class="REGEX"><kbd>(?[</kbd><var>ranges</var><kbd>]</kbd><var>op</var><kbd>[</kbd><var>ranges</var><kbd>]</kbd><var>op</var><kbd>[</kbd><var>ranges</var><kbd>]</kbd> ... <Kbd>)</kbd>
- *       (<var>op</var> is <kbd>-</kbd> or <kbd>+</kbd> or <kbd>&</kbd>.)
+ *       (<var>op</var> is <kbd>-</kbd> or <kbd>+</kbd> or <kbd>&amp;</kbd>.)
  *       <dd>Subtraction or union or intersection for character classes.
- *       <dd class="REGEX">For exmaple, <kbd>(?[A-Z]-[CF])</kbd> is equivalent to <kbd>[A-BD-EG-Z]</kbd>, and <kbd>(?[0x00-0x7f]-[K]&[\p{Lu}])</kbd> is equivalent to <kbd>[A-JL-Z]</kbd>.
+ *       <dd class="REGEX">For exmaple, <kbd>(?[A-Z]-[CF])</kbd> is equivalent to <kbd>[A-BD-EG-Z]</kbd>, and <kbd>(?[0x00-0x7f]-[K]&amp;[\p{Lu}])</kbd> is equivalent to <kbd>[A-JL-Z]</kbd>.
  *       <dd>The result of this operations is a <u>positive character class</u>
  *           even if an expression includes any negative character classes.
  *           You have to take care on this in case-insensitive matching.
@@ -335,7 +335,7 @@ import org.apache.jena.ext.xerces.util.IntStack;
  *       <dt class="REGEX"><kbd>\1 \2 \3 \4 \5 \6 \7 \8 \9</kbd>
  *       <dd>
  *
- *       <dt class="REGEX"><kbd>(?></kbd><var>X</var><kbd>)</kbd>
+ *       <dt class="REGEX"><kbd>(?&gt;</kbd><var>X</var><kbd>)</kbd>
  *       <dd>Independent expression group. ................
  *
  *       <dt class="REGEX"><kbd>(?</kbd><var>options</var><kbd>:</kbd><var>X</var><kbd>)</kbd>
@@ -433,10 +433,10 @@ import org.apache.jena.ext.xerces.util.IntStack;
  * minmax ::= '{' ([0-9]+ | [0-9]+ ',' | ',' [0-9]+ | [0-9]+ ',' [0-9]+) '}'
  * atom ::= char | '.' | char-class | '(' regex ')' | '(?:' regex ')' | '\' [0-9]
  *          | '\w' | '\W' | '\d' | '\D' | '\s' | '\S' | category-block | '\X'
- *          | '(?>' regex ')' | '(?' options ':' regex ')'
+ *          | '(?&gt;' regex ')' | '(?' options ':' regex ')'
  *          | '(?' ('(' [0-9] ')' | '(' anchors ')' | looks) term ('|' term)? ')'
  * options ::= [imsw]* ('-' [imsw]+)?
- * anchors ::= '^' | '$' | '\A' | '\Z' | '\z' | '\b' | '\B' | '\&lt;' | '\>'
+ * anchors ::= '^' | '$' | '\A' | '\Z' | '\z' | '\b' | '\B' | '\&lt;' | '\&gt;'
  * looks ::= '(?=' regex ')'  | '(?!' regex ')'
  *           | '(?&lt;=' regex ')' | '(?&lt;!' regex ')'
  * char ::= '\\' | '\' [efnrtv] | '\c' [@-_] | code-point | character-1
@@ -454,7 +454,7 @@ import org.apache.jena.ext.xerces.util.IntStack;
  * character-1 ::= (any character except meta-characters)
  *
  * char-class ::= '[' ranges ']'
- *                | '(?[' ranges ']' ([-+&] '[' ranges ']')? ')'
+ *                | '(?[' ranges ']' ([-+&amp;] '[' ranges ']')? ')'
  * ranges ::= '^'? (range <a href="#COMMA_OPTION">','?</a>)+
  * range ::= '\d' | '\w' | '\s' | '\D' | '\W' | '\S' | category-block
  *           | range-char | range-char '-' range-char
@@ -2207,7 +2207,7 @@ public class RegularExpression implements java.io.Serializable {
 
     /**
      * An option.
-     * This enables to process locale-independent word boundary for <span class="REGEX"><kbd>\b \B \&lt; \></kbd></span>.
+     * This enables to process locale-independent word boundary for <span class="REGEX"><kbd>\b \B \&lt; \&gt;</kbd></span>.
      * <p>By default, the engine considers a position between a word character
      * (<span class="REGEX"><Kbd>\w</kbd></span>) and a non word character
      * is a word boundary.

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/ext/xerces/util/URI.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ext/xerces/util/URI.java b/jena-core/src/main/java/org/apache/jena/ext/xerces/util/URI.java
index 3e09bea..f3d4a40 100644
--- a/jena-core/src/main/java/org/apache/jena/ext/xerces/util/URI.java
+++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/util/URI.java
@@ -1781,7 +1781,7 @@ public String toString() {
   * '.'. Each group must consist of one to three digits. See RFC 2732 Section 3,
   * and RFC 2373 Section 2.2, for the definition of IPv6 references. A hostname 
   * consists of domain labels (each of which must begin and end with an alphanumeric 
-  * but may contain '-') separated & by a '.'. See RFC 2396 Section 3.2.2.
+  * but may contain '-') separated by a '.'. See RFC 2396 Section 3.2.2.
   *
   * @return true if the string is a syntactically valid IPv4 address, 
   * IPv6 reference or hostname

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
index 1e7f23d..1925d64 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java
@@ -29,7 +29,7 @@ import org.xml.sax.ext.LexicalHandler;
  * This class is public merely to reduce the amount of irrelevant documentation
  * generated by Javadoc for {@link SAX2RDF}.
  * 
- * There is nothing of interest in this JavaDoc. This if (depth>0) superclass
+ * There is nothing of interest in this JavaDoc. This if (depth&gt;0) superclass
  * implements the functionality needed by {@link SAX2RDF}. The API given here
  * is the familiar SAX.
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
index d2db86f..d9e8aea 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsWantLiteralValueOrDescription.java
@@ -39,7 +39,7 @@ abstract class AbsWantLiteralValueOrDescription extends
         super(s, x);
     }
 
-    /**
+    /*
      * It is unclear to jjc, whether we are obliged to copy the characters, or
      * whether we know that they will not be overwritten after we return. For
      * safety, I hence copy them. Normally, we have two interesting cases: a)

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
index be9ebc7..7198568 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java
@@ -130,9 +130,9 @@ public abstract class AbsXMLLiteral extends Frame {
     }
 
     /** except all ampersands are replaced by &amp;, all open angle
-      brackets () are replaced by &lt;, all closing angle brackets 
-      (>) are replaced by &gt;, and all #xD characters are replaced 
-      by &#xD;.  
+      brackets (&lt;) are replaced by &amp;lt;, all closing angle brackets 
+      (&gt;) are replaced by &amp;gt;, and all #xD characters are replaced 
+      by &amp;#xD;.  
      * @throws SAXParseException 
      */
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java
index cbc9eee..a381368 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java
@@ -125,7 +125,6 @@ public class FBRuleReasoner implements RuleReasoner {
          Add the given rules to the current set and answer this Reasoner. Provided 
          so that the Factory can deal out reasoners with specified rulesets. 
          There may well be a better way to arrange this.
-         TODO review & revise
     */
     public FBRuleReasoner addRules(List<Rule> rules) {
         List<Rule> combined = new ArrayList<>( this.rules );

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java
index b85d516..37c545b 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java
@@ -31,7 +31,7 @@ import org.apache.jena.reasoner.* ;
  * <li>RDFS entailments</li>
  * <li>basic OWL axioms like ObjectProperty subClassOf Property</li>
  * <li>intersectionOf, equivalentClass and forward implication of unionOf sufficient for traversal
- * of explicit class hierarchies<.li>
+ * of explicit class hierarchies</li>
  * <li>Property axioms (inversOf, SymmetricProperty, TransitiveProperty, equivalentProperty)</li>
  * </ul>
  * There is some experimental support for the cheaper class restriction handlingly which

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasonerFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasonerFactory.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasonerFactory.java
index 36a3309..e3a5ca2 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasonerFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasonerFactory.java
@@ -32,7 +32,7 @@ import org.apache.jena.vocabulary.* ;
  * <li>RDFS entailments</li>
  * <li>basic OWL axioms like ObjectProperty subClassOf Property</li>
  * <li>intersectionOf, equivalentClass and forward implication of unionOf sufficient for traversal
- * of explicit class hierarchies<.li>
+ * of explicit class hierarchies</li>
  * <li>Property axioms (inversOf, SymmetricProperty, TransitiveProperty, equivalentProperty)</li>
  * </ul>
  * There is some experimental support for the cheaper class restriction handlingly which

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java
index 92e273b..04e2984 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java
@@ -28,7 +28,7 @@ import org.apache.jena.reasoner.* ;
  * Reasoner configuration for the OWL mini reasoner.
  * Key limitations over the normal OWL configuration are:
  * <UL>
- * <li>omits the someValuesFrom => bNode entailments</li>
+ * <li>omits the someValuesFrom {@literal =>} bNode entailments</li>
  * <li>avoids any guard clauses which would break the find() contract</li>
  * <li>omits inheritance of range implications for XSD datatype ranges</li>
  * </UL>

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasonerFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasonerFactory.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasonerFactory.java
index 988bba6..7a258ba 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasonerFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasonerFactory.java
@@ -28,7 +28,7 @@ import org.apache.jena.vocabulary.* ;
  * Reasoner factory for the OWL mini configuration. Key limitations over
  * the normal OWL configuration are:
  * <UL>
- * <li>omits the someValuesFrom => bNode entailments</li>
+ * <li>omits the someValuesFrom {@literal =>} bNode entailments</li>
  * <li>avoids any guard clauses which would break the find() contract</li>
  * <li>omits inheritance of range implications for XSD datatype ranges</li>
  * </UL>

http://git-wip-us.apache.org/repos/asf/jena/blob/5d32a5c2/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
index d38b6fb..f3c89f0 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
@@ -71,9 +71,9 @@ import org.slf4j.LoggerFactory ;
  * to allow rules to be embedded in code. External rule syntax based on N3
  * and RDF could be developed. The embedded syntax supports rules such as:
  * <blockindent>    
- * <code>[ (?C rdf:type *), guard(?C, ?P)  -> (?c rb:restriction some(?P, ?D)) ].</code><br />
- * <code>[ (?s owl:foo ?p) -> [ (?s owl:bar ?a) -> (?s ?p ?a) ] ].</code><br />
- * <code>[name: (?s owl:foo ?p) -> (?s ?p ?a)].</code><br />
+ * <code>[ (?C rdf:type *), guard(?C, ?P) {@literal ->} (?c rb:restriction some(?P, ?D)) ].</code><br />
+ * <code>[ (?s owl:foo ?p) {@literal ->} [ (?s owl:bar ?a) {@literal ->} (?s ?p ?a) ] ].</code><br />
+ * <code>[name: (?s owl:foo ?p) {@literal ->} (?s ?p ?a)].</code><br />
  * </blockindent>
  * only built in namespaces are recognized as such, * is a wildcard node, ?c is a variable, 
  * name(node ... node) is a functor, (node node node) is a triple pattern, [..] is an


[6/8] jena git commit: JENA-1546: Javadoc fixes (jena-sdb)

Posted by an...@apache.org.
JENA-1546: Javadoc fixes (jena-sdb)


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6c61a08
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6c61a08
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6c61a08

Branch: refs/heads/master
Commit: f6c61a0852a57b49326b60cbe0b886e36ecbb48a
Parents: 5d32a5c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 10 14:46:44 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 10 14:46:44 2018 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/sdb/layout2/index/IndexCache.java    | 2 +-
 jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f6c61a08/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/index/IndexCache.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/index/IndexCache.java b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/index/IndexCache.java
index 4790226..72e63bd 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/index/IndexCache.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/index/IndexCache.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import org.apache.jena.sdb.Store ;
 
-/** Experimental : cache for int <=> node hash 
+/** Experimental : cache for int {@literal <=>} node hash 
  * 
  */
 public class IndexCache

http://git-wip-us.apache.org/repos/asf/jena/blob/f6c61a08/jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java
index bcd02bb..e326861 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/StoreMaker.java
@@ -23,7 +23,7 @@ import org.apache.jena.sdb.StoreDesc ;
 import org.apache.jena.sdb.sql.SDBConnection ;
 
 /** Source of new store objects.  Used by StoreFactory, where there is a registry
- * datatype type + layout type => store maker.
+ * datatype type + layout type {@literal =>} store maker.
  */  
 
 public interface StoreMaker


[2/8] jena git commit: JENA-1546: Fix for JDK10 javadoc

Posted by an...@apache.org.
JENA-1546: Fix for JDK10 javadoc


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7e2879c2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7e2879c2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7e2879c2

Branch: refs/heads/master
Commit: 7e2879c23557f2d7e82bb6d3b838d19bd0e183f7
Parents: 379c4c6
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 9 22:28:29 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 9 22:28:29 2018 +0100

----------------------------------------------------------------------
 .../org/apache/jena/iri/ViolationCodes.java     | 511 ++++++++++---------
 .../jena/iri/impl/BuildViolationCodes.java      |   2 +
 .../xml/org/apache/jena/iri/impl/viol2java.xsl  |   4 +-
 .../xml/org/apache/jena/iri/impl/violations.xml |  52 +-
 4 files changed, 286 insertions(+), 283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7e2879c2/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java b/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
index 97d0853..c499f79 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
@@ -60,9 +60,9 @@ Concepts and Abstract Syntax
       </dd>
       
       <dd>
-      The SCHEME component is required.<br>
+      The SCHEME component is required.<br />
     
-             <br>
+             <br/>
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
@@ -152,7 +152,7 @@ Concepts and Abstract Syntax
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2616.html#sec-3.2.2">section 3.2.2</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2616.html#sec-3.2.2">section 3.2.2<a>
       </dt>
       <dd>
 
@@ -183,7 +183,7 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>http://www.example.org/foo/bar</code>></li>
+     <li>&lt;<code>http://www.example.org/foo/bar</code>&gt;</li>
     
              </ul>
              
@@ -191,11 +191,11 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>http://www.example.org:80/foo/bar</code>></li>
+     <li>&lt;<code>http://www.example.org:80/foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>http:foo/bar</code>></li>
+     <li>&lt;<code>http:foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>http://user@www.example.org/foo/bar</code>></li>
+     <li>&lt;<code>http://user@www.example.org/foo/bar</code>&gt;</li>
     
              </ul>
              
@@ -216,7 +216,7 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2818.html#sec-2.4">section 2.4</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2818.html#sec-2.4">section 2.4<a>
       </dt>
       <dd>
 HTTP/TLS is differentiated from HTTP URIs by using the 'https' protocol identifier in place of the 'http' protocol identifier. 
@@ -226,7 +226,7 @@ HTTP/TLS is differentiated from HTTP URIs by using the 'https' protocol identifi
       <dt>
        See <a href="#ref-http">
      [http]</a>, specifically,
-      <a href="http://www.apps.ietf.org/rfc/rfc2818.html#sec-3.2.2">section 3.2.2</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2818.html#sec-3.2.2">section 3.2.2<a>
       </dt>
       <dd>
 
@@ -257,7 +257,7 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>https://www.example.org/foo/bar</code>></li>
+     <li>&lt;<code>https://www.example.org/foo/bar</code>&gt;</li>
     
              </ul>
              
@@ -265,11 +265,11 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>https://www.example.org:443/foo/bar</code>></li>
+     <li>&lt;<code>https://www.example.org:443/foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>https:foo/bar</code>></li>
+     <li>&lt;<code>https:foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>https://user@www.example.org/foo/bar</code>></li>
+     <li>&lt;<code>https://user@www.example.org/foo/bar</code>&gt;</li>
     
              </ul>
              
@@ -292,14 +292,14 @@ http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5<a>
       </dt>
       <dd>
 
      <pre>
 ftpurl = "ftp://" login [ "/" fpath [ ";type=" ftptype ]]
 fpath = fsegment *[ "/" fsegment ]
-fsegment = *[ uchar | "?" | ":" | "@" | "&" | "=" ]
+fsegment = *[ uchar | "?" | ":" | "@" | "&amp;" | "=" ]
 ftptype = "A" | "I" | "D" | "a" | "i" | "d"
 </pre>
     
@@ -350,7 +350,7 @@ uchar = unreserved | escape
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>ftp://user@example.org/foo/bar;type=d</code>></li>
+     <li>&lt;<code>ftp://user@example.org/foo/bar;type=d</code>&gt;</li>
     
              </ul>
              
@@ -358,11 +358,11 @@ uchar = unreserved | escape
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>ftp:///foo/bar</code>></li>
+     <li>&lt;<code>ftp:///foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>ftp://user@example.org/foo/bar;type=z</code>></li>
+     <li>&lt;<code>ftp://user@example.org/foo/bar;type=z</code>&gt;</li>
     
-     <li>&lt;<code>ftp://user@example.org/foo/b;ar;type=d</code>></li>
+     <li>&lt;<code>ftp://user@example.org/foo/b;ar;type=d</code>&gt;</li>
     
              </ul>
              
@@ -385,7 +385,7 @@ uchar = unreserved | escape
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5<a>
       </dt>
       <dd>
 
@@ -393,7 +393,7 @@ uchar = unreserved | escape
 newsurl = "news:" grouppart
 grouppart = "*" | group | article
 group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
-article = 1*[ uchar | ";" | "/" | "?" | ":" | "&" | "=" ] "@" host
+article = 1*[ uchar | ";" | "/" | "?" | ":" | "&amp;" | "=" ] "@" host
 </pre>
     
 
@@ -432,13 +432,13 @@ uchar = unreserved | escape
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>news:*</code>></li>
+     <li>&lt;<code>news:*</code>&gt;</li>
     
-     <li>&lt;<code>news:group.it</code>></li>
+     <li>&lt;<code>news:group.it</code>&gt;</li>
     
-     <li>&lt;<code>news:arb?itrary@news.example.org</code>></li>
+     <li>&lt;<code>news:arb?itrary@news.example.org</code>&gt;</li>
     
-     <li>&lt;<code>news:arbitrary@news.example.org</code>></li>
+     <li>&lt;<code>news:arbitrary@news.example.org</code>&gt;</li>
     
              </ul>
              
@@ -446,13 +446,13 @@ uchar = unreserved | escape
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>news:arbitrary@news.exampl\u00E7.org</code>></li>
+     <li>&lt;<code>news:arbitrary@news.exampl\u00E7.org</code>&gt;</li>
     
-     <li>&lt;<code>news:arbitr?ary@news.exampl\u00E7.org</code>></li>
+     <li>&lt;<code>news:arbitr?ary@news.exampl\u00E7.org</code>&gt;</li>
     
-     <li>&lt;<code>news:///foo/bar</code>></li>
+     <li>&lt;<code>news:///foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>news://user@example.org/foo</code>></li>
+     <li>&lt;<code>news://user@example.org/foo</code>&gt;</li>
     
              </ul>
              
@@ -475,7 +475,7 @@ uchar = unreserved | escape
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5<a>
       </dt>
       <dd>
 
@@ -517,9 +517,9 @@ group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>nntp://example.org/foo4</code>></li>
+     <li>&lt;<code>nntp://example.org/foo4</code>&gt;</li>
     
-     <li>&lt;<code>nntp://example.org/foo/4</code>></li>
+     <li>&lt;<code>nntp://example.org/foo/4</code>&gt;</li>
     
              </ul>
              
@@ -527,19 +527,19 @@ group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>nntp://user@example.org/foo</code>></li>
+     <li>&lt;<code>nntp://user@example.org/foo</code>&gt;</li>
     
-     <li>&lt;<code>nntp:/foo</code>></li>
+     <li>&lt;<code>nntp:/foo</code>&gt;</li>
     
-     <li>&lt;<code>nntp:///foo</code>></li>
+     <li>&lt;<code>nntp:///foo</code>&gt;</li>
     
-     <li>&lt;<code>nntp://example.org/foo/4/3</code>></li>
+     <li>&lt;<code>nntp://example.org/foo/4/3</code>&gt;</li>
     
-     <li>&lt;<code>nntp://example.org/</code>></li>
+     <li>&lt;<code>nntp://example.org/</code>&gt;</li>
     
-     <li>&lt;<code>nntp://example.org/foo/</code>></li>
+     <li>&lt;<code>nntp://example.org/foo/</code>&gt;</li>
     
-     <li>&lt;<code>nntp://example.org/*</code>></li>
+     <li>&lt;<code>nntp://example.org/*</code>&gt;</li>
     
              </ul>
              
@@ -562,7 +562,7 @@ group = alpha *[ alpha | digit | "-" | "." | "+" | "_" ]
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc1738.html#sec-5">section 5<a>
       </dt>
       <dd>
 
@@ -573,7 +573,7 @@ fileurl = "file://" [ host | "localhost" ] "/" fpath
 
      <pre>
 fpath = fsegment *[ "/" fsegment ]
-fsegment = *[ uchar | "?" | ":" | "@" | "&" | "=" ]
+fsegment = *[ uchar | "?" | ":" | "@" | "&amp;" | "=" ]
 </pre>
     
 
@@ -622,9 +622,9 @@ uchar = unreserved | escape
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>file:///foo/b</code>></li>
+     <li>&lt;<code>file:///foo/b</code>&gt;</li>
     
-     <li>&lt;<code>file:///foo/b?ar/yuk</code>></li>
+     <li>&lt;<code>file:///foo/b?ar/yuk</code>&gt;</li>
     
              </ul>
              
@@ -632,17 +632,17 @@ uchar = unreserved | escape
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>file://user@example.org/foo/bar</code>></li>
+     <li>&lt;<code>file://user@example.org/foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>file://eg:4029/foo/bar</code>></li>
+     <li>&lt;<code>file://eg:4029/foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>file:/foo/bar</code>></li>
+     <li>&lt;<code>file:/foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>file://example.org</code>></li>
+     <li>&lt;<code>file://example.org</code>&gt;</li>
     
-     <li>&lt;<code>file://foo/bar;t</code>></li>
+     <li>&lt;<code>file://foo/bar;t</code>&gt;</li>
     
-     <li>&lt;<code>file://foo/~jjc</code>></li>
+     <li>&lt;<code>file://foo/~jjc</code>&gt;</li>
     
              </ul>
              
@@ -683,13 +683,13 @@ uchar = unreserved | escape
       
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2">section 2</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2">section 2<a>
       </dt>
       <dd>
    All URNs have the following syntax (phrases enclosed in quotes are REQUIRED):
 
      <pre>
-&lt;URN> ::= "urn:" &lt;NID> ":" &lt;NSS>
+&lt;URN&gt; ::= "urn:" &lt;NID&gt; ":" &lt;NSS&gt;
 </pre>
     
 
@@ -697,16 +697,16 @@ uchar = unreserved | escape
     
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.1">section 2.1</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.1">section 2.1<a>
       </dt>
       <dd>
 
      <pre>
-&lt;NID>         ::= &lt;let-num> [ 1,31&lt;let-num-hyp> ]
+&lt;NID&gt;         ::= &lt;let-num&gt; [ 1,31&lt;let-num-hyp&gt; ]
 
-&lt;let-num-hyp> ::= &lt;upper> | &lt;lower> | &lt;number> | "-"
+&lt;let-num-hyp&gt; ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt; | "-"
 
-&lt;let-num>     ::= &lt;upper> | &lt;lower> | &lt;number>
+&lt;let-num&gt;     ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt;
 </pre>
     
 
@@ -714,18 +714,18 @@ uchar = unreserved | escape
     
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.2">section 2.2</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.2">section 2.2<a>
       </dt>
       <dd>
 
      <pre>
-&lt;NSS>         ::= 1*&lt;URN chars>
+&lt;NSS&gt;         ::= 1*&lt;URN chars&gt;
 
-&lt;URN chars>   ::= &lt;trans> | "%" &lt;hex> &lt;hex>
+&lt;URN chars&gt;   ::= &lt;trans&gt; | "%" &lt;hex&gt; &lt;hex&gt;
 
-&lt;trans>       ::= &lt;upper> | &lt;lower> | &lt;number> | &lt;other> | &lt;reserved>
+&lt;trans&gt;       ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt; | &lt;other&gt; | &lt;reserved&gt;
 
-&lt;other>       ::= "(" | ")" | "+" | "," | "-" | "." |
+&lt;other&gt;       ::= "(" | ")" | "+" | "," | "-" | "." |
                   ":" | "=" | "@" | ";" | "$" |
                   "_" | "!" | "*" | "'"
 </pre>
@@ -735,7 +735,7 @@ uchar = unreserved | escape
     
       <dt>
        See
-      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.3.2">section 2.3.2</a>
+      <a href="http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.3.2">section 2.3.2<a>
       </dt>
       <dd>
 RFC 1630 [2] reserves the characters "/", "?", and "#" for particular purposes. 
@@ -778,9 +778,9 @@ In addition, octet 0 (0 hex) should NEVER be used, in either unencoded or %-enco
              The following are examples of well-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>urn:x-hp:foo\u00E9</code>></li>
+     <li>&lt;<code>urn:x-hp:foo\u00E9</code>&gt;</li>
     
-     <li>&lt;<code>urn:urn-1:foo</code>></li>
+     <li>&lt;<code>urn:urn-1:foo</code>&gt;</li>
     
              </ul>
              
@@ -788,15 +788,15 @@ In addition, octet 0 (0 hex) should NEVER be used, in either unencoded or %-enco
              The following are examples of ill-formed IRIs using this scheme:
              <ul>
              
-     <li>&lt;<code>urn:x-hp:foo/bar</code>></li>
+     <li>&lt;<code>urn:x-hp:foo/bar</code>&gt;</li>
     
-     <li>&lt;<code>urn:urn:foo</code>></li>
+     <li>&lt;<code>urn:urn:foo</code>&gt;</li>
     
-     <li>&lt;<code>urn://foo</code>></li>
+     <li>&lt;<code>urn://foo</code>&gt;</li>
     
-     <li>&lt;<code>urn:foo:bar?query</code>></li>
+     <li>&lt;<code>urn:foo:bar?query</code>&gt;</li>
     
-     <li>&lt;<code>urn:foo:ff~</code>></li>
+     <li>&lt;<code>urn:foo:ff~</code>&gt;</li>
     
              </ul>
              
@@ -1511,7 +1511,7 @@ This class is not part of the API.
   "\n"+
     "ftpurl = \"ftp://\" login [ \"/\" fpath [ \";type=\" ftptype ]]\n"+
     "fpath = fsegment *[ \"/\" fsegment ]\n"+
-    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&\" | \"=\" ]\n"+
+    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&amp;\" | \"=\" ]\n"+
     "ftptype = \"A\" | \"I\" | \"D\" | \"a\" | \"i\" | \"d\"\n"+
     ""+
   "\n"+
@@ -1528,7 +1528,7 @@ This class is not part of the API.
      "</p><pre>\n"+
     "ftpurl = \"ftp://\" login [ \"/\" fpath [ \";type=\" ftptype ]]\n"+
     "fpath = fsegment *[ \"/\" fsegment ]\n"+
-    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&\" | \"=\" ]\n"+
+    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&amp;\" | \"=\" ]\n"+
     "ftptype = \"A\" | \"I\" | \"D\" | \"a\" | \"i\" | \"d\"\n"+
     "</pre>"+
      "<p>"+
@@ -1623,7 +1623,7 @@ This class is not part of the API.
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     ""+
   "\n"+
     "safe = \"$\" | \"-\" | \"_\" | \".\" | \"+\"\n"+
@@ -1637,7 +1637,7 @@ This class is not part of the API.
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     "</pre>"+
      "<p>"+
      "</p><pre>\n"+
@@ -1818,7 +1818,7 @@ This class is not part of the API.
     ""+
   "\n"+
     "fpath = fsegment *[ \"/\" fsegment ]\n"+
-    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&\" | \"=\" ]\n"+
+    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&amp;\" | \"=\" ]\n"+
     ""+
   "\n"+
     "safe = \"$\" | \"-\" | \"_\" | \".\" | \"+\"\n"+
@@ -1834,7 +1834,7 @@ This class is not part of the API.
      "<p>"+
      "</p><pre>\n"+
     "fpath = fsegment *[ \"/\" fsegment ]\n"+
-    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&\" | \"=\" ]\n"+
+    "fsegment = *[ uchar | \"?\" | \":\" | \"@\" | \"&amp;\" | \"=\" ]\n"+
     "</pre>"+
      "<p>"+
      "</p><pre>\n"+
@@ -2375,11 +2375,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2",    
                 "All URNs have the following syntax (phrases enclosed in quotes are REQUIRED):"+
   "\n"+
-    "<URN> ::= \"urn:\" <NID> \":\" <NSS>\n"+
+    "<URN&gt; ::= \"urn:\" <NID&gt; \":\" <NSS&gt;\n"+
     "",    
                 "All URNs have the following syntax (phrases enclosed in quotes are REQUIRED):"+
      "</p><pre>\n"+
-    "&lt;URN> ::= \"urn:\" &lt;NID> \":\" &lt;NSS>\n"+
+    "&lt;URN&gt; ::= \"urn:\" &lt;NID&gt; \":\" &lt;NSS&gt;\n"+
     "</pre>"+
      "<p>"
         );
@@ -2389,19 +2389,19 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.1",    
                 ""+
   "\n"+
-    "<NID>         ::= <let-num> [ 1,31<let-num-hyp> ]\n"+
+    "<NID&gt;         ::= <let-num&gt; [ 1,31<let-num-hyp&gt; ]\n"+
     "\n"+
-    "<let-num-hyp> ::= <upper> | <lower> | <number> | \"-\"\n"+
+    "<let-num-hyp&gt; ::= <upper&gt; | <lower&gt; | <number&gt; | \"-\"\n"+
     "\n"+
-    "<let-num>     ::= <upper> | <lower> | <number>\n"+
+    "<let-num&gt;     ::= <upper&gt; | <lower&gt; | <number&gt;\n"+
     "",    
                 ""+
      "</p><pre>\n"+
-    "&lt;NID>         ::= &lt;let-num> [ 1,31&lt;let-num-hyp> ]\n"+
+    "&lt;NID&gt;         ::= &lt;let-num&gt; [ 1,31&lt;let-num-hyp&gt; ]\n"+
     "\n"+
-    "&lt;let-num-hyp> ::= &lt;upper> | &lt;lower> | &lt;number> | \"-\"\n"+
+    "&lt;let-num-hyp&gt; ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt; | \"-\"\n"+
     "\n"+
-    "&lt;let-num>     ::= &lt;upper> | &lt;lower> | &lt;number>\n"+
+    "&lt;let-num&gt;     ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt;\n"+
     "</pre>"+
      "<p>"
         );
@@ -2411,25 +2411,25 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.2",    
                 ""+
   "\n"+
-    "<NSS>         ::= 1*<URN chars>\n"+
+    "<NSS&gt;         ::= 1*<URN chars&gt;\n"+
     "\n"+
-    "<URN chars>   ::= <trans> | \"%\" <hex> <hex>\n"+
+    "<URN chars&gt;   ::= <trans&gt; | \"%\" <hex&gt; <hex&gt;\n"+
     "\n"+
-    "<trans>       ::= <upper> | <lower> | <number> | <other> | <reserved>\n"+
+    "<trans&gt;       ::= <upper&gt; | <lower&gt; | <number&gt; | <other&gt; | <reserved&gt;\n"+
     "\n"+
-    "<other>       ::= \"(\" | \")\" | \"+\" | \",\" | \"-\" | \".\" |\n"+
+    "<other&gt;       ::= \"(\" | \")\" | \"+\" | \",\" | \"-\" | \".\" |\n"+
     "                  \":\" | \"=\" | \"@\" | \";\" | \"$\" |\n"+
     "                  \"_\" | \"!\" | \"*\" | \"'\"\n"+
     "",    
                 ""+
      "</p><pre>\n"+
-    "&lt;NSS>         ::= 1*&lt;URN chars>\n"+
+    "&lt;NSS&gt;         ::= 1*&lt;URN chars&gt;\n"+
     "\n"+
-    "&lt;URN chars>   ::= &lt;trans> | \"%\" &lt;hex> &lt;hex>\n"+
+    "&lt;URN chars&gt;   ::= &lt;trans&gt; | \"%\" &lt;hex&gt; &lt;hex&gt;\n"+
     "\n"+
-    "&lt;trans>       ::= &lt;upper> | &lt;lower> | &lt;number> | &lt;other> | &lt;reserved>\n"+
+    "&lt;trans&gt;       ::= &lt;upper&gt; | &lt;lower&gt; | &lt;number&gt; | &lt;other&gt; | &lt;reserved&gt;\n"+
     "\n"+
-    "&lt;other>       ::= \"(\" | \")\" | \"+\" | \",\" | \"-\" | \".\" |\n"+
+    "&lt;other&gt;       ::= \"(\" | \")\" | \"+\" | \",\" | \"-\" | \".\" |\n"+
     "                  \":\" | \"=\" | \"@\" | \";\" | \"$\" |\n"+
     "                  \"_\" | \"!\" | \"*\" | \"'\"\n"+
     "</pre>"+
@@ -3008,8 +3008,8 @@ This class is not part of the API.
                 "IRI", 
                 -1,
                 "http://www.apps.ietf.org/rfc/rfc3987.html#page-13",
-                "Systems accepting IRIs MAY also deal with the printable characters in US-ASCII that are not allowed in URIs, namely \"<\", \">\", '\"', space, \"{\", \"}\", \"|\", \"\\\", \"^\", and \"`\", in step 2 above. If these characters are found but are not converted, then the conversion SHOULD fail.",
-                "<p>Systems accepting IRIs MAY also deal with the printable characters in US-ASCII that are not allowed in URIs, namely \"&lt;\", \">\", '\"', space, \"{\", \"}\", \"|\", \"\\\", \"^\", and \"`\", in step 2 above. If these characters are found but are not converted, then the conversion SHOULD fail.</p>"
+                "Systems accepting IRIs MAY also deal with the printable characters in US-ASCII that are not allowed in URIs, namely \"<\", \"&gt;\", '\"', space, \"{\", \"}\", \"|\", \"\\\", \"^\", and \"`\", in step 2 above. If these characters are found but are not converted, then the conversion SHOULD fail.",
+                "<p>Systems accepting IRIs MAY also deal with the printable characters in US-ASCII that are not allowed in URIs, namely \"&lt;\", \"&gt;\", '\"', space, \"{\", \"}\", \"|\", \"\\\", \"^\", and \"`\", in step 2 above. If these characters are found but are not converted, then the conversion SHOULD fail.</p>"
             ),
     
             new FromAlso(
@@ -3024,7 +3024,7 @@ This class is not part of the API.
     
       "http://example.org/fo<o",
     
-      "http://example.org/fo>o",
+      "http://example.org/fo&gt;o",
     
       "http://example.org/fo\"o",
     
@@ -3803,23 +3803,23 @@ This class is not part of the API.
                 "http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#schema",
                 ""+
   "\n"+
-    "<xs:simpleType name=\"anyURI\" id=\"anyURI\">\n"+
+    "<xs:simpleType name=\"anyURI\" id=\"anyURI\"&gt;\n"+
     "		    [...]\n"+
-    "    <xs:restriction base=\"xs:anySimpleType\">\n"+
-    "      <xs:whiteSpace fixed=\"true\" value=\"collapse\" id=\"anyURI.whiteSpace\"/>\n"+
+    "    <xs:restriction base=\"xs:anySimpleType\"&gt;\n"+
+    "      <xs:whiteSpace fixed=\"true\" value=\"collapse\" id=\"anyURI.whiteSpace\"/&gt;\n"+
     "\n"+
-    "    </xs:restriction>\n"+
-    "</xs:simpleType>\n"+
+    "    </xs:restriction&gt;\n"+
+    "</xs:simpleType&gt;\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
-    "&lt;xs:simpleType name=\"anyURI\" id=\"anyURI\">\n"+
+    "&lt;xs:simpleType name=\"anyURI\" id=\"anyURI\"&gt;\n"+
     "		    [...]\n"+
-    "    &lt;xs:restriction base=\"xs:anySimpleType\">\n"+
-    "      &lt;xs:whiteSpace fixed=\"true\" value=\"collapse\" id=\"anyURI.whiteSpace\"/>\n"+
+    "    &lt;xs:restriction base=\"xs:anySimpleType\"&gt;\n"+
+    "      &lt;xs:whiteSpace fixed=\"true\" value=\"collapse\" id=\"anyURI.whiteSpace\"/&gt;\n"+
     "\n"+
-    "    &lt;/xs:restriction>\n"+
-    "&lt;/xs:simpleType>\n"+
+    "    &lt;/xs:restriction&gt;\n"+
+    "&lt;/xs:simpleType&gt;\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -4793,11 +4793,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.3",
                 "The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:"+
   "\n"+
-    "      <prefix>'-'<tree-specific identifier>\n"+
+    "      <prefix&gt;'-'<tree-specific identifier&gt;\n"+
     "For instance, the \"foo\" tree would allow creation of scheme names of the form: \"foo-blahblah:\" and \"foo-bar:\", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix.",
                 "<p>The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:"+
      "</p><pre>\n"+
-    "      &lt;prefix>'-'&lt;tree-specific identifier>\n"+
+    "      &lt;prefix&gt;'-'&lt;tree-specific identifier&gt;\n"+
     "</pre>"+
      "<p>For instance, the \"foo\" tree would allow creation of scheme names of the form: \"foo-blahblah:\" and \"foo-bar:\", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix.</p>"
             ),
@@ -4855,11 +4855,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2717.html#sec-3.3",
                 "The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:"+
   "\n"+
-    "      <prefix>'-'<tree-specific identifier>\n"+
+    "      <prefix&gt;'-'<tree-specific identifier&gt;\n"+
     "For instance, the \"foo\" tree would allow creation of scheme names of the form: \"foo-blahblah:\" and \"foo-bar:\", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix.",
                 "<p>The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:"+
      "</p><pre>\n"+
-    "      &lt;prefix>'-'&lt;tree-specific identifier>\n"+
+    "      &lt;prefix&gt;'-'&lt;tree-specific identifier&gt;\n"+
     "</pre>"+
      "<p>For instance, the \"foo\" tree would allow creation of scheme names of the form: \"foo-blahblah:\" and \"foo-bar:\", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix.</p>"
             ),
@@ -5091,8 +5091,8 @@ This class is not part of the API.
             new ViolationCodeInfo(
                 UNASSIGNED_UNICODE_CHARACTER,
                 "UNASSIGNED_UNICODE_CHARACTER",
-                "The character code is not assigned in the version of Unicode implemented here.",
-                "<p>The character code is not assigned in the version of Unicode implemented here.</p>",
+                "The character code is not assigned in the version of Unicode implemented here. Check validity of code, consider updating your copy of icu4j.jar.",
+                "<p>The character code is not assigned in the version of Unicode implemented here. Check validity of code, consider updating your copy of icu4j.jar.</p>",
                 0|Force.minting,
                 new InSpec[]{
                   
@@ -5177,8 +5177,8 @@ This class is not part of the API.
             new ViolationCodeInfo(
                 COMPATIBILITY_CHARACTER,
                 "COMPATIBILITY_CHARACTER",
-                "Bad character",
-                "<p>Bad character</p>",
+                "TODO",
+                "<p>TODO</p>",
                 0,
                 new InSpec[]{
                   
@@ -5262,14 +5262,14 @@ This class is not part of the API.
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -5316,11 +5316,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2",
                 ""+
   "\n"+
-    "<URN> ::= \"urn:\" <NID> \":\" <NSS>\n"+
+    "<URN&gt; ::= \"urn:\" <NID&gt; \":\" <NSS&gt;\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
-    "&lt;URN> ::= \"urn:\" &lt;NID> \":\" &lt;NSS>\n"+
+    "&lt;URN&gt; ::= \"urn:\" &lt;NID&gt; \":\" &lt;NSS&gt;\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -5373,7 +5373,7 @@ This class is not part of the API.
   "\n"+
     "     mailtoURL  =  \"mailto:\" [ to ] [ headers ]\n"+
     "     to         =  #mailbox\n"+
-    "     headers    =  \"?\" header *( \"&\" header )\n"+
+    "     headers    =  \"?\" header *( \"&amp;\" header )\n"+
     "     header     =  hname \"=\" hvalue\n"+
     "     hname      =  *urlc\n"+
     "     hvalue     =  *urlc\n"+
@@ -5382,7 +5382,7 @@ This class is not part of the API.
      "</p><pre>\n"+
     "     mailtoURL  =  \"mailto:\" [ to ] [ headers ]\n"+
     "     to         =  #mailbox\n"+
-    "     headers    =  \"?\" header *( \"&\" header )\n"+
+    "     headers    =  \"?\" header *( \"&amp;\" header )\n"+
     "     header     =  hname \"=\" hvalue\n"+
     "     hname      =  *urlc\n"+
     "     hvalue     =  *urlc\n"+
@@ -5399,14 +5399,14 @@ This class is not part of the API.
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
     "newsurl = \"news:\" grouppart\n"+
     "grouppart = \"*\" | group | article\n"+
     "group = alpha *[ alpha | digit | \"-\" | \".\" | \"+\" | \"_\" ]\n"+
-    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&\" | \"=\" ] \"@\" host\n"+
+    "article = 1*[ uchar | \";\" | \"/\" | \"?\" | \":\" | \"&amp;\" | \"=\" ] \"@\" host\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -5459,11 +5459,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2",
                 ""+
   "\n"+
-    "<URN> ::= \"urn:\" <NID> \":\" <NSS>\n"+
+    "<URN&gt; ::= \"urn:\" <NID&gt; \":\" <NSS&gt;\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
-    "&lt;URN> ::= \"urn:\" &lt;NID> \":\" &lt;NSS>\n"+
+    "&lt;URN&gt; ::= \"urn:\" &lt;NID&gt; \":\" &lt;NSS&gt;\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -5474,11 +5474,11 @@ This class is not part of the API.
                 "http://www.apps.ietf.org/rfc/rfc2141.html#sec-2.1",
                 ""+
   "\n"+
-    "<NID>         ::= <let-num> [ 1,31<let-num-hyp> ]\n"+
+    "<NID&gt;         ::= <let-num&gt; [ 1,31<let-num-hyp&gt; ]\n"+
     "",
                 "<p>"+
      "</p><pre>\n"+
-    "&lt;NID>         ::= &lt;let-num> [ 1,31&lt;let-num-hyp> ]\n"+
+    "&lt;NID&gt;         ::= &lt;let-num&gt; [ 1,31&lt;let-num-hyp&gt; ]\n"+
     "</pre>"+
      "<p></p>"
             ),
@@ -5582,7 +5582,7 @@ This class is not part of the API.
 		    The character violates the grammar rules for URIs/IRIs.
 	    
           <p>This violates the following specifications:
-          <a href="#ref-URI">[URI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3986.html#page-49">here</a>), <a href="#ref-IRI">[IRI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-2.2">section 2.2</a>), <a href="#ref-RDF">[RDF]</a>, <a href="#ref-XML">[XML]</a>, <a href="#ref-XLink">[XLink]</a>, <a href="#ref-Schema">[Schema]</a>.
+          <a href="#ref-URI">[URI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3986.html#page-49">here<a>), <a href="#ref-IRI">[IRI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-2.2">section 2.2<a>), <a href="#ref-RDF">[RDF]</a>, <a href="#ref-XML">[XML]</a>, <a href="#ref-XLink">[XLink]</a>, <a href="#ref-Schema">[Schema]</a>.
           </p>
        
          <p>This violation has <a href="http://www.apps.ietf.org/rfc/rfc2119.html#sec-1">MUST</a> force.</p>
@@ -5590,7 +5590,7 @@ This class is not part of the API.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ht$tp://example.org/foo</code>></li>
+     <li>&lt;<code>ht$tp://example.org/foo</code>&gt;</li>
     
         </ul>
        
@@ -5608,7 +5608,7 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.1">section 2.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.1">section 2.1<a>
      </dt>
      <dd>
      
@@ -5635,7 +5635,7 @@ This class is not part of the API.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/foo%c3%80</code>></li>
+     <li>&lt;<code>http://example.org/foo%c3%80</code>&gt;</li>
     
         </ul>
        
@@ -5659,7 +5659,7 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.2">section 3.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.2">section 3.2<a>
      </dt>
      <dd>
      
@@ -5683,7 +5683,7 @@ This class is not part of the API.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/foo%C3%A9r</code>></li>
+     <li>&lt;<code>http://example.org/foo%C3%A9r</code>&gt;</li>
     
         </ul>
        
@@ -5703,7 +5703,7 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.3">section 2.3</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.3">section 2.3<a>
      </dt>
      <dd>
      
@@ -5731,7 +5731,7 @@ This class is not part of the API.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/foo%5Fb%61r</code>></li>
+     <li>&lt;<code>http://example.org/foo%5Fb%61r</code>&gt;</li>
     
         </ul>
        
@@ -5757,12 +5757,12 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#page-13">here</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#page-13">here<a>
      </dt>
      <dd>
      
               Systems accepting IRIs MAY also deal with the printable characters in US-ASCII 
-              that are not allowed in URIs, namely "&lt;", ">", '"', space, "{", "}", "|", "\", 
+              that are not allowed in URIs, namely "&lt;", "&gt;", '"', space, "{", "}", "|", "\", 
               "^", and "`", in step 2 above. If these characters are found but are not converted, 
               then the conversion SHOULD fail. 
              
@@ -5772,7 +5772,7 @@ This class is not part of the API.
      
     
           <p>This violates the following specifications:
-          <a href="#ref-IRI">[IRI]</a>, <a href="#ref-URI">[URI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3986.html#page-49">here</a>).
+          <a href="#ref-IRI">[IRI]</a>, <a href="#ref-URI">[URI]</a> (see <a href="http://www.apps.ietf.org/rfc/rfc3986.html#page-49">here<a>).
           </p>
        
      <p>This violation relates to creating your own IRIs, rather than
@@ -5784,15 +5784,15 @@ This class is not part of the API.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/fo|o</code>></li>
+     <li>&lt;<code>http://example.org/fo|o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo&lt;o</code>></li>
+     <li>&lt;<code>http://example.org/fo&lt;o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo>o</code>></li>
+     <li>&lt;<code>http://example.org/fo&gt;o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo"o</code>></li>
+     <li>&lt;<code>http://example.org/fo"o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo`o</code>></li>
+     <li>&lt;<code>http://example.org/fo`o</code>&gt;</li>
     
         </ul>
        
@@ -5813,7 +5813,7 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Graph-URIref">here</a>
+     <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Graph-URIref">here<a>
      </dt>
      <dd>
      
@@ -5840,7 +5840,7 @@ This class is not part of the API.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html">here</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html">here<a>
      </dt>
      <dd>
      
@@ -5869,13 +5869,13 @@ ucschar = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/fo\u007Fo</code>></li>
+     <li>&lt;<code>http://example.org/fo\u007Fo</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo\u0085o</code>></li>
+     <li>&lt;<code>http://example.org/fo\u0085o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo\u0009o</code>></li>
+     <li>&lt;<code>http://example.org/fo\u0009o</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/fo\u0001o</code>></li>
+     <li>&lt;<code>http://example.org/fo\u0001o</code>&gt;</li>
     
         </ul>
        
@@ -5893,7 +5893,7 @@ ucschar = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF
      <dt>
      
        see
-     <a href="http://www.w3.org/TR/2004/REC-xml-20040204/#NT-Char">here</a>
+     <a href="http://www.w3.org/TR/2004/REC-xml-20040204/#NT-Char">here<a>
      </dt>
      <dd>
       
@@ -5913,7 +5913,7 @@ Char ::=   #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/foo\u0001</code>></li>
+     <li>&lt;<code>http://example.org/foo\u0001</code>&gt;</li>
     
         </ul>
        
@@ -5931,7 +5931,7 @@ Char ::=   #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF
      <dt>
      
        see
-     <a href="http://www.w3.org/TR/2004/REC-xml-20040204/#char32">here</a>
+     <a href="http://www.w3.org/TR/2004/REC-xml-20040204/#char32">here<a>
      </dt>
      <dd>
       
@@ -5959,7 +5959,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/foo\u0080</code>></li>
+     <li>&lt;<code>http://example.org/foo\u0080</code>&gt;</li>
     
         </ul>
        
@@ -5979,7 +5979,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-6.2.2.3">section 6.2.2.3</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-6.2.2.3">section 6.2.2.3<a>
      </dt>
      <dd>
      
@@ -6010,17 +6010,17 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/../foo</code>></li>
+     <li>&lt;<code>http://example.org/../foo</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/foo/../foo</code>></li>
+     <li>&lt;<code>http://example.org/foo/../foo</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/foo/..</code>></li>
+     <li>&lt;<code>http://example.org/foo/..</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/foo/./foo</code>></li>
+     <li>&lt;<code>http://example.org/foo/./foo</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/./foo</code>></li>
+     <li>&lt;<code>http://example.org/./foo</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/foo/.</code>></li>
+     <li>&lt;<code>http://example.org/foo/.</code>&gt;</li>
     
         </ul>
        
@@ -6038,7 +6038,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1<a>
      </dt>
      <dd>
       Scheme names consist of a sequence of characters 
@@ -6060,7 +6060,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>://example.org/foo</code>></li>
+     <li>&lt;<code>://example.org/foo</code>&gt;</li>
     
         </ul>
        
@@ -6078,7 +6078,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1<a>
      </dt>
      <dd>
       Scheme names consist of a sequence of characters 
@@ -6100,7 +6100,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>007://example.org/foo</code>></li>
+     <li>&lt;<code>007://example.org/foo</code>&gt;</li>
     
         </ul>
        
@@ -6118,7 +6118,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
        For the SCHEME component:
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.1">section 3.1<a>
      </dt>
      <dd>
      An implementation should accept uppercase letters as equivalent to lowercase in scheme names (e.g., allow "HTTP" as well as "http") for the sake of robustness but should only produce lowercase scheme names for consistency. 
@@ -6129,7 +6129,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
        For the HOST component:
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6155,9 +6155,9 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>HTTP://example.org/foo</code>></li>
+     <li>&lt;<code>HTTP://example.org/foo</code>&gt;</li>
     
-     <li>&lt;<code>http://eXamPle.org/foo</code>></li>
+     <li>&lt;<code>http://eXamPle.org/foo</code>&gt;</li>
     
         </ul>
        
@@ -6174,7 +6174,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6200,7 +6200,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org:/foo</code>></li>
+     <li>&lt;<code>http://example.org:/foo</code>&gt;</li>
     
         </ul>
        
@@ -6217,7 +6217,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6243,7 +6243,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org:80/foo</code>></li>
+     <li>&lt;<code>http://example.org:80/foo</code>&gt;</li>
     
         </ul>
        
@@ -6262,7 +6262,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-7.2">section 7.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-7.2">section 7.2<a>
      </dt>
      <dd>
      
@@ -6287,7 +6287,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org:180/foo</code>></li>
+     <li>&lt;<code>http://example.org:180/foo</code>&gt;</li>
     
         </ul>
        
@@ -6312,7 +6312,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org:08080/foo</code>></li>
+     <li>&lt;<code>http://example.org:08080/foo</code>&gt;</li>
     
         </ul>
        
@@ -6328,7 +6328,7 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-4.1">section 4.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-4.1">section 4.1<a>
      </dt>
      <dd>
      
@@ -6348,19 +6348,19 @@ characters or permanently undefined Unicode characters: [#x7F-#x84], [#x86-#x9F]
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/Andr\u202Abar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u202Abar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u202Bbar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u202Bbar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u202Cbar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u202Cbar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u202Dbar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u202Dbar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u202Ebar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u202Ebar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u200Ebar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u200Ebar</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/Andr\u200Fbar</code>></li>
+     <li>&lt;<code>http://example.org/Andr\u200Fbar</code>&gt;</li>
     
         </ul>
        
@@ -6385,9 +6385,9 @@ These match no grammar rules of URIs/IRIs.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/ foo</code>></li>
+     <li>&lt;<code>http://example.org/ foo</code>&gt;</li>
     
-     <li>&lt;<code>file:///Program Files</code>></li>
+     <li>&lt;<code>file:///Program Files</code>&gt;</li>
     
         </ul>
        
@@ -6415,13 +6415,13 @@ XML system identifiers, but not XML Schema anyURIs.
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/  foo</code>></li>
+     <li>&lt;<code>http://example.org/  foo</code>&gt;</li>
     
-     <li>&lt;<code>file:///Program  Files</code>></li>
+     <li>&lt;<code>file:///Program  Files</code>&gt;</li>
     
-     <li>&lt;<code>file:///TabBar </code>></li>
+     <li>&lt;<code>file:///TabBar </code>&gt;</li>
     
-     <li>&lt;<code> rel-with-initial-space</code>></li>
+     <li>&lt;<code> rel-with-initial-space</code>&gt;</li>
     
         </ul>
        
@@ -6448,19 +6448,19 @@ Whitespace characters
      <dt>
      
        see
-     <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#schema">here</a>
+     <a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#schema">here<a>
      </dt>
      <dd>
      
 
      <pre>
-&lt;xs:simpleType name="anyURI" id="anyURI">
+&lt;xs:simpleType name="anyURI" id="anyURI"&gt;
 		    [...]
-    &lt;xs:restriction base="xs:anySimpleType">
-      &lt;xs:whiteSpace fixed="true" value="collapse" id="anyURI.whiteSpace"/>
+    &lt;xs:restriction base="xs:anySimpleType"&gt;
+      &lt;xs:whiteSpace fixed="true" value="collapse" id="anyURI.whiteSpace"/&gt;
 
-    &lt;/xs:restriction>
-&lt;/xs:simpleType>
+    &lt;/xs:restriction&gt;
+&lt;/xs:simpleType&gt;
 </pre>
     
   
@@ -6478,11 +6478,11 @@ Whitespace characters
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>file:///Tab\u0009Bar</code>></li>
+     <li>&lt;<code>file:///Tab\u0009Bar</code>&gt;</li>
     
-     <li>&lt;<code>file:///Tab\u000ABar</code>></li>
+     <li>&lt;<code>file:///Tab\u000ABar</code>&gt;</li>
     
-     <li>&lt;<code>file:///Tab\u000DBar</code>></li>
+     <li>&lt;<code>file:///Tab\u000DBar</code>&gt;</li>
     
         </ul>
        
@@ -6543,7 +6543,7 @@ Whitespace characters
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6582,11 +6582,11 @@ h16         = 1*4HEXDIG
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://[/</code>></li>
+     <li>&lt;<code>http://[/</code>&gt;</li>
     
-     <li>&lt;<code>ldap://[20015:db8::7]/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://[20015:db8::7]/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>ldap://[2001:db8:::7]/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://[2001:db8:::7]/c=GB?objectClass?one</code>&gt;</li>
     
         </ul>
        
@@ -6604,7 +6604,7 @@ h16         = 1*4HEXDIG
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6633,9 +6633,9 @@ h16         = 1*4HEXDIG
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ldap://[2001:Db8::7]/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://[2001:Db8::7]/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>ldap://[2001:dB8::7]/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://[2001:dB8::7]/c=GB?objectClass?one</code>&gt;</li>
     
         </ul>
        
@@ -6654,7 +6654,7 @@ h16         = 1*4HEXDIG
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6669,7 +6669,7 @@ h16         = 1*4HEXDIG
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6697,13 +6697,13 @@ dec-octet   = DIGIT                 ; 0-9
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ldap://155.00.55.102/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://155.00.55.102/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>ldap://20.256.20.20/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://20.256.20.20/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>ldap://20.1000.20.20/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://20.1000.20.20/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>ldap://20.010.20.20/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://20.010.20.20/c=GB?objectClass?one</code>&gt;</li>
     
         </ul>
        
@@ -6721,7 +6721,7 @@ dec-octet   = DIGIT                 ; 0-9
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6749,9 +6749,9 @@ dec-octet   = DIGIT                 ; 0-9
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ldap://foo$/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://foo$/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>http://foo.example.$org/</code>></li>
+     <li>&lt;<code>http://foo.example.$org/</code>&gt;</li>
     
         </ul>
        
@@ -6769,7 +6769,7 @@ dec-octet   = DIGIT                 ; 0-9
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6799,7 +6799,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ftp://andr%C3%A9.example.org/</code>></li>
+     <li>&lt;<code>ftp://andr%C3%A9.example.org/</code>&gt;</li>
     
         </ul>
        
@@ -6817,7 +6817,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.1">section 2.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-2.1">section 2.1<a>
      </dt>
      <dd>
      
@@ -6837,17 +6837,17 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ftp://andr%%A9.example.org/</code>></li>
+     <li>&lt;<code>ftp://andr%%A9.example.org/</code>&gt;</li>
     
-     <li>&lt;<code>ftp://andr%.example.org/</code>></li>
+     <li>&lt;<code>ftp://andr%.example.org/</code>&gt;</li>
     
-     <li>&lt;<code>ftp://andre.example.org/%</code>></li>
+     <li>&lt;<code>ftp://andre.example.org/%</code>&gt;</li>
     
-     <li>&lt;<code>ftp://andre.example.org/%A</code>></li>
+     <li>&lt;<code>ftp://andre.example.org/%A</code>&gt;</li>
     
-     <li>&lt;<code>ftp://andre.example.org/%A?</code>></li>
+     <li>&lt;<code>ftp://andre.example.org/%A?</code>&gt;</li>
     
-     <li>&lt;<code>ftp://andre.example.org/%A#</code>></li>
+     <li>&lt;<code>ftp://andre.example.org/%A#</code>&gt;</li>
     
         </ul>
        
@@ -6873,7 +6873,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http:/foo/p\uD800</code>></li>
+     <li>&lt;<code>http:/foo/p\uD800</code>&gt;</li>
     
         </ul>
        
@@ -6891,7 +6891,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6917,15 +6917,15 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>ldap://-foo/c=GB?objectClass?one</code>></li>
+     <li>&lt;<code>ldap://-foo/c=GB?objectClass?one</code>&gt;</li>
     
-     <li>&lt;<code>http://foo.example.org-/</code>></li>
+     <li>&lt;<code>http://foo.example.org-/</code>&gt;</li>
     
-     <li>&lt;<code>http://foo.example.org--/</code>></li>
+     <li>&lt;<code>http://foo.example.org--/</code>&gt;</li>
     
-     <li>&lt;<code>http://--foo.example.org/</code>></li>
+     <li>&lt;<code>http://--foo.example.org/</code>&gt;</li>
     
-     <li>&lt;<code>http://-fo-o.example.org/</code>></li>
+     <li>&lt;<code>http://-fo-o.example.org/</code>&gt;</li>
     
         </ul>
        
@@ -6944,7 +6944,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -6962,7 +6962,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.1">section 3.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.1">section 3.1<a>
      </dt>
      <dd>
      
@@ -6986,7 +6986,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://foo.example\u0221.org/</code>></li>
+     <li>&lt;<code>http://foo.example\u0221.org/</code>&gt;</li>
     
         </ul>
        
@@ -7004,7 +7004,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.2">section 3.2.2<a>
      </dt>
      <dd>
      
@@ -7022,7 +7022,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.1">section 3.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-3.1">section 3.1<a>
      </dt>
      <dd>
      
@@ -7042,11 +7042,11 @@ URI producers should provide these registered names in the IDNA encoding, rather
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://--foo.example.org/</code>></li>
+     <li>&lt;<code>http://--foo.example.org/</code>&gt;</li>
     
-     <li>&lt;<code>http://xn--andr--ep-.example.org/</code>></li>
+     <li>&lt;<code>http://xn--andr--ep-.example.org/</code>&gt;</li>
     
-     <li>&lt;<code>http://xn.example.\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333
 \u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\
 u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u
 3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3
 333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u33
 33\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u333
 3\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333
 \u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\
 u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333/</code>></li>
+     <li>&lt;<code>http://xn.example.\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333
 \u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\
 u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u
 3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3
 333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u33
 33\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u333
 3\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333
 \u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\
 u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333\u3333/</code>&gt;</li>
     
         </ul>
        
@@ -7064,7 +7064,7 @@ URI producers should provide these registered names in the IDNA encoding, rather
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.1">section 3.2.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.1">section 3.2.1<a>
      </dt>
      <dd>
      
@@ -7075,7 +7075,7 @@ Use of the format "user:password" in the userinfo field is deprecated.
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.1">section 3.2.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2.1">section 3.2.1<a>
      </dt>
      <dd>
      
@@ -7100,7 +7100,7 @@ Applications may choose to ignore or reject such data when it is received as par
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://user:pass@example.org/</code>></li>
+     <li>&lt;<code>http://user:pass@example.org/</code>&gt;</li>
     
         </ul>
        
@@ -7123,7 +7123,7 @@ Applications may choose to ignore or reject such data when it is received as par
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-6.1">section 6.1</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-6.1">section 6.1<a>
      </dt>
      <dd>
      
@@ -7148,13 +7148,13 @@ strong visual look-alikes. Because of the likelihood of transcription errors, th
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/\u2000en-quad</code>></li>
+     <li>&lt;<code>http://example.org/\u2000en-quad</code>&gt;</li>
     
-     <li>&lt;<code>http://example.org/\u205Fmedium-mathematical-space</code>></li>
+     <li>&lt;<code>http://example.org/\u205Fmedium-mathematical-space</code>&gt;</li>
     
-     <li>&lt;<code>http://example\uFF95.org/</code>></li>
+     <li>&lt;<code>http://example\uFF95.org/</code>&gt;</li>
     
-     <li>&lt;<code>http://example\uFF47.org/</code>></li>
+     <li>&lt;<code>http://example\uFF47.org/</code>&gt;</li>
     
         </ul>
        
@@ -7174,7 +7174,7 @@ strong visual look-alikes. Because of the likelihood of transcription errors, th
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-4.2">section 4.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-4.2">section 4.2<a>
      </dt>
      <dd>
      
@@ -7254,7 +7254,7 @@ A component using right-to-left characters SHOULD start and end
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc2717.html#sec-">section </a>
+     <a href="http://www.apps.ietf.org/rfc/rfc2717.html#sec-">section <a>
      </dt>
      <dd>
      
@@ -7271,7 +7271,7 @@ A component using right-to-left characters SHOULD start and end
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2">section 3.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.2">section 3.2<a>
      </dt>
      <dd>
      
@@ -7285,14 +7285,14 @@ A component using right-to-left characters SHOULD start and end
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.3">section 3.3</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3986.html#sec-3.3">section 3.3<a>
      </dt>
      <dd>
      
         The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:
 
      <pre>
-      &lt;prefix>'-'&lt;tree-specific identifier>
+      &lt;prefix&gt;'-'&lt;tree-specific identifier&gt;
 </pre>
     
 For instance, the "foo" tree would allow creation of scheme names of the form: "foo-blahblah:" and "foo-bar:", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix. 
@@ -7311,7 +7311,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>foo://example.org/bar</code>></li>
+     <li>&lt;<code>foo://example.org/bar</code>&gt;</li>
     
         </ul>
        
@@ -7339,14 +7339,14 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc2717.html#sec-3.3">section 3.3</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc2717.html#sec-3.3">section 3.3<a>
      </dt>
      <dd>
      
         The syntax for alternative trees shall be as follows: each tree will be identified by a unique prefix, which must be established in the same fashion as a URL scheme name in the IETF tree, except that the prefix must be defined by a Standards Track document. Scheme names in the new tree are then constructed by prepending the prefix to an identifier unique to each scheme in that tree, as prescribed by that tree's identifying document:
 
      <pre>
-      &lt;prefix>'-'&lt;tree-specific identifier>
+      &lt;prefix&gt;'-'&lt;tree-specific identifier&gt;
 </pre>
     
 For instance, the "foo" tree would allow creation of scheme names of the form: "foo-blahblah:" and "foo-bar:", where the tree prescribes an arbitrary USASCII string following the tree's unique prefix. 
@@ -7365,7 +7365,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>foo-bar://example.org/bar</code>></li>
+     <li>&lt;<code>foo-bar://example.org/bar</code>&gt;</li>
     
         </ul>
        
@@ -7383,7 +7383,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-5.3.2.2">section 5.3.2.2</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-5.3.2.2">section 5.3.2.2<a>
      </dt>
      <dd>
      
@@ -7406,7 +7406,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/#Andre\u0301</code>></li>
+     <li>&lt;<code>http://example.org/#Andre\u0301</code>&gt;</li>
     
         </ul>
        
@@ -7426,7 +7426,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
      <dt>
      
        see
-     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-7.5">section 7.5</a>
+     <a href="http://www.apps.ietf.org/rfc/rfc3987.html#sec-7.5">section 7.5<a>
      </dt>
      <dd>
      
@@ -7450,7 +7450,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
         <p>The following are examples of IRIs that have this violation:</p>
         <ul>
        
-     <li>&lt;<code>http://example.org/#Andre\u0301</code>></li>
+     <li>&lt;<code>http://example.org/#Andre\u0301</code>&gt;</li>
     
         </ul>
        
@@ -7505,6 +7505,7 @@ For instance, the "foo" tree would allow creation of scheme names of the form: "
         
     
 /**The character code is not assigned in the version of Unicode implemented here.
+      Check validity of code, consider updating your copy of icu4j.jar.
       
           <p>This violates the following specifications:
           <a href="#ref-Unicode">[Unicode]</a>, <a href="#ref-IRI">[IRI]</a>.

http://git-wip-us.apache.org/repos/asf/jena/blob/7e2879c2/jena-iri/src/main/java/org/apache/jena/iri/impl/BuildViolationCodes.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/BuildViolationCodes.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/BuildViolationCodes.java
index 27999bf..9deca5a 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/BuildViolationCodes.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/BuildViolationCodes.java
@@ -29,6 +29,7 @@ import javax.xml.transform.stream.StreamSource;
 
 public class BuildViolationCodes {
     public static void main(String[] args) throws TransformerException, TransformerFactoryConfigurationError {
+        System.out.println();
         Transformer xsl =
         TransformerFactory.newInstance().newTransformer(
                 new StreamSource(new File("src/main/xml/org/apache/jena/iri/impl/viol2java.xsl"))
@@ -38,5 +39,6 @@ public class BuildViolationCodes {
                 new StreamResult(new File("src/main/java/org/apache/jena/iri/ViolationCodes.java"))
                         
         );
+        System.out.println("Finished BuildViolationCodes");
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/7e2879c2/jena-iri/src/main/xml/org/apache/jena/iri/impl/viol2java.xsl
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/xml/org/apache/jena/iri/impl/viol2java.xsl b/jena-iri/src/main/xml/org/apache/jena/iri/impl/viol2java.xsl
index e60394e0..d2e6041 100644
--- a/jena-iri/src/main/xml/org/apache/jena/iri/impl/viol2java.xsl
+++ b/jena-iri/src/main/xml/org/apache/jena/iri/impl/viol2java.xsl
@@ -348,12 +348,12 @@ This class is not part of the API.
     
     <!--
     <xsl:template match="bad|good[not(unicode)]" mode="javadoc">
-     &lt;li>&amp;lt;&lt;code><xsl:value-of select="."/>&lt;/code>>&lt;/li>
+     &lt;li>&amp;lt;&lt;code><xsl:value-of select="."/>&lt;/code>&amp;gt;&lt;/li>
     </xsl:template>
     -->
     
     <xsl:template match="bad|good" mode="javadoc">
-     &lt;li>&amp;lt;&lt;code><xsl:apply-templates select="node()" mode="javadoc"/>&lt;/code>>&lt;/li>
+     &lt;li>&amp;lt;&lt;code><xsl:apply-templates select="node()" mode="javadoc"/>&lt;/code>&amp;gt;&lt;/li>
     </xsl:template>
     
     <xsl:template match="unicode" mode="javadoc">


[7/8] jena git commit: JENA-1546: Javadoc fixes (tdb2, fuseki-core, text)

Posted by an...@apache.org.
JENA-1546: Javadoc fixes (tdb2, fuseki-core, text)


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4977356b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4977356b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4977356b

Branch: refs/heads/master
Commit: 4977356b1ea9435b1f35cb59ea882a2e10e973c9
Parents: f6c61a0
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 10 15:11:26 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 10 16:12:42 2018 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java | 4 ++--
 .../src/main/java/org/apache/jena/fuseki/package-info.java       | 2 +-
 .../jena/query/text/assembler/GenericAnalyzerAssembler.java      | 2 +-
 .../apache/jena/query/text/assembler/GenericFilterAssembler.java | 4 +++-
 .../jena/query/text/assembler/GenericTokenizerAssembler.java     | 4 +++-
 .../main/java/org/apache/jena/query/text/assembler/Params.java   | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java
index 0793f16..099a840 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/setup/StoreParamsDynamic.java
@@ -39,11 +39,11 @@ public interface StoreParamsDynamic {
     public Integer getBlockWriteCacheSize() ;
     public boolean isSetBlockWriteCacheSize() ;
     
-    /** Node cache for Node->NodeId. */
+    /** Node cache for Node{@literal ->}NodeId. */
     public Integer getNode2NodeIdCacheSize() ;
     public boolean isSetNode2NodeIdCacheSize() ;
     
-    /** Node cache for NodeId->Node. Important for SPARQL results. */
+    /** Node cache for NodeId{@literal ->}Node. Important for SPARQL results. */
     public Integer getNodeId2NodeCacheSize() ;
     public boolean isSetNodeId2NodeCacheSize() ;
 

http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
index d058671..70bda0e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
@@ -52,7 +52,7 @@
  * <ul>
  * <li><em>ContentTypeToOperation</em>:: Map&lt;content-type, Operation&gt;</li>
  * <li><em>ContentTypeToOperation</em>:: Map&lt;String, Operation&gt;</li>
- * <li><em>Dispatch</em> :: Map<Operation, ActionService</li> 
+ * <li><em>Dispatch</em> :: {@literal Map<Operation, ActionService>}</li> 
  * </ul>
  * <p>
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericAnalyzerAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericAnalyzerAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericAnalyzerAssembler.java
index 3cf2004..ecba746 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericAnalyzerAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericAnalyzerAssembler.java
@@ -53,7 +53,7 @@ import org.apache.lucene.analysis.Analyzer;
  * For example, <code>org.apache.lucene.analysis.ja.JapaneseAnalyzer</code>
  * has a constructor with 4 parameters: a <code>UserDict</code>,
  * a <code>CharArraySet</code>, a <code>JapaneseTokenizer.Mode</code>, and a 
- * <code>Set&lt;String></code>. So a simple wrapper can extract the values
+ * <code>Set&lt;String&gt;</code>. So a simple wrapper can extract the values
  * needed for the various parameters with types not available in this
  * extension, construct the required instances, and instantiate the
  * <code>JapaneseAnalyzer</code>.

http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericFilterAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericFilterAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericFilterAssembler.java
index 245f3f9..fdd6b92 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericFilterAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericFilterAssembler.java
@@ -54,7 +54,7 @@ import org.apache.lucene.analysis.TokenStream;
  * For example, <code>org.apache.lucene.analysis.ja.JapaneseAnalyzer</code>
  * has a constructor with 4 parameters: a <code>UserDict</code>,
  * a <code>CharArraySet</code>, a <code>JapaneseTokenizer.Mode</code>, and a 
- * <code>Set&lt;String></code>. So a simple wrapper can extract the values
+ * <code>Set&lt;String&gt;</code>. So a simple wrapper can extract the values
  * needed for the various parameters with types not available in this
  * extension, construct the required instances, and instantiate the
  * <code>JapaneseAnalyzer</code>.
@@ -84,6 +84,7 @@ import org.apache.lucene.analysis.TokenStream;
  * <p>
  * Examples:
  * <pre>
+ * {@code
     <#indexLucene> a text:TextIndexLucene ;
         text:directory <file:Lucene> ;
         text:entityMap <#entMap> ;
@@ -104,6 +105,7 @@ import org.apache.lucene.analysis.TokenStream;
               ]
             ]
         )
+   }
  * </pre>
  */
 public class GenericFilterAssembler extends AssemblerBase {

http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericTokenizerAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericTokenizerAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericTokenizerAssembler.java
index 2e2b39b..8f224b5 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericTokenizerAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/GenericTokenizerAssembler.java
@@ -52,7 +52,7 @@ import org.apache.lucene.analysis.Tokenizer;
  * For example, <code>org.apache.lucene.analysis.ja.JapaneseAnalyzer</code>
  * has a constructor with 4 parameters: a <code>UserDict</code>,
  * a <code>CharArraySet</code>, a <code>JapaneseTokenizer.Mode</code>, and a 
- * <code>Set&lt;String></code>. So a simple wrapper can extract the values
+ * <code>Set&lt;String&gt;</code>. So a simple wrapper can extract the values
  * needed for the various parameters with types not available in this
  * extension, construct the required instances, and instantiate the
  * <code>JapaneseAnalyzer</code>.
@@ -82,6 +82,7 @@ import org.apache.lucene.analysis.Tokenizer;
  * <p>
  * Examples:
  * <pre>
+ * {@code
     <#indexLucene> a text:TextIndexLucene ;
         text:directory <file:Lucene> ;
         text:entityMap <#entMap> ;
@@ -105,6 +106,7 @@ import org.apache.lucene.analysis.Tokenizer;
               ]
             ]
         )
+   }
  * </pre>
  */
 public class GenericTokenizerAssembler extends AssemblerBase {

http://git-wip-us.apache.org/repos/asf/jena/blob/4977356b/jena-text/src/main/java/org/apache/jena/query/text/assembler/Params.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/Params.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/Params.java
index b1a3f33..f5e5f42 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/Params.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/Params.java
@@ -57,7 +57,7 @@ import org.apache.lucene.analysis.CharArraySet;
  * For example, <code>org.apache.lucene.analysis.ja.JapaneseAnalyzer</code>
  * has a constructor with 4 parameters: a <code>UserDict</code>,
  * a <code>CharArraySet</code>, a <code>JapaneseTokenizer.Mode</code>, and a 
- * <code>Set&lt;String></code>. So a simple wrapper can extract the values
+ * <code>Set&lt;String&gt;</code>. So a simple wrapper can extract the values
  * needed for the various parameters with types not available in this
  * extension, construct the required instances, and instantiate the
  * <code>JapaneseAnalyzer</code>.


[8/8] jena git commit: JENA-1546: Merge commit 'refs/pull/419/head' of https://github.com/apache/jena

Posted by an...@apache.org.
JENA-1546: Merge commit 'refs/pull/419/head' of https://github.com/apache/jena

This closes #419.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0e18451f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0e18451f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0e18451f

Branch: refs/heads/master
Commit: 0e18451febbc6569465cfedc0ac84bb2ddda6002
Parents: 379c4c6 4977356
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 10 16:13:40 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 10 16:13:40 2018 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/atlas/json/JSON.java   |   2 +-
 .../org/apache/jena/atlas/json/JsonBuilder.java |   2 +-
 .../main/java/org/apache/jena/query/ARQ.java    |  10 +-
 .../org/apache/jena/query/QuerySolutionMap.java |   2 +-
 .../org/apache/jena/riot/RDFParserBuilder.java  |   4 +-
 .../java/org/apache/jena/riot/WebContent.java   |   2 +-
 .../jena/riot/lang/BlankNodeAllocatorHash.java  |   2 +-
 .../apache/jena/riot/system/IRIResolver.java    |   2 +-
 .../org/apache/jena/riot/system/RiotLib.java    |   2 +-
 .../java/org/apache/jena/sparql/SystemARQ.java  |   4 +-
 .../jena/sparql/algebra/optimize/Optimize.java  |   4 +-
 .../optimize/TransformFilterConjunction.java    |   2 +-
 .../algebra/optimize/TransformMergeBGPs.java    |   4 +-
 .../algebra/optimize/TransformPathFlattern.java |   2 +-
 .../optimize/TransformPromoteTableEmpty.java    |  18 +-
 .../apache/jena/sparql/core/Transactional.java  |   4 +-
 .../jena/sparql/core/TxnDataset2Graph.java      |   4 +-
 .../jena/sparql/engine/http/HttpQuery.java      |   4 +-
 .../apache/jena/sparql/engine/http/Service.java |   6 +-
 .../java/org/apache/jena/sparql/expr/Expr.java  |   4 +-
 .../org/apache/jena/sparql/expr/ExprList.java   |   2 +-
 .../org/apache/jena/sparql/expr/NodeValue.java  |   2 +-
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java   |  16 +-
 .../sparql/function/library/FN_DateTime.java    |   2 +-
 .../sparql/function/library/FN_StrLength.java   |   2 +-
 .../function/library/FN_StrSubstring.java       |   2 +-
 .../jena/sparql/function/library/date.java      |   2 +-
 .../jena/sparql/graph/NodeTransformLib.java     |  12 +-
 .../apache/jena/sparql/lib/RDFTerm2Json.java    |   2 +-
 .../jena/sparql/sse/lang/ParseHandlerForm.java  |  14 +-
 .../sparql/sse/lang/ParseHandlerResolver.java   |   9 +-
 .../main/java/org/apache/jena/web/HttpSC.java   |   2 +-
 .../org/apache/jena/atlas/io/OutStreamUTF8.java |   2 +-
 .../org/apache/jena/atlas/iterator/Iter.java    |   4 +-
 .../java/org/apache/jena/atlas/lib/Bytes.java   |   4 +-
 .../apache/jena/atlas/lib/RefCountingMap.java   |   2 +-
 .../apache/jena/atlas/lib/tuple/TupleMap.java   |  26 +-
 jena-cmds/src/main/java/jena/rdfcat.java        |   2 +-
 .../java/org/apache/jena/enhanced/EnhNode.java  |   2 +-
 .../apache/jena/ext/xerces/impl/Constants.java  |   2 +-
 .../ext/xerces/impl/dv/DatatypeException.java   |   2 +-
 .../impl/xpath/regex/RegularExpression.java     |  32 +-
 .../org/apache/jena/ext/xerces/util/URI.java    |   2 +-
 .../java/org/apache/jena/ontology/OntTools.java |   2 +-
 .../apache/jena/rdf/model/impl/RDFListImpl.java |   2 +-
 .../apache/jena/rdf/model/impl/ReifierStd.java  |   2 +-
 .../org/apache/jena/rdf/model/impl/Util.java    |   4 +-
 .../jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java  |   2 +-
 .../AbsWantLiteralValueOrDescription.java       |   2 +-
 .../rdfxml/xmlinput/states/AbsXMLLiteral.java   |   6 +-
 .../jena/reasoner/rulesys/FBRuleReasoner.java   |   1 -
 .../jena/reasoner/rulesys/OWLMicroReasoner.java |   2 +-
 .../rulesys/OWLMicroReasonerFactory.java        |   2 +-
 .../jena/reasoner/rulesys/OWLMiniReasoner.java  |   2 +-
 .../rulesys/OWLMiniReasonerFactory.java         |   2 +-
 .../org/apache/jena/reasoner/rulesys/Rule.java  |   6 +-
 .../org/apache/jena/shared/PrefixMapping.java   |   4 +-
 .../java/org/apache/jena/util/OneToManyMap.java |   2 +-
 .../org/apache/jena/util/ResourceUtils.java     |   2 +-
 .../org/apache/jena/vocabulary/RDFTest.java     |   2 +-
 .../apache/jena/dboe/base/record/Record.java    |   8 +-
 .../jena/dboe/transaction/TransInteger.java     |   1 -
 .../dboe/transaction/TransactionalInteger.java  |   2 +-
 .../jena/tdb2/setup/StoreParamsDynamic.java     |   4 +-
 .../org/apache/jena/tdb2/solver/SolverLib.java  |   2 +-
 .../apache/jena/tdb2/store/NodeIdInline.java    |   2 +-
 .../jena/tdb2/store/nodetable/NodeTable.java    |   2 +-
 .../jena/fuseki/build/RefCountingMap.java       |   2 +-
 .../org/apache/jena/fuseki/package-info.java    |   4 +-
 .../apache/jena/fuseki/server/RequestLog.java   |   2 +-
 .../org/apache/jena/iri/ViolationCodes.java     | 511 ++++++++++---------
 .../jena/iri/impl/BuildViolationCodes.java      |   2 +
 .../xml/org/apache/jena/iri/impl/viol2java.xsl  |   4 +-
 .../xml/org/apache/jena/iri/impl/violations.xml |  52 +-
 .../jena/sdb/layout2/index/IndexCache.java      |   2 +-
 .../org/apache/jena/sdb/store/StoreMaker.java   |   2 +-
 jena-tdb/pom.xml                                |   1 -
 .../org/apache/jena/tdb/base/record/Record.java |   8 +-
 .../jena/tdb/setup/StoreParamsDynamic.java      |   4 +-
 .../org/apache/jena/tdb/solver/SolverLib.java   |   4 +-
 .../assembler/GenericAnalyzerAssembler.java     |   2 +-
 .../text/assembler/GenericFilterAssembler.java  |   4 +-
 .../assembler/GenericTokenizerAssembler.java    |   4 +-
 .../jena/query/text/assembler/Params.java       |   2 +-
 pom.xml                                         |  17 +-
 85 files changed, 456 insertions(+), 468 deletions(-)
----------------------------------------------------------------------



[4/8] jena git commit: JENA-1546: Javadoc fixes (jena-arq)

Posted by an...@apache.org.
JENA-1546: Javadoc fixes (jena-arq)


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d8667f6f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d8667f6f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d8667f6f

Branch: refs/heads/master
Commit: d8667f6f3b08ba9c6c819d9486e5d7cd89d556ba
Parents: f754a31
Author: Andy Seaborne <an...@apache.org>
Authored: Thu May 10 14:25:58 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu May 10 14:25:58 2018 +0100

----------------------------------------------------------------------
 .../algebra/optimize/TransformFilterConjunction.java  |  2 +-
 .../sparql/algebra/optimize/TransformMergeBGPs.java   |  4 ++--
 .../algebra/optimize/TransformPathFlattern.java       |  2 +-
 .../org/apache/jena/sparql/core/Transactional.java    |  4 ++--
 .../org/apache/jena/sparql/engine/http/Service.java   |  6 ++----
 .../jena/sparql/function/library/FN_DateTime.java     |  2 +-
 .../jena/sparql/function/library/FN_StrLength.java    |  2 +-
 .../jena/sparql/function/library/FN_StrSubstring.java |  2 +-
 .../org/apache/jena/sparql/function/library/date.java |  2 +-
 .../apache/jena/sparql/sse/lang/ParseHandlerForm.java | 14 ++------------
 .../jena/sparql/sse/lang/ParseHandlerResolver.java    |  9 +++++----
 .../src/main/java/org/apache/jena/web/HttpSC.java     |  2 +-
 12 files changed, 20 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterConjunction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterConjunction.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterConjunction.java
index b5557c8..3e73585 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterConjunction.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterConjunction.java
@@ -32,7 +32,7 @@ import org.apache.jena.sparql.expr.ExprList ;
  * hence the statics for the real work. 
  */
 
-/** Redo FILTER (A&&B) as FILTER(A) FILTER(B) (as an expr list).
+/** Redo {@literal FILTER (A&&B)} as FILTER(A) FILTER(B) (as an expr list).
  *    via multiple elements of the exprList of the OpFilter.
  *    This allows them to be placed independently.
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformMergeBGPs.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformMergeBGPs.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformMergeBGPs.java
index 312f2c3..289bfba 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformMergeBGPs.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformMergeBGPs.java
@@ -29,8 +29,8 @@ import org.apache.jena.sparql.core.BasicPattern ;
 
 /** Merge BGPs 
  * 
- * <li>(join BGP1 BGP2) => BGP
- * <li>(sequence ...BGP1 BGP2 ...) => (sequence ...BGP ...)
+ * <li>(join BGP1 BGP2) {@literal =>} BGP
+ * <li>(sequence ...BGP1 BGP2 ...) {@literal =>} (sequence ...BGP ...)
  */
 public class TransformMergeBGPs extends TransformCopy {
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPathFlattern.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPathFlattern.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPathFlattern.java
index db768bd..6915233 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPathFlattern.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPathFlattern.java
@@ -31,7 +31,7 @@ import org.apache.jena.sparql.path.PathLib ;
  * exact transformation as per spec as there are better ways to do it for ARQ.
  * For example, 
  * <ul>
- * <li>Path seq -> BGPs or a (sequence)
+ * <li>Path seq {@literal ->} BGPs or a (sequence)
  * <li>"|" is not expanded into a union.
  * </ul>
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
index 899f503..d87460a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Transactional.java
@@ -32,8 +32,8 @@ import org.apache.jena.system.Txn;
  * <p>{@code end()} is optional but preferred.
  * <p>
  * Helper code is available {@link Txn} so, for example:
- * <pre>Txn.executeRead(dataset, ()-> { ... sparql query ... });</pre> 
- * <pre>Txn.executeWrite(dataset, ()-> { ... sparql update ... });</pre>
+ * <pre>Txn.executeRead(dataset, {@literal ()->} { ... sparql query ... });</pre> 
+ * <pre>Txn.executeWrite(dataset, {@literal ()->} { ... sparql update ... });</pre>
  * or use one of <tt>Txn.calculateRead</tt> and <tt>Txn.executeWrite</tt>
  * to return a value for the transaction block.
  * <p>

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
index ae3f153..6dc9f38 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
@@ -61,12 +61,10 @@ public class Service {
 
     /**
      * Use this Symbol to allow passing additional service context variables
-     * SERVICE <IRI> call. Parameters need to be grouped by SERVICE <IRI>, a
-     * Map<String, Context> is assumed. The key of the first map is the SERVICE
+     * {@literal SERVICE <IRI>} call. Parameters need to be grouped by {@literal SERVICE <IRI>}, a
+     * {@literal Map<String, Context>} is assumed. The key of the first map is the SERVICE
      * IRI, the value is a Context who's values will override any defaults in
      * the original context.
-     * 
-     * @see org.apache.jena.sparql.engine.http.Service
      */
     public static final Symbol serviceContext = SystemARQ.allocSymbol(base, "serviceContext");
 

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_DateTime.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_DateTime.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_DateTime.java
index f13f149..91e7b92 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_DateTime.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_DateTime.java
@@ -22,7 +22,7 @@ import org.apache.jena.sparql.expr.NodeValue;
 import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp;
 import org.apache.jena.sparql.function.FunctionBase2;
 
-/** fn:dateTime(xsd:date, xsd:time) -> xsd:dateTime */
+/** fn:dateTime(xsd:date, xsd:time) {@literal ->} xsd:dateTime */
 public class FN_DateTime extends FunctionBase2 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrLength.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrLength.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrLength.java
index 29a4e75fe..080269c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrLength.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrLength.java
@@ -22,7 +22,7 @@ import org.apache.jena.sparql.expr.NodeValue ;
 import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp ;
 import org.apache.jena.sparql.function.FunctionBase1 ;
 
-/** string length - F&O operation */
+/** string length - {@literal F&O} operation */
 
 public class FN_StrLength extends FunctionBase1
 {

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
index ba21190..e965d13 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
@@ -28,7 +28,7 @@ import org.apache.jena.sparql.expr.NodeValue ;
 import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp ;
 import org.apache.jena.sparql.function.FunctionBase ;
 
-/** substring(string, start[, length]) - F&O style*/
+/** substring(string, start[, length]) - {@literal F&O} style*/
 
 public class FN_StrSubstring extends FunctionBase
 {

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/function/library/date.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/date.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/date.java
index d967e6c..34df515 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/date.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/date.java
@@ -24,7 +24,7 @@ import org.apache.jena.sparql.expr.ExprEvalException ;
 import org.apache.jena.sparql.expr.NodeValue ;
 import org.apache.jena.sparql.function.FunctionBase1 ;
 
-/** date(expression) => XSD dateTime 
+/** date(expression) {@literal =>} XSD dateTime 
  *  Attempt to convert an expression to an XSD dateTime.
  *  Supported conversions: Date as yyyy-mm-dd
  */ 

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerForm.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerForm.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerForm.java
index af6f590..ea1039e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerForm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerForm.java
@@ -24,19 +24,9 @@ import java.util.Deque ;
 import org.apache.jena.sparql.sse.Item ;
 import org.apache.jena.sparql.sse.ItemList ;
 
-/** Resolve syntactic forms like (base ...) and (prefix...)
+/** Habdle forms like (base ...) and (prefix...)
  *  where the syntax modifies the enclosed sub term.
- *  
- *  
- *  Forms:
- *    (FORM DECL... TERM) => where TERM is the result.
- *  Examples 
- *    (prefix (PREFIXES) TERM) => TERM with prefix names expanded
- *    (base IRI TERM) => TERM with IRIs resolved to absolute IRIs
- *  
- *  The DECL part can not itself have nested, independent forms
- *  unless a subclass (carefully) manages that. */
-
+ */
 public abstract class ParseHandlerForm extends ParseHandlerPlain 
 {
     // generally: (FORM DECL* TERM?)

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerResolver.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerResolver.java
index 5250a0e..08446c2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerResolver.java
@@ -34,13 +34,14 @@ import org.apache.jena.sparql.sse.builders.BuilderPrefixMapping ;
  *  
  *  
  *  Forms:
- *    (FORM DECL... TERM) => where TERM is the result.
+ *    (FORM DECL... TERM) {@literal =>} where TERM is the result.
  *  Examples 
- *    (prefix (PREFIXES) TERM) => TERM with prefix names expanded
- *    (base IRI TERM) => TERM with IRIs resolved to absolute IRIs
+ *    (prefix (PREFIXES) TERM) {@literal =>} TERM with prefix names expanded
+ *    (base IRI TERM) {@literal =>} TERM with IRIs resolved to absolute IRIs
  *  
  *  The DECL part can not itself have nested, independent forms
- *  unless a subclass (carefully) manages that. */
+ *  unless a subclass (carefully) manages that.
+ */
 
 public class ParseHandlerResolver extends ParseHandlerForm
 {

http://git-wip-us.apache.org/repos/asf/jena/blob/d8667f6f/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java b/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
index dfa1a95..025c7bc 100644
--- a/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
+++ b/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
@@ -467,7 +467,7 @@ package org.apache.jena.web;
  * <td>&nbsp;</td>
  * <td><strike>418</strike></td>
  * <td><strike>Unprocessable Entity</strike></td>
- * <td>&nbsp;<direct/td>
+ * <td>&nbsp;</td>
  * <td>&nbsp;</td>
  * <td>
  * <a href=