diff --git a/src/share/classes/java/io/EOFException.java b/src/share/classes/java/io/EOFException.java
index ed6ca0fad1209113dbd9831cc6ddff1c5b967da6..0f9a326c3fa6173ed27edd72f013c41594df602a 100644
--- a/src/share/classes/java/io/EOFException.java
+++ b/src/share/classes/java/io/EOFException.java
@@ -32,7 +32,6 @@ package java.io;
  * This exception is mainly used by data input streams to signal end of
  * stream. Note that many other input operations return a special value on
  * end of stream rather than throwing an exception.
- * <p>
  *
  * @author  Frank Yellin
  * @see     java.io.DataInputStream
diff --git a/src/share/classes/java/io/FilePermission.java b/src/share/classes/java/io/FilePermission.java
index 89f2c33287a05736876f7eccae467ae1ba8cc04f..bac39d3045961be07a2ce8bf88485ea67bf74c5a 100644
--- a/src/share/classes/java/io/FilePermission.java
+++ b/src/share/classes/java/io/FilePermission.java
@@ -380,7 +380,7 @@ public final class FilePermission extends Permission implements Serializable {
     /**
      * Checks two FilePermission objects for equality. Checks that <i>obj</i> is
      * a FilePermission, and has the same pathname and actions as this object.
-     * <P>
+     *
      * @param obj the object we are testing for equality with this object.
      * @return <code>true</code> if obj is a FilePermission, and has the same
      *          pathname and actions as this FilePermission object,
diff --git a/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
index aa56bbf38a249b91be128b67b0ed548f1df24f48..8f7cdd6490e2ab1f23d8f97a74acb190a0e5fa91 100644
--- a/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
+++ b/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
@@ -66,7 +66,6 @@ import java.util.concurrent.TimeUnit;
  *     <th>Description</th>
  *   </tr>
  *   <tr>
- *   <tr>
  *     <td> {@code java.nio.channels.DefaultThreadPool.threadFactory} </td>
  *     <td> The value of this property is taken to be the fully-qualified name
  *     of a concrete {@link java.util.concurrent.ThreadFactory ThreadFactory}
diff --git a/src/share/classes/java/nio/channels/AsynchronousFileChannel.java b/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
index c40fb3762878ad1daeb3bcffa7f2a37a60cee2f8..24ec4df7490c999b2d4671a2cd2c1fe43feec3a2 100644
--- a/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
+++ b/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
@@ -178,7 +178,7 @@ public abstract class AsynchronousFileChannel
      *   written synchronously to the underlying storage device. (see <a
      *   href="../file/package-summary.html#integrity"> Synchronized I/O file
      *   integrity</a>). </td>
-     * <tr>
+     * </tr>
      * <tr>
      *   <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
      *   <td> Requires that every update to the file's content be written
diff --git a/src/share/classes/java/nio/channels/FileChannel.java b/src/share/classes/java/nio/channels/FileChannel.java
index 57ce3e10d9ea8970e5040a4d3ad19bd7f3d88167..f6f332ae6b9632dd94e5abf9869a2ce046ecb101 100644
--- a/src/share/classes/java/nio/channels/FileChannel.java
+++ b/src/share/classes/java/nio/channels/FileChannel.java
@@ -229,7 +229,7 @@ public abstract class FileChannel
      *   written synchronously to the underlying storage device. (see <a
      *   href="../file/package-summary.html#integrity"> Synchronized I/O file
      *   integrity</a>). </td>
-     * <tr>
+     * </tr>
      * <tr>
      *   <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
      *   <td> Requires that every update to the file's content be written
diff --git a/src/share/classes/java/nio/charset/Charset.java b/src/share/classes/java/nio/charset/Charset.java
index 3d946f1d4bc2eadfd2f1119a5fe1d880500d439d..ae0566174b55f958fe1fd93b1f44f76b31e13d68 100644
--- a/src/share/classes/java/nio/charset/Charset.java
+++ b/src/share/classes/java/nio/charset/Charset.java
@@ -118,10 +118,10 @@ import sun.security.action.GetPropertyAction;
  * {@link java.io.InputStreamReader#getEncoding InputStreamReader} and {@link
  * java.io.OutputStreamWriter#getEncoding OutputStreamWriter} classes.
  *
- * <p><a name="iana">If a charset listed in the <a
+ * <p><a name="iana"> </a>If a charset listed in the <a
  * href="http://www.iana.org/assignments/character-sets"><i>IANA Charset
  * Registry</i></a> is supported by an implementation of the Java platform then
- * its canonical name must be the name listed in the registry.</a>  Many charsets
+ * its canonical name must be the name listed in the registry. Many charsets
  * are given more than one name in the registry, in which case the registry
  * identifies one of the names as <i>MIME-preferred</i>.  If a charset has more
  * than one registry name then its canonical name must be the MIME-preferred
diff --git a/src/share/classes/java/nio/file/FileSystem.java b/src/share/classes/java/nio/file/FileSystem.java
index 2a961fb8ecfd8b97749999b0ad715bcbb0782d24..a5dbe0f1d49eb6a55f9c79f71be42f1a77944cee 100644
--- a/src/share/classes/java/nio/file/FileSystem.java
+++ b/src/share/classes/java/nio/file/FileSystem.java
@@ -325,7 +325,6 @@ public abstract class FileSystem
      *   <td>Matches file names containing a dot</td>
      * </tr>
      * <tr>
-     * <tr>
      *   <td>{@code *.{java,class}}</td>
      *   <td>Matches file names ending with {@code .java} or {@code .class}</td>
      * </tr>
diff --git a/src/share/classes/java/nio/file/Files.java b/src/share/classes/java/nio/file/Files.java
index 920ac93d0979c01ad67122900fdc66006a92f306..5c8d8be171a7028affb508c6dd94f57c41cfef31 100644
--- a/src/share/classes/java/nio/file/Files.java
+++ b/src/share/classes/java/nio/file/Files.java
@@ -284,7 +284,7 @@ public final class Files {
      *   written synchronously to the underlying storage device. (see <a
      *   href="package-summary.html#integrity"> Synchronized I/O file
      *   integrity</a>). </td>
-     * <tr>
+     * </tr>
      * <tr>
      *   <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
      *   <td> Requires that every update to the file's content be written
diff --git a/src/share/classes/java/nio/package.html b/src/share/classes/java/nio/package.html
index 27059e7df3f8644096e8d79520ca4d7ed172a5de..1f02634d65ea5b953869f3a049822e285ad05e27 100644
--- a/src/share/classes/java/nio/package.html
+++ b/src/share/classes/java/nio/package.html
@@ -62,7 +62,7 @@ the platform's default implementations or to construct alternative
 implementations.
 
 
-<a name="buffers">
+<a name="buffers"> </a>
 
 <blockquote><table cellspacing=1 cellpadding=0 summary="Description of the various buffers">
   <tr><th><p align="left">Buffers</p></th><th><p align="left">Description</p></th></tr> 
@@ -115,7 +115,7 @@ other buffer classes:
   best effort to perform native I/O operations directly upon it.  </p></li>
 
   <li><p> A byte buffer can be created by {@link
-  java.nio.channels.FileChannel#map </code><i>mapping</i><code>} a region of a
+  java.nio.channels.FileChannel#map <i>mapping</i>} a region of a
   file directly into memory, in which case a few additional file-related
   operations defined in the {@link java.nio.MappedByteBuffer} class are
   available.  </p></li>