merge of '3cd63a1366e2ca171fb8c348927047e0c0b7393d'

     and 'a461c087d600d3fa0b5da2085d1dd97aff721d44'

core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java

@@ -55,7 +55,7 @@ public final class I2PDatagramDissector {
      * Load an I2P repliable datagram into the dissector.
      * Does NOT verify the signature.
      *
-     * @param non-null dgram I2P repliable datagram to be loader
+     * @param dgram non-null I2P repliable datagram to be loader
      *
      * @throws DataFormatException If there's an error in the datagram format
      */

core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java

@@ -62,7 +62,7 @@ public final class I2PDatagramMaker {
     /**
      * Make a repliable I2P datagram containing the specified payload.
      *
-     * @param non-null payload Bytes to be contained in the I2P datagram.
+     * @param payload non-null Bytes to be contained in the I2P datagram.
      */
     public byte[] makeI2PDatagram(byte[] payload) {
         sxDGram.reset();