diff --git a/apps/jrobin/java/src/org/rrd4j/core/RobinArray.java b/apps/jrobin/java/src/org/rrd4j/core/RobinArray.java
index 0ece198c552eb92daaed652a2c907da253dd3c77..79265e57d991becfe19dd609e2d02c439df4ed90 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/RobinArray.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/RobinArray.java
@@ -8,7 +8,7 @@ import java.io.IOException;
  * fixed length array of double values. Each double value represents consolidated, archived
  * value for the specific timestamp. When the underlying array of double values gets completely
  * filled, new values will replace the oldest ones.<p>
- * <p/>
+ *
  * Robin object does not hold values in memory - such object could be quite large.
  * Instead of it, Robin reads them from the backend I/O only when necessary.
  *
diff --git a/apps/jrobin/java/src/org/rrd4j/core/RobinMatrix.java b/apps/jrobin/java/src/org/rrd4j/core/RobinMatrix.java
index 8035716a5c87d46b1457c0c543613dd7b2c6f420..715eaa8d75c35406b2ceae41bc276fd16fb76acb 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/RobinMatrix.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/RobinMatrix.java
@@ -8,7 +8,7 @@ import java.io.IOException;
  * fixed length array of double values. Each double value reperesents consolidated, archived
  * value for the specific timestamp. When the underlying array of double values gets completely
  * filled, new values will replace the oldest ones.<p>
- * <p/>
+ *
  * Robin object does not hold values in memory - such object could be quite large.
  * Instead of it, Robin reads them from the backend I/O only when necessary.
  *
diff --git a/apps/jrobin/java/src/org/rrd4j/core/RrdBackendFactory.java b/apps/jrobin/java/src/org/rrd4j/core/RrdBackendFactory.java
index e5ac6acdf80c546de8ecf7bf4bc56ba28623b223..b6fb8136e60b6105899b7bf4aec88b58869ed58d 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/RrdBackendFactory.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/RrdBackendFactory.java
@@ -51,12 +51,6 @@ import java.util.regex.Pattern;
  * {@link org.rrd4j.core.RrdMemoryBackendFactory} class. This backend stores all data in memory. Once
  * JVM exits, all data gets lost. The backend is extremely fast and memory hungry.
  * 
