Merge branch 'nox/fix-javadoc' into maint

OTP-12050

* nox/fix-javadoc:
  Fix a few javadoc errors

9 files changed, 22 insertions, 16 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
index 9ba6a4a0ab..7aa30eef4a 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
@@ -266,7 +266,7 @@ public abstract class AbstractConnection extends Thread {
      * 
      * @param dest
      *            the Erlang PID of the remote process.
-     * @param msg
+     * @param payload
      *            the encoded message to send.
      * 
      * @exception java.io.IOException
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
index 8e8bd473c8..e7a9d1092c 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
@@ -404,7 +404,7 @@ public class OtpConnection extends AbstractConnection {
      * 
      * @param dest
      *                the Erlang PID of the remote process.
-     * @param msg
+     * @param payload
      *                the encoded message to send.
      * 
      * @exception java.io.IOException
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
index 7e3e2a7296..84b1355c54 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
@@ -51,8 +51,8 @@ public class OtpErlangLong extends OtpErlangObject implements Serializable,
     /**
      * Create an Erlang integer from the given value.
      * 
-     * @param val
-     *                the long value to use.
+     * @param v
+     *                the big integer value to use.
      */
     public OtpErlangLong(final BigInteger v) {
 	if (v == null) {
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
index 03c18e55a2..0254edd5da 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
@@ -58,15 +58,23 @@ public class OtpErlangMap extends OtpErlangObject implements Serializable,
     /**
      * Create a map from an array of terms.
      * 
-     * @param elems
+     * @param keys
      *            the array of terms to create the map from.
-     * @param start
-     *            the offset of the first term to insert.
+     * @param kstart
+     *            the offset of the first key to insert.
+     * @param kcount
+     *            the number of keys to insert.
+     * @param values
+     *            the array of values to create the map from.
+     * @param vstart
+     *            the offset of the first value to insert.
      * @param vcount
-     *            the number of terms to insert.
+     *            the number of values to insert.
      * 
      * @exception java.lang.IllegalArgumentException
      *                if any array is empty (null) or contains null elements.
+     * @exception java.lang.IllegalArgumentException
+     *                if kcount and vcount differ.
      */
     public OtpErlangMap(final OtpErlangObject[] keys, final int kstart,
 	    final int kcount, final OtpErlangObject[] values, final int vstart,
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
index fe81ce302d..f75e4353d0 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
@@ -162,7 +162,7 @@ public class OtpErlangPid extends OtpErlangObject implements Serializable,
      * Determine if two PIDs are equal. PIDs are equal if their components are
      * equal.
      * 
-     * @param port
+     * @param o
      *                the other PID to compare to.
      * 
      * @return true if the PIDs are equal, false otherwise.
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
index 6766b52ce5..a5e202c473 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
@@ -41,8 +41,6 @@ public class OtpErlangString extends OtpErlangObject implements Serializable,
 
     /**
      * Create an Erlang string from a list of integers.
-     * 
-     * @return an Erlang string with Unicode code units.
      *
      * @throws OtpErlangException
      *                for non-proper and non-integer lists.
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
index 0fd93b09f4..4a4a1e7f8f 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
@@ -69,6 +69,7 @@ package com.ericsson.otp.erlang;
  * notify other parties in a timely manner.
  * </p>
  * 
+ * <p>
  * When retrieving messages from a mailbox that has received an exit signal, an
  * {@link OtpErlangExit OtpErlangExit} exception will be raised. Note that the
  * exception is queued in the mailbox along with other messages, and will not be
@@ -420,7 +421,6 @@ public class OtpMbox {
 
     /**
      * Equivalent to <code>exit(new OtpErlangAtom(reason))</code>.
-     * </p>
      * 
      * @see #exit(OtpErlangObject)
      */
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
index 6f507bf4bb..31a5d0fb8f 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
@@ -30,14 +30,14 @@ package com.ericsson.otp.erlang;
  * </p>
  * 
  * <p>
- * The header information that is available is as follows: <lu>
+ * The header information that is available is as follows: <ul>
  * <li> a tag indicating the type of message
  * <li> the intended recipient of the message, either as a
  * {@link OtpErlangPid pid} or as a String, but never both.
  * <li> (sometimes) the sender of the message. Due to some eccentric
  * characteristics of the Erlang distribution protocol, not all messages have
  * information about the sending process. In particular, only messages whose tag
- * is {@link OtpMsg#regSendTag regSendTag} contain sender information. </lu>
+ * is {@link OtpMsg#regSendTag regSendTag} contain sender information. </ul>
  * 
  * <p>
  * Message are sent using the Erlang external format (see separate
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index a78423db44..c98790bbd4 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -202,7 +202,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
     /**
      * Write an array of bytes to the stream.
      * 
-     * @param buf
+     * @param bytes
      *            the array of bytes to write.
      * 
      */
@@ -637,7 +637,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      * Write a positive short to the stream. The short is interpreted as a two's
      * complement unsigned short even if it is negative.
      * 
-     * @param s
+     * @param us
      *            the short to use.
      */
     public void write_ushort(final short us) {