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 2014/12/28 13:10:33 UTC

jena git commit: Make use of @link/@linkplain more consistent

Repository: jena
Updated Branches:
  refs/heads/master 6c4eecd84 -> 7e5abeed5


Make use of @link/@linkplain more consistent


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

Branch: refs/heads/master
Commit: 7e5abeed5eac39b32397d9d8f05c6a84be3d516a
Parents: 6c4eecd
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 28 12:10:15 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 28 12:10:15 2014 +0000

----------------------------------------------------------------------
 .../main/java/com/hp/hpl/jena/query/ARQ.java    |  2 +-
 .../com/hp/hpl/jena/query/QueryExecution.java   |  4 +-
 .../hpl/jena/sparql/algebra/op/OpQuadBlock.java |  2 +-
 .../jena/sparql/algebra/op/OpQuadPattern.java   |  2 +-
 .../jena/sparql/core/DatasetChangesCapture.java |  2 +-
 .../jena/sparql/core/DatasetGraphMonitor.java   |  2 +-
 .../sparql/core/DatasetGraphViewGraphs.java     |  4 +-
 .../com/hp/hpl/jena/sparql/core/QuadAction.java |  2 +-
 .../engine/binding/BindingProjectBase.java      |  2 +-
 .../com/hp/hpl/jena/sparql/lib/DatasetLib.java  |  6 +--
 .../hp/hpl/jena/sparql/modify/UpdateEngine.java |  2 +-
 .../hp/hpl/jena/sparql/modify/UpdateSink.java   |  2 +-
 .../jena/sparql/resultset/ResultSetCompare.java |  4 +-
 .../org/apache/jena/atlas/iterator/Iter.java    | 10 ++---
 .../jena/atlas/iterator/IteratorCons.java       |  2 +-
 .../org/apache/jena/atlas/lib/AlarmClock.java   |  2 +-
 .../java/org/apache/jena/atlas/lib/Tuple.java   |  2 +-
 .../apache/jena/atlas/lib/cache/CacheLRU.java   |  2 +-
 .../main/java/org/apache/jena/riot/Lang.java    |  6 +--
 .../java/org/apache/jena/riot/RDFDataMgr.java   |  4 +-
 .../java/org/apache/jena/riot/RDFFormat.java    |  2 +-
 .../java/org/apache/jena/riot/RDFLanguages.java |  6 +--
 .../java/org/apache/jena/riot/ResultSetMgr.java | 14 +++----
 .../java/org/apache/jena/riot/RiotReader.java   |  6 +--
 .../java/org/apache/jena/riot/RiotWriter.java   | 30 ++++++-------
 .../jena/riot/lang/BlankNodeAllocator.java      |  4 +-
 .../jena/riot/lang/BlankNodeAllocatorLabel.java |  2 +-
 .../lang/BlankNodeAllocatorLabelEncoded.java    |  2 +-
 .../jena/riot/resultset/ResultSetReader.java    |  8 ++--
 .../riot/resultset/ResultSetReaderRegistry.java |  4 +-
 .../jena/riot/resultset/ResultSetWriter.java    |  2 +-
 .../riot/resultset/ResultSetWriterRegistry.java |  4 +-
 .../jena/riot/system/PrefixMapFactory.java      |  2 +-
 .../jena/riot/system/StreamRDFWriter.java       |  6 +--
 .../jena/riot/system/stream/LocatorFile.java    |  2 +-
 .../jena/riot/system/stream/StreamManager.java  |  4 +-
 .../org/apache/jena/riot/thrift/BinRDF.java     | 44 ++++++++++----------
 .../jena/riot/thrift/StreamRDF2Thrift.java      |  2 +-
 .../java/org/apache/jena/riot/thrift/TRDF.java  |  8 ++--
 .../apache/jena/riot/thrift/ThriftConvert.java  |  2 +-
 .../java/org/apache/jena/riot/web/HttpOp.java   |  2 +-
 .../jena/riot/writer/WriterStreamRDFPlain.java  |  4 +-
 .../org/apache/jena/riot/writer/WriterTriX.java |  2 +-
 .../jena/graph/impl/LiteralLabelFactory.java    |  4 +-
 .../java/com/hp/hpl/jena/ontology/OntModel.java |  8 ++--
 .../rdf/model/EmptyListUpdateException.java     |  2 +-
 .../jena/util/iterator/IteratorIterator.java    |  2 +-
 .../fuseki/server/ShiroEnvironmentLoader.java   |  4 +-
 .../apache/jena/fuseki/servlets/HttpAction.java |  2 +-
 .../fuseki/validation/ValidationAction.java     |  2 +-
 .../hp/hpl/jena/tdb/base/file/BlockAccess.java  |  2 +-
 .../com/hp/hpl/jena/tdb/base/file/Location.java |  2 +-
 .../java/com/hp/hpl/jena/tdb/setup/Build.java   |  2 +-
 .../hpl/jena/tdb/setup/DatasetBuilderStd.java   |  4 +-
 .../hpl/jena/tdb/setup/StoreParamsBuilder.java  |  2 +-
 .../hp/hpl/jena/tdb/setup/StoreParamsCodec.java |  2 +-
 56 files changed, 132 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java b/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
index 68753ad..79aab38 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
@@ -306,7 +306,7 @@ public class ARQ
      *  Context key controlling whether the main query engine moves filters to the "best" place using 
      *  the more limited and conservative strategy which does not place as many filters
      *  Must be explicitly set "true" to operate.