- * <li>{@link org.rrd4j.core.RrdBerkeleyDbBackend}: objects of this class are created from the 
- * {@link org.rrd4j.core.RrdBerkeleyDbBackendFactory} class. It stores RRD data to ordinary disk files 
- * using <a href="http://www.oracle.com/technetwork/database/berkeleydb/overview/index-093405.html">Oracle Berkeley DB</a> Java Edition.
- * 
- * <li>{@link org.rrd4j.core.RrdMongoDBBackend}: objects of this class are created from the {@link org.rrd4j.core.RrdMongoDBBackendFactory} class.
- * It stores data in a {@link com.mongodb.DBCollection} from <a href="http://www.mongodb.org/">MongoDB</a>.
  * </ul>
  * <p>
  * Each backend factory used to be identified by its {@link #getName() name}. Constructors
diff --git a/apps/jrobin/java/src/org/rrd4j/core/RrdNioBackendFactory.java b/apps/jrobin/java/src/org/rrd4j/core/RrdNioBackendFactory.java
index c3e448c39dd66992fe768c52165e4c9c6c89ab58..bb7d476def269254a5a02d64f45782569b0bbf0b 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/RrdNioBackendFactory.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/RrdNioBackendFactory.java
@@ -6,7 +6,7 @@ import java.util.concurrent.ScheduledExecutorService;
 /**
  * Factory class which creates actual {@link org.rrd4j.core.RrdNioBackend} objects. This is the default factory since
  * 1.4.0 version.
- * <h3>Managing the thread pool</h3>
+ * <h2>Managing the thread pool</h2>
  * <p>Each RrdNioBackendFactory is optionally backed by a {@link org.rrd4j.core.RrdSyncThreadPool}, which it uses to sync the memory-mapped files to
  * disk. In order to avoid having these threads live longer than they should, it is recommended that clients create and
  * destroy thread pools at the appropriate time in their application's life time. Failure to manage thread pools
diff --git a/apps/jrobin/java/src/org/rrd4j/core/RrdSyncThreadPool.java b/apps/jrobin/java/src/org/rrd4j/core/RrdSyncThreadPool.java
index de46ef6c1ef6865d5e8c29fced7ac85c91a3cb1e..facd5e167b74f0e5e071a3ec465e46b1bb7b4ca1 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/RrdSyncThreadPool.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/RrdSyncThreadPool.java
@@ -128,7 +128,7 @@ public class RrdSyncThreadPool
      * If there is a SecurityManager, it uses the group of System.getSecurityManager(), else the group
      * of the thread instantiating this DaemonThreadFactory. Each new thread is created as a daemon thread
      * with priority Thread.NORM_PRIORITY. New threads have names accessible via Thread.getName()
-     * of "<pool-name> Pool [Thread-M]", where M is the sequence number of the thread created by this factory.
+     * of "&lt;pool-name&gt; Pool [Thread-M]", where M is the sequence number of the thread created by this factory.
      */
     static class DaemonThreadFactory implements ThreadFactory
     {
diff --git a/apps/jrobin/java/src/org/rrd4j/core/jrrd/RRDFile.java b/apps/jrobin/java/src/org/rrd4j/core/jrrd/RRDFile.java
index aac650941bf245d195ee3b303e3a750a56fe1a10..ccc313812d79915335f7cf76d47c3e83fafc1996 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/jrrd/RRDFile.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/jrrd/RRDFile.java
@@ -13,7 +13,7 @@ import org.rrd4j.core.InvalidRrdException;
 /**
  * This class is used read information from an RRD file. Writing
  * to RRD files is not currently supported. It uses NIO's RandomAccessFile to read the file
- * <p/>
+ *
  * Currently this can read RRD files that were generated on Solaris (Sparc)
  * and Linux (x86).
  *
diff --git a/apps/jrobin/java/src/org/rrd4j/core/jrrd/UnivalArray.java b/apps/jrobin/java/src/org/rrd4j/core/jrrd/UnivalArray.java
index 5d10be1ecfb44b79cb9b8c8b73cbb21ca3b49ba0..2f62df798603708f517f6b092b05b338f7132e84 100644
--- a/apps/jrobin/java/src/org/rrd4j/core/jrrd/UnivalArray.java
+++ b/apps/jrobin/java/src/org/rrd4j/core/jrrd/UnivalArray.java
@@ -7,7 +7,7 @@ import java.nio.ByteOrder;
 /**
  * This class is used to read a unival from a file
  * unival is a rrdtool type, defined in rrd_format.h
- * @author Fabrice Bacchella <fbacchella@spamcop.net>
+ * @author Fabrice Bacchella fbacchella@spamcop.net
  *
  */
 class UnivalArray {
diff --git a/apps/jrobin/java/src/org/rrd4j/data/Source.java b/apps/jrobin/java/src/org/rrd4j/data/Source.java
index 6a79c6c5c00d54d80c08eb6be2ab5bbb94374c82..113ce907cd24ec1ff4b6b795927a6edec0cd285d 100644
--- a/apps/jrobin/java/src/org/rrd4j/data/Source.java
+++ b/apps/jrobin/java/src/org/rrd4j/data/Source.java
@@ -34,7 +34,7 @@ abstract class Source {
      * @param tStart
      * @param tEnd
      * @return
-     * @deprecated This method is deprecated. Uses instance of {@link org.rrd4j.data.Variable}, used with {@link org.rrd4j.data.DataProcessor.addDatasource(String, String, Variable)}
+     * @deprecated This method is deprecated. Uses instance of {@link org.rrd4j.data.Variable}, used with DataProcessor.addDatasource(String, String, Variable)
      */
     @Deprecated
     Aggregates getAggregates(long tStart, long tEnd) {
@@ -47,7 +47,7 @@ abstract class Source {
      * @param tEnd
      * @param percentile
      * @return
-     * @deprecated This method is deprecated. Uses instance of {@link org.rrd4j.data.Variable.PERCENTILE}, used with {@link org.rrd4j.data.DataProcessor.addDatasource(String, String, Variable)}
+     * @deprecated This method is deprecated. Uses instance of {@link org.rrd4j.data.Variable.PERCENTILE}, used with DataProcessor.addDatasource(String, String, Variable)
      */
     @Deprecated
     double getPercentile(long tStart, long tEnd, double percentile) {