diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 3e07ac63002..acf1a461282 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -899,7 +899,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a boolean and then terminate the line.  This method behaves as
+     * Prints a boolean and then terminates the line.  This method behaves as
      * though it invokes {@link #print(boolean)} and then
      * {@link #println()}.
      *
@@ -917,7 +917,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a character and then terminate the line.  This method behaves as
+     * Prints a character and then terminates the line.  This method behaves as
      * though it invokes {@link #print(char)} and then
      * {@link #println()}.
      *
@@ -935,7 +935,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints an integer and then terminate the line.  This method behaves as
+     * Prints an integer and then terminates the line.  This method behaves as
      * though it invokes {@link #print(int)} and then
      * {@link #println()}.
      *
@@ -953,7 +953,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a long and then terminate the line.  This method behaves as
+     * Prints a long and then terminates the line.  This method behaves as
      * though it invokes {@link #print(long)} and then
      * {@link #println()}.
      *
@@ -971,7 +971,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a float and then terminate the line.  This method behaves as
+     * Prints a float and then terminates the line.  This method behaves as
      * though it invokes {@link #print(float)} and then
      * {@link #println()}.
      *
@@ -989,7 +989,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a double and then terminate the line.  This method behaves as
+     * Prints a double and then terminates the line.  This method behaves as
      * though it invokes {@link #print(double)} and then
      * {@link #println()}.
      *
@@ -1007,7 +1007,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints an array of characters and then terminate the line.  This method
+     * Prints an array of characters and then terminates the line.  This method
      * behaves as though it invokes {@link #print(char[])} and
      * then {@link #println()}.
      *
@@ -1025,7 +1025,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints a String and then terminate the line.  This method behaves as
+     * Prints a String and then terminates the line.  This method behaves as
      * though it invokes {@link #print(String)} and then
      * {@link #println()}.
      *
@@ -1043,7 +1043,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Prints an Object and then terminate the line.  This method calls
+     * Prints an Object and then terminates the line.  This method calls
      * at first String.valueOf(x) to get the printed object's string value,
      * then behaves as
      * though it invokes {@link #print(String)} and then
diff --git a/src/java.base/share/classes/java/io/WriteAbortedException.java b/src/java.base/share/classes/java/io/WriteAbortedException.java
index 4ceaa905eab..ce725e010da 100644
--- a/src/java.base/share/classes/java/io/WriteAbortedException.java
+++ b/src/java.base/share/classes/java/io/WriteAbortedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@ package java.io;
  * write operation.  Thrown during a read operation when one of the
  * ObjectStreamExceptions was thrown during a write operation.  The
  * exception that terminated the write can be found in the detail
- * field. The stream is reset to it's initial state and all references
+ * field. The stream is reset to its initial state and all references
  * to objects already deserialized are discarded.
  *
  * @since   1.1
diff --git a/src/java.base/share/classes/java/lang/Throwable.java b/src/java.base/share/classes/java/lang/Throwable.java
index e66f1cecd6a..26c584bc865 100644
--- a/src/java.base/share/classes/java/lang/Throwable.java
+++ b/src/java.base/share/classes/java/lang/Throwable.java
@@ -350,9 +350,8 @@ public class Throwable implements Serializable {
      * @param  message the detail message.
      * @param cause the cause.  (A {@code null} value is permitted,
      * and indicates that the cause is nonexistent or unknown.)
-     * @param enableSuppression whether or not suppression is enabled or disabled
-     * @param writableStackTrace whether or not the stack trace should be
-     *                           writable
+     * @param enableSuppression whether or not suppression is enabled
+     * @param writableStackTrace whether or not the stack trace is writable
      *
      * @see OutOfMemoryError
      * @see NullPointerException
@@ -552,7 +551,7 @@ public class Throwable implements Serializable {
      * stack trace of the exception that was caused by this exception (the
      * "enclosing" exception).  This shorthand can greatly reduce the length
      * of the output in the common case where a wrapped exception is thrown
-     * from same method as the "causative exception" is caught.  The above
+     * from the same method as the "causative exception" is caught.  The above
      * example was produced by running the program:
      * <pre>
      * public class Junk {
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java b/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java
index 605d0521dfb..07e1d041621 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ final class LambdaProxyClassArchive {
     /**
      * Registers the lambdaProxyClass into CDS archive.
      * The VM will store the lambdaProxyClass into a hash table
-     * using the first six argumennts as the key.
+     * using the first six arguments as the key.
      *
      * CDS only archives lambda proxy class if it's not serializable
      * and no marker interfaces and no additional bridges, and if it is
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 2e86c75136a..9e25dd5bfc2 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -4421,7 +4421,7 @@ return mh1;
      * <p>
      * Misaligned access, and therefore atomicity guarantees, may be determined
      * for {@code byte[]} arrays without operating on a specific array.  Given
-     * an {@code index}, {@code T} and it's corresponding boxed type,
+     * an {@code index}, {@code T} and its corresponding boxed type,
      * {@code T_BOX}, misalignment may be determined as follows:
      * <pre>{@code
      * int sizeOfT = T_BOX.BYTES;  // size in bytes of T
@@ -4508,7 +4508,7 @@ return mh1;
      * <p>
      * Misaligned access, and therefore atomicity guarantees, may be determined
      * for a {@code ByteBuffer}, {@code bb} (direct or otherwise), an
-     * {@code index}, {@code T} and it's corresponding boxed type,
+     * {@code index}, {@code T} and its corresponding boxed type,
      * {@code T_BOX}, as follows:
      * <pre>{@code
      * int sizeOfT = T_BOX.BYTES;  // size in bytes of T
diff --git a/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java b/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java
index 44419ae26dd..6613c2d7640 100644
--- a/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java
+++ b/src/java.base/share/classes/java/nio/file/FileChannelLinesSpliterator.java
@@ -53,13 +53,13 @@ import jdk.internal.access.JavaNioAccess;
  *
  * <p>
  * When the root spliterator is first split a mapped byte buffer will be created
- * over the file for it's size that was observed when the stream was created.
+ * over the file for its size that was observed when the stream was created.
  * Thus a mapped byte buffer is only required for parallel stream execution.
  * Sub-spliterators will share that mapped byte buffer.  Splitting will use the
  * mapped byte buffer to find the closest line feed characters(s) to the left or
  * right of the mid-point of covered range of bytes of the file.  If a line feed
  * is found then the spliterator is split with returned spliterator containing
- * the identified line feed characters(s) at the end of it's covered range of
+ * the identified line feed characters(s) at the end of its covered range of
  * bytes.
  *
  * <p>
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
index e93c5e6af93..f1ff9ef9601 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -809,7 +809,7 @@ public final class Security {
      * setProperty() was either "package.access" or
      * "package.definition", we need to signal to the SecurityManager
      * class that the value has just changed, and that it should
-     * invalidate it's local cache values.
+     * invalidate its local cache values.
      */
     private static void invalidateSMCache(String key) {
 
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index 333b75f45b0..06999bc7bf3 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -281,7 +281,7 @@ public class Properties extends Hashtable<Object,Object> {
      *
      * <p>
      * The key contains all of the characters in the line starting
-     * with the first non-white space character and up to, but not
+     * with the first non-whitespace character and up to, but not
      * including, the first unescaped {@code '='},
      * {@code ':'}, or white space character other than a line
      * terminator. All of these key termination characters may be
@@ -293,7 +293,7 @@ public class Properties extends Hashtable<Object,Object> {
      * would be the two-character key {@code ":="}.  Line
      * terminator characters can be included using {@code \r} and
      * {@code \n} escape sequences.  Any white space after the
-     * key is skipped; if the first non-white space character after
+     * key is skipped; if the first non-whitespace character after
      * the key is {@code '='} or {@code ':'}, then it is
      * ignored and any white space characters after it are also
      * skipped.  All remaining characters on the line become part of
diff --git a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
index 2e18ef02094..9517bc4f7b8 100644
--- a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
@@ -581,8 +581,8 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
 
     /**
      * Get the output shape of the pipeline.  If the pipeline is the head,
-     * then it's output shape corresponds to the shape of the source.
-     * Otherwise, it's output shape corresponds to the output shape of the
+     * then its output shape corresponds to the shape of the source.
+     * Otherwise, its output shape corresponds to the output shape of the
      * associated operation.
      *
      * @return the output shape