-     *  Filter placement, via {@linkplain #optFilterPlacement} must also be active (which it is by default).
+     *  Filter placement, via {@link #optFilterPlacement} must also be active (which it is by default).
      * @see #optFilterPlacement
      */ 
     public static final Symbol optFilterPlacementConservative = ARQConstants.allocSymbol("optFilterPlacementConservative") ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java b/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
index 166490b..dd58475 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
@@ -143,9 +143,9 @@ public interface QueryExecution extends AutoCloseable
 	public void abort();
 	
     /** Close the query execution and stop query evaluation as soon as convenient.
-     *  QueryExecution objects, and a {@linkplain ResultSet} from {@linkplain #execSelect},
+     *  QueryExecution objects, and a {@link ResultSet} from {@link #execSelect},
      *  can not be used once the QueryExecution is closed.  
-     *  Model results from {@linkplain #execConstruct} and {@linkplain #execDescribe}
+     *  Model results from {@link #execConstruct} and {@link #execDescribe}
      *  are stil valid.
      *  It is important to close query execution objects in order to release
      *  resources such as working memory and to stop the query execution.

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java
index 451160d..db43dab 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.util.NodeIsomorphismMap ;
 /** A list of quads. 
  * 
  * <code>OpQuadBlock</code> is anny colelction of quads, whereas
- * {@linkplain OpQuadPattern} is quads with the same graph node.  
+ * {@link OpQuadPattern} is quads with the same graph node.  
  * The flip in naming is historical. 
  */
 public class OpQuadBlock extends Op0

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java
index b30a2fa..353c70c 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sparql.util.NodeIsomorphismMap ;
 
 /** The main Op used in converting SPARQL algebra to quad form.
  * OpQuadPattern reflects the fact that quads come in per-GRAPH units. 
- * {@linkplain OpQuadBlock} is for a general containers of quads
+ * {@link OpQuadBlock} is for a general containers of quads
  * without any contract on the quads sharing the same garph node.   
  */
 public class OpQuadPattern extends Op0

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java
index a471e1f..e76999a 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java
@@ -47,7 +47,7 @@ public class DatasetChangesCapture implements DatasetChanges
     { this(true, true, false, false) ; }
 
     /** Capture quad actions, either including or excluding the "no ops"
-     * @param recordNoOps   Whether to record {@linkplain QuadAction#NO_ADD} and {@linkplain QuadAction#NO_DELETE}  
+     * @param recordNoOps   Whether to record {@link QuadAction#NO_ADD} and {@link QuadAction#NO_DELETE}  
      */
     public DatasetChangesCapture(boolean recordNoOps)
     { this(true, true, recordNoOps, recordNoOps) ; }

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java
index 34dcaf7..3d91835 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 
 /** Connect a DatasetGraph to a DatasetChanges monitor.
  *  Any add or delete to the DatasetGraph is notified to the
- *  monitoring object with a {@linkplain QuadAction} to indicate
+ *  monitoring object with a {@link QuadAction} to indicate
  *  the change made.   
  */
 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphViewGraphs.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphViewGraphs.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphViewGraphs.java
index afc0468..58fecab 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphViewGraphs.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphViewGraphs.java
@@ -22,8 +22,8 @@ import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 
 /** Wrap a DatasetGraph with implementations of
- * {@linkplain DatasetGraph#getDefaultGraph} and
- * {@linkplain DatasetGraph#getGraph}
+ * {@link DatasetGraph#getDefaultGraph} and
+ * {@link DatasetGraph#getGraph}
  * that use the view graph mechanism.
  * 
  * @see GraphView

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadAction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadAction.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadAction.java
index ea37e4a..a4c926b 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadAction.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadAction.java
@@ -28,7 +28,7 @@ package com.hp.hpl.jena.sparql.core;
  * <p>
  * A {@code QuadAction} can be an {@code ADD} or {@code DELETE}, indicating a change
  * to the {@code DatasetGraph} actually occured (this assumes checking is done - 
- * {@linkplain DatasetChanges} generators may not check - see implementation for details).
+ * {@link DatasetChanges} generators may not check - see implementation for details).
  * Otherwise a {@code NO_ADD}, {@code NO_DELETE} {@code QuadAction} is used.
  */ 
 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingProjectBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingProjectBase.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingProjectBase.java
index 58fa861..30d49f1 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingProjectBase.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingProjectBase.java
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.sparql.core.Var ;
 
 /** Common framework for projection; 
  * the projection policy is provided by
- * abstract method {@linkplain #accept(Var)} 
+ * abstract method {@link #accept(Var)} 
  */
 public abstract class BindingProjectBase extends BindingBase {
     private List<Var>     actualVars = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lib/DatasetLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lib/DatasetLib.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lib/DatasetLib.java
index 37c86a8..4f0b679 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lib/DatasetLib.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lib/DatasetLib.java
@@ -39,7 +39,7 @@ public class DatasetLib
     
     /**
      * Return true if the datasets are isomorphic - same names for graphs, graphs isomorphic.
-     * @deprecated Use {@linkplain IsoMatcher#isomorphic(DatasetGraph, DatasetGraph)}
+     * @deprecated Use {@link IsoMatcher#isomorphic(DatasetGraph, DatasetGraph)}
      */
     @Deprecated
     public static boolean isomorphic(Dataset dataset1, Dataset dataset2)
@@ -49,7 +49,7 @@ public class DatasetLib
     
     /**
      * Return true if the datasets are isomorphic - same names for graphs, graphs isomorphic. 
-     * @deprecated Use {@linkplain IsoMatcher#isomorphic(DatasetGraph, DatasetGraph)}
+     * @deprecated Use {@link IsoMatcher#isomorphic(DatasetGraph, DatasetGraph)}
      */
     @Deprecated
     public static boolean isomorphic(DatasetGraph dataset1, DatasetGraph dataset2)
@@ -59,7 +59,7 @@ public class DatasetLib
     
     // A DatasetGraph that creates memory graphs on mention 
     /** 
-     * @deprecated Use {@linkplain DatasetGraphFactory#createMem()}
+     * @deprecated Use {@link DatasetGraphFactory#createMem()}
      */
     @Deprecated
     public static DatasetGraph createDatasetGraphMem()

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
index c4b2e77..58cf366 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
@@ -37,7 +37,7 @@ public interface UpdateEngine
     public void finishRequest();
     
     /**
-     * Returns an {@linkplain UpdateSink} that accepts Update operations
+     * Returns an {@link UpdateSink} that accepts Update operations
      */
     public UpdateSink getUpdateSink();
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
index d3d2e62..ec49159 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.sparql.modify.request.QuadDataAccSink ;
 import com.hp.hpl.jena.update.Update ;
 
 /**
- * An {@linkplain UpdateSink} is an object usually created by a container (such as a storage engine
+ * An {@link UpdateSink} is an object usually created by a container (such as a storage engine
  * or an {@link com.hp.hpl.jena.update.UpdateRequest}) that can process or store a single SPARQL Update
  * request which consists of one or more SPARQL Update operations.
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
index a24eac9..27ef237 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
@@ -36,8 +36,8 @@ import com.hp.hpl.jena.sparql.util.NodeUtils ;
 import com.hp.hpl.jena.sparql.util.NodeUtils.EqualityTest ;
 
 /** Comparison of ResultSets.
- *  Note that reading ResultSets is destructive so consiuder using {@linkplain ResultSetRewindable}
- *  from {@linkplain ResultSetFactory#makeRewindable} 
+ *  Note that reading ResultSets is destructive so consiuder using {@link ResultSetRewindable}
+ *  from {@link ResultSetFactory#makeRewindable} 
  */
 
 public class ResultSetCompare

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index f46a631..37698f9 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -445,7 +445,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
 
     /** Join two iteratables
      * If there, potentially, going to be many iterators, it is better to 
-     * create an {@linkplain IteratorConcat} explicitly and add each iterator.
+     * create an {@link IteratorConcat} explicitly and add each iterator.
      */
     public static <T> Iterator<T> append(Iterable<? extends T> iter1, Iterable<? extends T> iter2) {
         return IteratorCons.create(iterator(iter1), iterator(iter2)) ;
@@ -453,7 +453,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
 
     /** Join two iterator
      * If there, potentially, going to be many iterators, it is better to 
-     * create an {@linkplain IteratorConcat} explicitly and add each iterator.
+     * create an {@link IteratorConcat} explicitly and add each iterator.
      */
     public static <T> Iterator<T> append(Iterator<? extends T> iter1, Iterator<? extends T> iter2) {
         return IteratorCons.create(iter1, iter2) ;
@@ -618,7 +618,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
 
     /**
      * Print an iterator to stdout, return a copy of the iterator. Printing
-     * occurs now. See {@linkplain #debug} for an operation to print as the
+     * occurs now. See {@link #debug} for an operation to print as the
      * iterator is used. 
      */
     public static <T> Iterator<T> log(Iterator<T> stream) {
@@ -637,7 +637,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
     
     /**
      * Print an iterator to stdout, return a copy of the iterator. Printing
-     * occurs when the iterator is used.  See {@linkplain #log} for
+     * occurs when the iterator is used.  See {@link #log} for
      * an operation to print now. 
      */
     public static <T> Iterator<T> debug(Iterator<T> stream) {
@@ -894,7 +894,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
     }
 
     /** Join on an iterator.
-     * If there are going to be many iterators, uit is better to create an {@linkplain IteratorConcat}
+     * If there are going to be many iterators, uit is better to create an {@link IteratorConcat}
      * and <tt>.add</tt> each iterator.  The overheads are much lower. 
      */
     public Iter<T> append(Iterator<T> iter) {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
index b3a5943..82d1c88 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
@@ -22,7 +22,7 @@ import java.util.Iterator ;
 import java.util.NoSuchElementException ;
 
 /** IteratorCons : the concatenation of two iterators.
- * See also {@linkplain IteratorConcat}.
+ * See also {@link IteratorConcat}.
  * If there potentially many iterators to be joined, it is better to 
  *  create an IteratorConcat explicitly and add each iterator.
  *  IteratorCons is slightly better in the two iterator case.

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
index 38546fe..6210bf1 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit ;
 /**
  * An AlarmClock is an object that will make a callback (with a value) at a
  * preset time. Simple abstraction of add/reset/cancel of a Runnable. Currently,
- * backed by {@linkplain ScheduledThreadPoolExecutor}
+ * backed by {@link ScheduledThreadPoolExecutor}
  */
 public class AlarmClock {
     private ScheduledThreadPoolExecutor timer = new ScheduledThreadPoolExecutor(1) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
index 8e01bc2..3360c46 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
@@ -39,7 +39,7 @@ public class Tuple<T> implements Iterable<T> {
      * Create a tuple from an array of elements. The array is not copied and
      * should not be modified after this call.
      * <p>
-     * There is also a {@linkplain TupleBuilder} which does create an idendent
+     * There is also a {@link TupleBuilder} which does create an idendent
      * copy, in case that style is preferrable for creating tuples.
      */
     public static <X> Tuple<X> create(X[] elements) {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheLRU.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheLRU.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheLRU.java
index d813a9a..d3475be 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheLRU.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheLRU.java
@@ -25,7 +25,7 @@ import org.apache.jena.atlas.lib.Cache ;
 import org.apache.jena.atlas.lib.CacheFactory ;
 
 
-/** This class is not thread-safe. Add a synchronization wrapper if needed ({@linkplain CacheFactory#createSync})  */
+/** This class is not thread-safe. Add a synchronization wrapper if needed ({@link CacheFactory#createSync})  */
 
 public class CacheLRU<K,V> implements Cache<K,V>
 {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/Lang.java b/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
index 8ee39ec..b0e8da3 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
@@ -51,7 +51,7 @@ public class Lang
     /** <a href="http://www.w3.org/TR/turtle/">Turtle</a>*/
     public static Lang TURTLE ;
     
-    /** Alternative constant for {@linkplain #TURTLE} */
+    /** Alternative constant for {@link #TURTLE} */
     public static Lang TTL ;
     
     /** N3 (treat as Turtle) */
@@ -60,7 +60,7 @@ public class Lang
     /** <a href="http://www.w3.org/TR/n-triples/">N-Triples</a>*/
     public static Lang NTRIPLES ;
     
-    /** Alternative constant for {@linkplain #NTRIPLES} */
+    /** Alternative constant for {@link #NTRIPLES} */
     public static Lang NT ;
 
     /** <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
@@ -75,7 +75,7 @@ public class Lang
     /** <a href="http://www.w3.org/TR/n-quads">N-Quads</a> */
     public static Lang NQUADS ;
     
-    /** Alternative constant {@linkplain #NQUADS} */
+    /** Alternative constant {@link #NQUADS} */
     public static Lang NQ ;
 
     //** The RDF syntax "RDF Thrift" : see http://jena.apache.org/documentation/io */ 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 284b1c3..15d6c4f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -962,8 +962,8 @@ public class RDFDataMgr
 //    ///---- NEW
 
     /** 
-     * @see RDFLanguages#shortnameToLang  to go from Jena short name to {@linkplain Lang}
-     * @see RDFLanguages#contentTypeToLang to go from content type to {@linkplain Lang}
+     * @see RDFLanguages#shortnameToLang  to go from Jena short name to {@link Lang}
+     * @see RDFLanguages#contentTypeToLang to go from content type to {@link Lang}
      */
 
     public static ReaderRIOT createReader(Lang lang) {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index 0cafd8c..ae99481 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -81,7 +81,7 @@ public class RDFFormat {
     /**
      * RDF Thrift output. This format is faithful representation of RDF writtern
      * and it is suitable for database dumps. It does not encode numeric
-     * literals as values (see {@linkplain #RDF_THRIFT_VALUES}).
+     * literals as values (see {@link #RDF_THRIFT_VALUES}).
      *
      * @see #RDF_THRIFT_VALUES
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
index e494d89..4af6954 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
@@ -73,7 +73,7 @@ public class RDFLanguages
                                                 .addAltContentTypes(contentTypeTurtleAlt1, contentTypeTurtleAlt2)
                                                 .addFileExtensions("ttl")
                                                 .build() ;
-    /** Alternative constant for {@linkplain #TURTLE} */
+    /** Alternative constant for {@link #TURTLE} */
     public static final Lang TTL    = TURTLE ;
     
     /** N3 (treat as Turtle) */
@@ -89,7 +89,7 @@ public class RDFLanguages
                                                 .addAltContentTypes(contentTypeNTriplesAlt)
                                                 .addFileExtensions("nt")
                                                 .build() ;
-    /** Alternative constant for {@linkplain #NTRIPLES} */
+    /** Alternative constant for {@link #NTRIPLES} */
     public static final Lang NT     = NTRIPLES ;
 
     /** <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
@@ -117,7 +117,7 @@ public class RDFLanguages
                                                 .addFileExtensions("nq")
                                                 .build() ;
     
-    /** Alternative constant {@linkplain #NQUADS} */
+    /** Alternative constant {@link #NQUADS} */
     public static final Lang NQ     = NQUADS ;
     
     /** CSV data.  This can be read into an RDF model with simple conversion */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
index 52794b1..72b2a8f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.sparql.util.Context ;
 
 /** 
  * Reading and writing of Result Sets.
- * {@linkplain ResultSetFormatter} provides output to text.
+ * {@link ResultSetFormatter} provides output to text.
  * @see ResultSetFactory
  * @see ResultSetFormatter 
  */
@@ -42,10 +42,10 @@ public class ResultSetMgr {
     }
     
     /**
-     * Read from an {@code InputStream} and produce a {@linkplain ResultSet};
+     * Read from an {@code InputStream} and produce a {@link ResultSet};
      * the stream is expect to use syntax {@code lang}.  Note that returned
      * result set may stream and so the input stream be read while the ResultSet is used.
-     * See {@linkplain ResultSetFactory#copyResults(ResultSet)}
+     * See {@link ResultSetFactory#copyResults(ResultSet)}
      * for a ResultSet that is detached from the {@code InputStream}.
      * 
      * @param in
@@ -67,13 +67,13 @@ public class ResultSetMgr {
     }
 
 //    /**
-//     * Read from an {@code Reader} and produce a {@linkplain ResultSet};
+//     * Read from an {@code Reader} and produce a {@link ResultSet};
 //     * the stream is expect to use syntax {@code lang}.  
 //     * Using InputStreams is better to ensure the character set
 //     * of the input matches that of the syntax.  
 //     * Note that returned
 //     * result set may stream and so the input stream be read while the ResultSet is used.
-//     * See {@linkplain ResultSetFactory#copyResults(ResultSet)}
+//     * See {@link ResultSetFactory#copyResults(ResultSet)}
 //     * for a ResultSet that is detached from the {@code InputStream}.
 //     * 
 //     * @param in
@@ -91,11 +91,11 @@ public class ResultSetMgr {
 //    
 //    
 //    /**
-//     * Read from an {@code StringReader} and produce a {@linkplain ResultSet};
+//     * Read from an {@code StringReader} and produce a {@link ResultSet};
 //     * the stream is expect to use syntax {@code lang}.  
 //     * Note that returned
 //     * result set may stream and so the input stream be read while the ResultSet is used.
-//     * See {@linkplain ResultSetFactory#copyResults(ResultSet)}
+//     * See {@link ResultSetFactory#copyResults(ResultSet)}
 //     * for a ResultSet that is detached from the {@code InputStream}.
 //     * 
 //     * @param in

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index b66d67e..254a108 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -122,7 +122,7 @@ public class RiotReader
     // -------- Parsers
     
     /** Create a parser 
-     * @deprecated Use {@linkplain RDFDataMgr#createReader(Lang)}
+     * @deprecated Use {@link RDFDataMgr#createReader(Lang)}
      */
     @Deprecated
     public static LangRIOT createParser(InputStream input, Lang lang, String baseIRI, StreamRDF dest)
@@ -142,7 +142,7 @@ public class RiotReader
     }
 
     /** Create a parser 
-     * @deprecated Use {@linkplain RDFDataMgr#createReader(Lang)}
+     * @deprecated Use {@link RDFDataMgr#createReader(Lang)}
      */
     @Deprecated
     public static LangRIOT createParser(Reader input, Lang lang, String baseIRI, StreamRDF dest)
@@ -162,7 +162,7 @@ public class RiotReader
     }
 
     /** Create a parser 
-     * @deprecated Use {@linkplain RDFDataMgr#createReader(Lang)}
+     * @deprecated Use {@link RDFDataMgr#createReader(Lang)}
      */
     @Deprecated  
     public static LangRIOT createParser(Tokenizer tokenizer, Lang lang, String baseIRI, StreamRDF dest)

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
index aae9937..329650d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
 /** Direct call to create writers for specific formats.
- *  The normal way to write is {@linkplain RDFDataMgr} 
+ *  The normal way to write is {@link RDFDataMgr} 
  */
 @Deprecated
 public class RiotWriter
@@ -43,86 +43,86 @@ public class RiotWriter
     // ---- Create writers
 
     /** Create a Turtle writer
-     @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} 
+     @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)} 
      */
     @Deprecated
     public static WriterGraphRIOT createTurtle()            { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE) ; }
 
     /** Create a streaming Turtle writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_BLOCKS</tt> 
+     *  @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_BLOCKS</tt> 
      */
     @Deprecated
     public static WriterGraphRIOT createTurtleStreaming()   { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_BLOCKS) ; }
 
     /** Create a streaming Turtle writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_FLAT</tt> 
+     *  @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_FLAT</tt> 
      */
     @Deprecated
     public static WriterGraphRIOT createTurtleFlat()        { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_FLAT) ; }
 
     /** Create am N-Triples writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} 
+     *  @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)} 
      */
     @Deprecated
     public static WriterGraphRIOT createNTriples()          { return RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES) ; } 
 
     /** Create an N-Triples writer, restricted to ASCII characters in the output. 
      * Other chars escaped in \ u sequences.
-     * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NTRIPLES_ASCII</tt> 
+     * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NTRIPLES_ASCII</tt> 
      */
     @Deprecated
     public static WriterGraphRIOT createNTriplesASCII()     { return RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES_ASCII) ; }
 
     /** Create an RDF/XML writer which pretty-prints
-    *   @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_ABBREV</tt>
+    *   @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_ABBREV</tt>
     */
     @Deprecated
     public static WriterGraphRIOT createRDFXMLAbbrev()      { return RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_ABBREV) ; }
 
     /** Create an RDF/XML writer which pretty-prints
-    *   @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_PLAIN</tt>
+    *   @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_PLAIN</tt>
     */
     @Deprecated
     public static WriterGraphRIOT createRDFXMLPlain()       { return RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_PLAIN) ; }
 
     /** Create an RDF/JSON writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} and <tt>Lang.RDFJSON</tt>
+     *  @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)} and <tt>Lang.RDFJSON</tt>
      */
     @Deprecated
     public static WriterGraphRIOT createRDFJSON()           { return RDFDataMgr.createGraphWriter(RDFFormat.RDFJSON) ; }
     /** Create a TriG writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.TRIG</tt>
+     *  @deprecated Use {@link RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.TRIG</tt>
      */
     @Deprecated
     public static WriterDatasetRIOT createTrig()            { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG) ; }
 
     /** Create a streaming TriG writer
-     *  @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_BLOCKS</tt> 
+     *  @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_BLOCKS</tt> 
      */
     @Deprecated
     public static WriterDatasetRIOT createTrigStreaming()   { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_BLOCKS) ; }
 
     /** Create a streaming TriG writer with one quad per line.
-     *  @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_FLAT</tt> 
+     *  @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_FLAT</tt> 
      */
     @Deprecated
     public static WriterDatasetRIOT createTrigFlat()        { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_FLAT) ; }
 
     /** Create an N-Quads writer
-     * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.NQUADS</tt>     
+     * @deprecated Use {@link RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.NQUADS</tt>     
      */
     @Deprecated
     public static WriterDatasetRIOT createNQuads()          { return RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS) ; }
     
     /** Create an N-Quads writer, restricted to ASCII characters in the output. 
      * Other chars escaped in \ u sequences.
-     * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NQUADS_ASCII</tt> 
+     * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NQUADS_ASCII</tt> 
      */
     @Deprecated
     public static WriterDatasetRIOT createNQuadsASCII()     { return RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS_ASCII) ; }
 
     /** Create a sink writer
-     * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.RDFNULL</tt>
+     * @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.RDFNULL</tt>
      */
     @Deprecated
     public static WriterDatasetRIOT createRDFNULL()         { return RDFDataMgr.createDatasetWriter(RDFFormat.RDFNULL) ; }           

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocator.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocator.java
index 9ad1ce2..102a509 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocator.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocator.java
@@ -30,11 +30,11 @@ public interface BlankNodeAllocator
     public Node alloc(String label) ;
     
     /** Create a fresh blank node, different from anything generated so far.
-     *  Will not clash with a node allocated by {@linkplain #alloc}
+     *  Will not clash with a node allocated by {@link #alloc}
      */
     public Node create() ;
     
