[pull] master from apache:master

src/changes/changes.xml

@@ -136,6 +136,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory" due-to="Gary Gregory, Shan Jiang" issue="COMPRESS-719">CPConstant subclasses are missing optional hashCode() and equals() to match its Comparable.compareTo().</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">CPUTF8 is missing optional hashCode() and equals() to match its Comparable.compareTo().</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Pack200 class IcBands.IcTuple implements equals() but not hashCode().</action>
+      <action type="fix" dev="ggregory" due-to="Martin Wiesner">Fix typos in Javadoc and comments #761.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add MemoryLimitException.MemoryLimitException(long, long).</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add CompressException.CompressException(String, Object...).</action>

src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java

@@ -311,7 +311,7 @@ public Builder setSeekableByteChannel(final SeekableByteChannel seekableByteChan
         /**
          * Sets whether {@link SevenZFile} will try to recover broken archives where the CRC of the file's metadata is 0.
          * <p>
-         * This special kind of broken archive is encountered when mutli volume archives are closed prematurely. If you enable this option SevenZFile will trust
+         * This special kind of broken archive is encountered when multi volume archives are closed prematurely. If you enable this option SevenZFile will trust
          * data that looks as if it could contain metadata of an archive and allocate big amounts of memory. It is strongly recommended to not enable this
          * option without setting {@link #setMaxMemoryLimitKb(int)} at the same time.
          * </p>

src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFileOptions.java

@@ -72,7 +72,7 @@ public Builder withMaxMemoryLimitInKb(final int maxMemoryLimitKiB) {
         /**
          * Sets whether {@link SevenZFile} will try to recover broken archives where the CRC of the file's metadata is 0.
          * <p>
-         * This special kind of broken archive is encountered when mutli volume archives are closed prematurely. If you enable this option SevenZFile will trust
+         * This special kind of broken archive is encountered when multi volume archives are closed prematurely. If you enable this option SevenZFile will trust
          * data that looks as if it could contain metadata of an archive and allocate big amounts of memory. It is strongly recommended to not enable this
          * option without setting {@link #withMaxMemoryLimitInKb} at the same time.
          * </p>

src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java

@@ -279,7 +279,7 @@ void reset() {
      * @param b      the byte array to write.
      * @param offset the start position to write from.
      * @param length the number of bytes to write.
-     * @param method the comrpession method to use.
+     * @param method the compression method to use.
      * @return the number of bytes written to the stream this time.
      * @throws IOException on error.
      */

src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java

@@ -500,7 +500,7 @@ private void reset() {
 
     /**
      * <p>
-     * Sets the acccess time as a {@link FileTime} of this ZIP entry. Supplied value is truncated to per-second precision (milliseconds zeroed-out).
+     * Sets the access time as a {@link FileTime} of this ZIP entry. Supplied value is truncated to per-second precision (milliseconds zeroed-out).
      * </p>
      * <p>
      * Note: the setters for flags and timestamps are decoupled. Even if the timestamp is not-null, it will only be written out if the corresponding bit in the

src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java

@@ -39,7 +39,7 @@
  * The raw Snappy format requires the uncompressed size to be written at the beginning of the stream using a varint representation, i.e. the number of bytes
  * needed to write the information is not known before the uncompressed size is known. We've chosen to make the uncompressedSize a parameter of the constructor
  * in favor of buffering the whole output until the size is known. When using the {@link FramedSnappyCompressorOutputStream} this limitation is taken care of by
- * the warpping framing format.
+ * the wrapping framing format.
  * </p>
  *
  * @see <a href="https://github.com/google/snappy/blob/master/format_description.txt">Snappy compressed format description</a>
@@ -85,10 +85,10 @@ public class SnappyCompressorOutputStream extends CompressorOutputStream<OutputS
     private static final int MAX_MATCH_LENGTH = 64;
 
     /**
-     * Returns a builder correctly configured for the Snappy algorithm using the gven block size.
+     * Returns a builder correctly configured for the Snappy algorithm using the given block size.
      *
      * @param blockSize the block size.
-     * @return a builder correctly configured for the Snappy algorithm using the gven block size.
+     * @return a builder correctly configured for the Snappy algorithm using the given block size.
      */
     public static Parameters.Builder createParameterBuilder(final int blockSize) {
         // the max offset and max literal length defined by the format

src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java

@@ -241,7 +241,7 @@ public int read() throws IOException {
             count(ret == -1 ? -1 : 1);
             return ret;
         } catch (final org.tukaani.xz.MemoryLimitException e) {
-            // Convert to Commons Compress MemoryLimtException
+            // Convert to Commons Compress MemoryLimitException
             throw newMemoryLimitException(e);
         }
     }
@@ -253,7 +253,7 @@ public int read(final byte[] buf, final int off, final int len) throws IOExcepti
             count(ret);
             return ret;
         } catch (final org.tukaani.xz.MemoryLimitException e) {
-            // Convert to Commons Compress MemoryLimtException
+            // Convert to Commons Compress MemoryLimitException
             throw newMemoryLimitException(e);
         }
     }
@@ -263,7 +263,7 @@ public long skip(final long n) throws IOException {
         try {
             return IOUtils.skip(in, n);
         } catch (final org.tukaani.xz.MemoryLimitException e) {
-            // Convert to Commons Compress MemoryLimtException
+            // Convert to Commons Compress MemoryLimitException
             throw newMemoryLimitException(e);
         }
     }

src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZHugeNextHeaderTest.java

@@ -105,7 +105,7 @@ void test() throws IOException {
             // For example: -Xmx128m
             ignore.printStackTrace();
         } catch (final ArchiveException ignore) {
-            // If a MemoryLimitException isn't thrown beause a lot of memory is available, then we get this failure:
+            // If a MemoryLimitException isn't thrown because a lot of memory is available, then we get this failure:
             // org.apache.commons.compress.archivers.ArchiveException: Broken or unsupported archive: no Header
         }
     }