diff --git a/core/java/src/gnu/getopt/Getopt.java b/core/java/src/gnu/getopt/Getopt.java
index 6ca1c6ee3ada0673b32ec147efd139a9bf468148..caf7f49cac90a653804e4aa2a0dbb94abe08154b 100644
--- a/core/java/src/gnu/getopt/Getopt.java
+++ b/core/java/src/gnu/getopt/Getopt.java
@@ -336,7 +336,7 @@ import java.text.MessageFormat;
* break;
* }
* //
- * for (int i = g.getOptind(); i < argv.length ; i++)
+ * for (int i = g.getOptind(); i < argv.length ; i++)
* System.out.println("Non option argv element: " + argv[i] + "\n");
* </pre>
* <p>
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index d71702d88b25c17330dd4ed1ab62a5b3b02790b2..5bfa3082ee916161d15ce353e33adeeb4b32eb2f 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -534,7 +534,7 @@ public abstract class NamingService {
* See also lookup(Hash, int).
*
* @param hostname must be {52 chars}.b32.i2p
- * @param timeout in seconds; <= 0 means use router default
+ * @param timeout in seconds; <= 0 means use router default
* @return dest or null
* @since 0.8.7
*/
@@ -546,7 +546,7 @@ public abstract class NamingService {
* Same as lookupBase32() but with the SHA256 Hash precalculated
* This implementation returns null.
*
- * @param timeout in seconds; <= 0 means use router default
+ * @param timeout in seconds; <= 0 means use router default
* @return dest or null
* @since 0.8.7
*/
diff --git a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
index 6f0c87ab351b813faa01dc8d74bfa89720c74bb5..5f5cedd7c95e260fb87cd24f474e0b99a7452767 100644
--- a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
+++ b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
@@ -429,11 +429,11 @@ public final class ElGamalAESEngine {
*
* In the router, we always use garlic messages. A garlic message with a single
* clove and zero data is about 84 bytes, so that's 123 bytes minimum. So any paddingSize
- * <= 128 is a no-op as every message will be at least 128 bytes
+ * <= 128 is a no-op as every message will be at least 128 bytes
* (Streaming, if used, adds more overhead).
*
* Outside the router, with a client using its own message format, the minimum size
- * is 48, so any paddingSize <= 48 is a no-op.
+ * is 48, so any paddingSize <= 48 is a no-op.
*
* Not included in the minimum is a 32-byte session tag for an existing session,
* or a 514-byte ElGamal block and several 32-byte session tags for a new session.
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
index 712fa7085ca952e37bf3087102a29715d9ea284f..65f791f95b66420d01fd632e90a5b86b4636ba09 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
@@ -862,7 +862,7 @@ public class GroupElement implements Serializable {
* Constant time.
* <p>
* Preconditions: (TODO: Check this applies here)
- * a[31] <= 127
+ * a[31] <= 127
* @param a = a[0]+256*a[1]+...+256^31 a[31]
* @return the GroupElement
*/
diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java
index 200423d8bffcb18171e162796bc21d4bdcea5323..f6ad769eab4dfa139f523d0fd7e22ecbc5321fd5 100644
--- a/core/java/src/net/i2p/data/Certificate.java
+++ b/core/java/src/net/i2p/data/Certificate.java
@@ -116,7 +116,7 @@ public class Certificate extends DataStructureImpl {
}
/**
- * @throws IllegalArgumentException if type < 0
+ * @throws IllegalArgumentException if type < 0
*/
public Certificate(int type, byte[] payload) {
if (type < 0)
@@ -131,7 +131,7 @@ public class Certificate extends DataStructureImpl {
}
/**
- * @throws IllegalArgumentException if type < 0
+ * @throws IllegalArgumentException if type < 0
* @throws IllegalStateException if already set
*/
public void setCertificateType(int type) {
diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java
index e716463cba56963517e3e49a6e7834ec64c33dd8..0fc4741c6571cac86566d30f51c5c4c193bedd05 100644
--- a/core/java/src/net/i2p/data/PrivateKeyFile.java
+++ b/core/java/src/net/i2p/data/PrivateKeyFile.java
@@ -253,7 +253,7 @@ public class PrivateKeyFile {
}
/**
- * @param padding null OK, must be non-null if spubkey length < 128
+ * @param padding null OK, must be non-null if spubkey length < 128
* @throws IllegalArgumentException on mismatch of spubkey and spk types
* @since 0.9.16
*/
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index a26312ebfaf82f33336d4056e4accae02833a7b6..9d4656cee60dcaf321ee7fc2051b50f1c309429d 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -607,9 +607,9 @@ public class EepGet {
/**
* Blocking fetch.
*
- * @param fetchHeaderTimeout <= 0 for none (proxy will timeout if none, none isn't recommended if no proxy)
- * @param totalTimeout <= 0 for default none
- * @param inactivityTimeout <= 0 for default 60 sec
+ * @param fetchHeaderTimeout <= 0 for none (proxy will timeout if none, none isn't recommended if no proxy)
+ * @param totalTimeout <= 0 for default none
+ * @param inactivityTimeout <= 0 for default 60 sec
*/
public boolean fetch(long fetchHeaderTimeout, long totalTimeout, long inactivityTimeout) {
_fetchHeaderTimeout = (int) Math.min(fetchHeaderTimeout, Integer.MAX_VALUE);
diff --git a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
index 72f726a8bfb886dc9d185df8581baf6fd6b03c72..5c8ef354628b0b7b72f7b9f746a3fffe58441813 100644
--- a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
+++ b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
@@ -73,7 +73,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl {
* Ignore, but save, the checksum, to be used later if necessary.
*
* @param maxLen read no more than this many bytes from data starting at offset, even if it is longer
- * This includes the type byte only if type < 0
+ * This includes the type byte only if type < 0
* @throws IllegalStateException if called twice, to protect saved checksum
*/
@Override
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
index 851c0dc82b70b2ccf52ac02939cde16f97755638..91acead40ebb4c94f7d91dd2f1e8f443298415b2 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
@@ -189,7 +189,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
* we can use a large buffer but prevent the reader from reading off the end.
*
* @param maxLen read no more than this many bytes from data starting at offset, even if it is longer
- * This includes the type byte only if type < 0
+ * This includes the type byte only if type < 0
* @since 0.8.12
*/
public int readBytes(byte data[], int type, int offset, int maxLen) throws I2NPMessageException {
diff --git a/router/java/src/net/i2p/router/tasks/ThreadDump.java b/router/java/src/net/i2p/router/tasks/ThreadDump.java
index b1f2b356d8e62f22a372e3c263a8fe10c1cddca4..79a4f90c296d9281bc91c7efa6938fa9b2078848 100644
--- a/router/java/src/net/i2p/router/tasks/ThreadDump.java
+++ b/router/java/src/net/i2p/router/tasks/ThreadDump.java
@@ -19,8 +19,8 @@ abstract class ThreadDump {
* It waits for the signal to complete (which should be fast)
* but does not wait for the dump itself.
*
- * @param secondsToWait if <= 0, don't wait
- * @return success, false if windows or no wrapper, true if secondsToWait <= 0,
+ * @param secondsToWait if <= 0, don't wait
+ * @return success, false if windows or no wrapper, true if secondsToWait <= 0,
false if timed out, dump result otherwise
*/
public static boolean dump(I2PAppContext context, int secondsToWait) {