-    /** Reset allocation state - calls to {@linkplain #alloc} or {@linkplain #create} */    
+    /** Reset allocation state - calls to {@link #alloc} or {@link #create} */    
     public void reset() ;
 }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
index 21dd80b..8cfe26c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.rdf.model.AnonId ;
  *  The reverse operation is {@link NodeToLabel#createBNodeByLabelAsGiven()}
  *  but it is unsafe in general.
  *  
- *  Use {@linkplain BlankNodeAllocatorLabelEncoded} and {@linkplain NodeToLabel#createBNodeByLabelEncoded()}
+ *  Use {@link BlankNodeAllocatorLabelEncoded} and {@link NodeToLabel#createBNodeByLabelEncoded()}
  *  for round-tripping output-input.
  */
 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
index 186100a..2972aa9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.rdf.model.AnonId ;
 /**
  * Allocate blank nodes according to the label given. 
  * This alloctor reconstructs labels made by
- * {@linkplain NodeToLabel#createBNodeByLabelEncoded()}
+ * {@link NodeToLabel#createBNodeByLabelEncoded()}
  */
 
 public class BlankNodeAllocatorLabelEncoded implements BlankNodeAllocator {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReader.java b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReader.java
index 479fcf7..086a882 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReader.java
@@ -28,10 +28,10 @@ import com.hp.hpl.jena.sparql.util.Context ;
 public interface ResultSetReader {
     
     /**
-     * Read from an {@code InputStream} and produce a {@linkplain ResultSet}.
+     * Read from an {@code InputStream} and produce a {@link ResultSet}.
      * Note that return result may stream and so the input stream be read
      * while the ResultSet is used.
-     * See {@linkplain ResultSetFactory#copyResults(ResultSet)} for a ResultSet that is detached from the {@code InputStream}.
+     * See {@link ResultSetFactory#copyResults(ResultSet)} for a ResultSet that is detached from the {@code InputStream}.
      * @param in InputStream to read from.
      * @param context
      * @return ResultSet
@@ -40,10 +40,10 @@ public interface ResultSetReader {
     
     /**
      * Using {@link #read(InputStream, Context)} is preferred.
-     * Read from an {@code Reader} and produce a {@linkplain ResultSet}.
+     * Read from an {@code Reader} and produce a {@link ResultSet}.
      * Note that return result may stream and so the reader be read
      * while the ResultSet is used.
-     * See {@linkplain ResultSetFactory#copyResults(ResultSet)} for a ResultSet that is detached from the {@code InputStream}.
+     * See {@link ResultSetFactory#copyResults(ResultSet)} for a ResultSet that is detached from the {@code InputStream}.
      * @param in Reader
      * @param context
      * @return ResultSet

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReaderRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReaderRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReaderRegistry.java
index bd10a01..7a4052e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReaderRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetReaderRegistry.java
@@ -44,13 +44,13 @@ import com.hp.hpl.jena.sparql.util.Context ;
 
 public class ResultSetReaderRegistry {
     
-    /** Lookup a {@linkplain Lang} to get the registered {@linkplain ResultSetReaderFactory} (or null) */
+    /** Lookup a {@link Lang} to get the registered {@link ResultSetReaderFactory} (or null) */
     public static ResultSetReaderFactory getFactory(Lang lang) {
         Objects.requireNonNull(lang) ;
         return registry.get(lang) ;
     }
 
-    /** Register a {@linkplain ResultSetReaderFactory} for a {@linkplain Lang} */
+    /** Register a {@link ResultSetReaderFactory} for a {@link Lang} */
     public static void register(Lang lang, ResultSetReaderFactory factory) {
         Objects.requireNonNull(lang) ;
         Objects.requireNonNull(factory) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriter.java
index bb1d5fa..7485cd6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriter.java
@@ -29,7 +29,7 @@ public interface ResultSetWriter {
     public void write(OutputStream out, ResultSet resultSet, Context context) ;
     
     /**
-     * Using {@linkplain #write(OutputStream, ResultSet, Context)} is preferred. 
+     * Using {@link #write(OutputStream, ResultSet, Context)} is preferred. 
      * Write the ResultSet to the Writer
      */
     public void write(Writer out, ResultSet resultSet, Context context) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
index ca3204c..da95720 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/resultset/ResultSetWriterRegistry.java
@@ -46,13 +46,13 @@ public class ResultSetWriterRegistry {
 
     private static Map<Lang, ResultSetWriterFactory> registry = new HashMap<>() ;
     
-    /** Lookup a {@linkplain Lang} to get the registered {@linkplain ResultSetReaderFactory} (or null) */
+    /** Lookup a {@link Lang} to get the registered {@link ResultSetReaderFactory} (or null) */
     public static ResultSetWriterFactory lookup(Lang lang) {
         Objects.requireNonNull(lang) ;
         return registry.get(lang) ;
     }
 
-    /** Register a {@linkplain ResultSetReaderFactory} for a {@linkplain Lang} */
+    /** Register a {@link ResultSetReaderFactory} for a {@link Lang} */
     public static void register(Lang lang, ResultSetWriterFactory factory) {
         Objects.requireNonNull(lang) ;
         Objects.requireNonNull(factory) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapFactory.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapFactory.java
index 8bc3056..4bfef07 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapFactory.java
@@ -229,7 +229,7 @@ public class PrefixMapFactory {
     }
     
     /** Return an immutable view of the prefix map.
-     * Throws {@linkplain UnsupportedOperationException} on 
+     * Throws {@link UnsupportedOperationException} on 
      * attempts to update it.  Refelcts hcnages mad to the underlying map.
      * @param pmap  PrefixMap
      * @return Prefix Map

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java
index a37a974..7adf775 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java
@@ -40,8 +40,8 @@ import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
 /** Write RDF in a streaming fashion.
- *  {@linkplain RDFDataMgr} operations do not provide this guaranttee.
- *  See {@linkplain  RDFWriterRegistry} for general purpose writers.
+ *  {@link RDFDataMgr} operations do not provide this guaranttee.
+ *  See {@link  RDFWriterRegistry} for general purpose writers.
  *  
  * @see RDFDataMgr 
  * @see RDFWriterRegistry 
@@ -159,7 +159,7 @@ public class StreamRDFWriter {
     /** Get a StreamRDF destination that will output in syntax <tt>RDFFormat</tt>
      *  and is guaranteed to do so in a scaling, streaming fashion.    
      * @param output OutputStream
-     * @param format  The syntax (as an {@linkplain RDFFormat}) 
+     * @param format  The syntax (as an {@link RDFFormat}) 
      * @return       StreamRDF
      * @see StreamOps#graphToStream
      * @see StreamOps#datasetToStream

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
index 72ac002..a2ce466 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
@@ -57,7 +57,7 @@ public class LocatorFile implements Locator
      * The working directory should be a UNIX style file name,
      * (relative or absolute), not a URI.
      * <p>
-     * For MS Window, if asked to {@linkplain #open} a file name with a drive letter,
+     * For MS Window, if asked to {@link #open} a file name with a drive letter,
      * the code assumes it is not relative to the working directory
      * of this {@code LocatorFile}.  
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
index 1013b97..54a3bd2 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
@@ -61,8 +61,8 @@ public class StreamManager {
     }
 
     /**
-     * Return a default configuration StreamManager with a {@linkplain LocatorFile},
-     * {@linkplain LocatorHTTP}, {@linkplain LocatorFTP} and {@linkplain LocatorClassLoader}
+     * Return a default configuration StreamManager with a {@link LocatorFile},
+     * {@link LocatorHTTP}, {@link LocatorFTP} and {@link LocatorClassLoader}
      */
     public static StreamManager makeDefaultStreamManager() {
         StreamManager streamManager = new StreamManager() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/thrift/BinRDF.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/BinRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/BinRDF.java
index f0d1472..d4c5715 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/BinRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/BinRDF.java
@@ -40,7 +40,7 @@ import com.hp.hpl.jena.sparql.engine.ResultSetStream ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
 
 /** Operations on binary RDF (which uses <a href="http://thrift.apache.org/">Apache Thrift</a>).
- * See also {@linkplain ThriftConvert}, for specific functions on binary RDF.
+ * See also {@link ThriftConvert}, for specific functions on binary RDF.
  * @see ThriftConvert 
  */
 public class BinRDF {
@@ -49,10 +49,10 @@ public class BinRDF {
     private static int BUFSIZE_OUT  = 128*1024 ;
 
     /** 
-     * Create an {@linkplain StreamRDF} for output.  A filename ending {@code .gz} will have
+     * Create an {@link StreamRDF} for output.  A filename ending {@code .gz} will have
      * a gzip compressor added to the output path. A filename of "-" is {@code System.out}.
-     * The file is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * The file is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * 
      * @param filename The file
      * @return StreamRDF A stream to send to.
@@ -63,10 +63,10 @@ public class BinRDF {
     }
     
     /** 
-     * Create an {@linkplain StreamRDF} for output.  A filename ending {@code .gz} will have
+     * Create an {@link StreamRDF} for output.  A filename ending {@code .gz} will have
      * a gzip compressor added to the output path. A filename of "-" is {@code System.out}.
-     * The file is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * The file is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * 
      * @param filename The file
      * @param withValues - whether to encode numeric values as values.
@@ -81,9 +81,9 @@ public class BinRDF {
     }
     
     /** 
-     * Create an {@linkplain StreamRDF} for output.
-     * The {@code OutputStream} is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * Create an {@link StreamRDF} for output.
+     * The {@code OutputStream} is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * @param out OutputStream
      * @return StreamRDF A stream to send to. 
      */
@@ -92,9 +92,9 @@ public class BinRDF {
     }
     
     /** 
-     * Create an {@linkplain StreamRDF} for output.
-     * The {@code OutputStream} is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * Create an {@link StreamRDF} for output.
+     * The {@code OutputStream} is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * @param out OutputStream
      * @param withValues - whether to encode numeric values as values.
      * @return StreamRDF A stream to send to. 
@@ -104,9 +104,9 @@ public class BinRDF {
     }
 
     /** 
-     * Create an {@linkplain StreamRDF} for output.
-     * The {@code OutputStream} is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * Create an {@link StreamRDF} for output.
+     * The {@code OutputStream} is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * @param protocol Output and encoding.
      * @return StreamRDF A stream to send to. 
      */
@@ -115,9 +115,9 @@ public class BinRDF {
     }
 
     /** 
-     * Create an {@linkplain StreamRDF} for output.
-     * The {@code OutputStream} is closed when {@linkplain StreamRDF#finish()} is called unless it is {@code System.out}.  
-     * Call {@linkplain StreamRDF#start()}...{@linkplain StreamRDF#finish()}.
+     * Create an {@link StreamRDF} for output.
+     * The {@code OutputStream} is closed when {@link StreamRDF#finish()} is called unless it is {@code System.out}.  
+     * Call {@link StreamRDF#start()}...{@link StreamRDF#finish()}.
      * @param protocol Output and encoding.
      * @param withValues - whether to encode numeric values as values.
      * @return StreamRDF A stream to send to. 
@@ -127,7 +127,7 @@ public class BinRDF {
     }
 
     /**
-     * Decode the contents of the file and send to the {@linkplain StreamRDF}.
+     * Decode the contents of the file and send to the {@link StreamRDF}.
      * A filename ending {@code .gz} will have a gzip decompressor added.
      * A filename of "-" is {@code System.in}.
      * @param filename The file.
@@ -140,7 +140,7 @@ public class BinRDF {
     }
         
     /**
-     * Decode the contents of the input stream and send to the {@linkplain StreamRDF}.
+     * Decode the contents of the input stream and send to the {@link StreamRDF}.
      * @param in InputStream
      * @param dest StreamRDF
      */
@@ -150,7 +150,7 @@ public class BinRDF {
     }
 
     /**
-     * Decode the contents of the TProtocol and send to the {@linkplain StreamRDF}.
+     * Decode the contents of the TProtocol and send to the {@link StreamRDF}.
      * @param protocol TProtocol
      * @param dest Sink
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRDF2Thrift.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRDF2Thrift.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRDF2Thrift.java
index 44c3bb9..861ec5b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRDF2Thrift.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRDF2Thrift.java
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
 /** Encode StreamRDF in Thrift.
- *  Usually used via {@linkplain BinRDF} functions. 
+ *  Usually used via {@link BinRDF} functions. 
  * 
  * @see Thrift2StreamRDF (for each RDF_StreamRow) for the reverse process.
  */ 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
index 840c29e..ce00bfd 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
@@ -61,7 +61,7 @@ public class TRDF {
 
     /**
      * Create Thrift protocol for the OutputStream.
-     * The caller must call {@linkplain TRDF#flush(TProtocol)} 
+     * The caller must call {@link TRDF#flush(TProtocol)} 
      * which will flush the underlying (internally buffered) output stream. 
      * @param out OutputStream
      */
@@ -78,7 +78,7 @@ public class TRDF {
     }
 
     /**
-     * Decode the contents of the input stream and send to the {@linkplain StreamRDF}.
+     * Decode the contents of the input stream and send to the {@link StreamRDF}.
      * @param filename
      */
     public static TProtocol protocol(String filename) {
@@ -96,12 +96,12 @@ public class TRDF {
         throw new RiotThriftException("No protocol impl choosen") ;
     }
 
-    /** Flush a TProtocol; expections converted to {@linkplain RiotException} */  
+    /** Flush a TProtocol; expections converted to {@link RiotException} */  
     public static void flush(TProtocol protocol) {
         flush(protocol.getTransport()) ;
     }
 
-    /** Flush a TTransport; expections converted to {@linkplain RiotException} */  
+    /** Flush a TTransport; expections converted to {@link RiotException} */  
     public static void flush(TTransport transport) {
         try { transport.flush() ; }
         catch (TException ex) { TRDF.exception(ex) ; }

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
index 7b542f0..ada0062 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.sparql.core.Var ;
 
 /** Convert to and from Thrift wire objects.
- * See {@linkplain StreamRDF2Thrift} and {@linkplain Thrift2StreamRDF}
+ * See {@link StreamRDF2Thrift} and {@link Thrift2StreamRDF}
  * for ways to convert as streams (they recycle intermediate objects).
  * @see StreamRDF2Thrift
  * @see Thrift2StreamRDF

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
index 0980e41..afa03a6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
@@ -203,7 +203,7 @@ public class HttpOp {
 
     /**
      * Return the current default {@link HttpClient}. This may be null, meaning
-     * a new {@linkplain HttpClient} is created each time, if none is provided
+     * a new {@link HttpClient} is created each time, if none is provided
      * in the HttpOp function call.
      * 
      * @return Default HTTP Client

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
index 42ab5bc..4e9b08f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java
@@ -42,7 +42,7 @@ public class WriterStreamRDFPlain implements StreamRDF {
     protected final NodeFormatter nodeFmt ;
 
     /**
-     * Output tuples, using UTF8 output See {@linkplain StreamRDFLib#writer} for
+     * Output tuples, using UTF8 output See {@link StreamRDFLib#writer} for
      * ways to create a AWriter object.
      */
     public WriterStreamRDFPlain(AWriter w) {
@@ -51,7 +51,7 @@ public class WriterStreamRDFPlain implements StreamRDF {
 
     /**
      * Output tuples, choosing ASCII or UTF8 See
-     * {@linkplain StreamRDFLib#writer} for ways to create a AWriter object.
+     * {@link StreamRDFLib#writer} for ways to create a AWriter object.
      */
     public WriterStreamRDFPlain(AWriter w, CharSpace charSpace) {
         out = w ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java
index e0ceb03..ea45fab 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.util.Context ;
 
 /** Write TriX.
  * See {@link TriX} for details.
- * The writer defers to {@linkplain StreamWriterTriX}. 
+ * The writer defers to {@link StreamWriterTriX}. 
  * @see TriX
  * @see ReaderTriX
  * @see StreamWriterTriX

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index 487b05b..36048da 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -50,7 +50,7 @@ public class LiteralLabelFactory
         return new LiteralLabelImpl( lex, "", dtype );
     }
 
-    /** Using {@linkplain #create(String, String)} or {@linkplain #create(String, RDFDatatype)}
+    /** Using {@link #create(String, String)} or {@link #create(String, RDFDatatype)}
      * where possible is preferred.
      */
     public static LiteralLabel createLiteralLabel( String lex, String lang, RDFDatatype dtype ) 
@@ -82,7 +82,7 @@ public class LiteralLabelFactory
         return new LiteralLabelImpl(value, lang, dtype) ; 
     }
 
-    /** Use {@linkplain #createTypedLiteral} */
+    /** Use {@link #createTypedLiteral} */
     @Deprecated
     public static LiteralLabel create(Object value) {
         return createTypedLiteral(value) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java b/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
index 87e68e3..7b19b9d 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
@@ -265,10 +265,10 @@ public interface OntModel
     /**
      * <p>
      * Answer an iterator that ranges over all of the various forms of class description resource
-     * in this model.  Class descriptions include {@linkplain #listEnumeratedClasses enumerated}
-     * classes, {@linkplain #listUnionClasses union} classes, {@linkplain #listComplementClasses complement}
-     * classes, {@linkplain #listIntersectionClasses intersection} classes, {@linkplain #listClasses named}
-     * classes and {@linkplain #listRestrictions property restrictions}.
+     * in this model.  Class descriptions include {@link #listEnumeratedClasses enumerated}
+     * classes, {@link #listUnionClasses union} classes, {@link #listComplementClasses complement}
+     * classes, {@link #listIntersectionClasses intersection} classes, {@link #listClasses named}
+     * classes and {@link #listRestrictions property restrictions}.
      * </p>
      * @return An iterator over class description resources.
      */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/EmptyListUpdateException.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/EmptyListUpdateException.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/EmptyListUpdateException.java
index 5b92bb4..691ec89 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/EmptyListUpdateException.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/EmptyListUpdateException.java
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.shared.JenaException;
  * from <code>rdf:nil</code> to a new bNode, and in Jena the URI of a node is
  * invariant.  To avoid this operation, when extending an empty list use operations
  * that return the updated list (such as {@link RDFList#cons}, or {@link RDFList#with},
- * or check first to see if the list {@linkplain RDFList#isEmpty is empty}, and replace
+ * or check first to see if the list {@link RDFList#isEmpty is empty}, and replace
  * it with a non-null list.
  * </p>
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java b/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
index d1c5848..8190f30 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
 /** Given an Iterator that returns Iterator's, this creates an
  * Iterator over the next level values.
  * Similar to list splicing in lisp.
- * @deprecated use {@linkplain com.hp.hpl.jena.util.iterator.WrappedIterator#create}
+ * @deprecated use {@link com.hp.hpl.jena.util.iterator.WrappedIterator#create}
  */
 @Deprecated
 public class IteratorIterator<T> implements Iterator<T>

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
index f4a6dfc..f33fe92 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
@@ -69,9 +69,9 @@ public class ShiroEnvironmentLoader extends EnvironmentLoader implements Servlet
      * Normal Shiro initialization only supports one location for an INI file.
      *  
      * When given multiple multiple locations for the shiro.ini file, and 
-     * if a {@linkplain ResourceBasedWebEnvironment}, check the list of configuration
+     * if a {@link ResourceBasedWebEnvironment}, check the list of configuration
      * locations, testing whether the name identified an existing resource.  
-     * For the first resource name found to exist, reset the {@linkplain ResourceBasedWebEnvironment}
+     * For the first resource name found to exist, reset the {@link ResourceBasedWebEnvironment}
      * to name that resource alone so the normal Shiro initialization  
      */
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
index 2857c39..245ed0f 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
@@ -369,7 +369,7 @@ public class HttpAction
     public HttpServletResponseTracker getResponse()     { return response ; }
     
     /** Return the recorded time taken in milliseconds. 
-     *  {@linkplain #setStartTime} and {@linkplain #setFinishTime}
+     *  {@link #setStartTime} and {@link #setFinishTime}
      *  must have been called.
      */
     public long getTime()

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-fuseki2/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
index 648d6c1..a51233d 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
@@ -81,7 +81,7 @@ public class ValidationAction
     public HttpServletResponse getResponse()        { return response ; }
     
     /** Return the recorded time taken in milliseconds. 
-     *  {@linkplain #setStartTime} and {@linkplain #setFinishTime}
+     *  {@link #setStartTime} and {@link #setFinishTime}
      *  must have been called.
      */
     public long getTime()

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
index db82df6..f7d2639 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.tdb.base.block.Block ;
  * internally allocated space for read, not provided from outside; write() can
  * insist the block written comes from allocate()).
  * This interfce can also be backed by an in-memory implemntation 
- * ({@linkplain BlockAccessMem}, {@linkplain BlockAccessByteArray}).
+ * ({@link BlockAccessMem}, {@link BlockAccessByteArray}).
  * 
  * This is wrapped in a BlockMgr to provide a higher level abstraction.
  * 

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
index 0f77c21..f9a9484 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
@@ -83,7 +83,7 @@ public class Location {
         location.lock = new LocationLock(location);
     }
 
-    /** @deprecated Use{@linkplain  Location#create(String)} */
+    /** @deprecated Use{@link  Location#create(String)} */
     @Deprecated
     public Location(String rootname) {
         super() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
index daa31ba..c30a68e 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
@@ -105,7 +105,7 @@ public class Build
      * <p>
      * Do not edit store parameters recorded at a location after the database has been created.
      * Only the dynamic parameters cna be safely changed. That is better done though the application
-     * providing some parameters in the {@linkplain TDBFactory} call.
+     * providing some parameters in the {@link TDBFactory} call.
      * <p>
      * This includes changing filenames,  indexing choices and block size. 
      * Otherwise, the database may be permanetly and irrecovably corrupted.

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
index 7b6e60c..973d372 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
@@ -73,12 +73,12 @@ public class DatasetBuilderStd implements DatasetBuilder {
     }
     
     /**
-     * Create a {@linkplain DatasetGraphTDB} with a set of {@linkplain StoreParams}.
+     * Create a {@link DatasetGraphTDB} with a set of {@link StoreParams}.
      * The parameters for a store have 3 inputs: the parameters provided,
      * any parameters 
      * 
      * @param location    Where to create the database.
-     * @param appParams   Store parameters to use (null means use default). {See {@linkplain StoreParams}). 
+     * @param appParams   Store parameters to use (null means use default). {See {@link StoreParams}). 
      * @return DatasetGraphTDB
      */
     public static DatasetGraphTDB create(Location location, StoreParams appParams) {

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java
index 352f7c5..3e2bc86 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java
@@ -108,7 +108,7 @@ public class StoreParamsBuilder {
         return new StoreParamsBuilder(params) ;
     }
 
-    /** Using a base set of {@linkplain StoreParams}, and update with dynamic parameters.
+    /** Using a base set of {@link StoreParams}, and update with dynamic parameters.
      * 
      * @param baseParams
      * @param additionalParams

http://git-wip-us.apache.org/repos/asf/jena/blob/7e5abeed/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsCodec.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsCodec.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsCodec.java
index dbf6022..c6d05fb 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsCodec.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsCodec.java
@@ -56,7 +56,7 @@ import com.hp.hpl.jena.tdb.TDBException ;
 import com.hp.hpl.jena.tdb.base.block.FileMode ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 
-/** Encode and decode {@linkplain StoreParams} */ 
+/** Encode and decode {@link StoreParams} */ 
 public class StoreParamsCodec {
     
     /** Write to a file */