--- a/jdk/src/share/classes/java/util/zip/ZipFile.java	Mon Apr 27 12:08:41 2009 -0700
+++ b/jdk/src/share/classes/java/util/zip/ZipFile.java	Fri May 01 12:06:14 2009 -0700
@@ -154,7 +154,7 @@
      * @param file the ZIP file to be opened for reading
      * @param mode the mode in which the file is to be opened
      * @param charset
-     *        the {@link java.nio.charset.Charset {@code charset}} to
+     *        the {@linkplain java.nio.charset.Charset charset} to
      *        be used to decode the ZIP entry name and comment that are not
      *        encoded by using UTF-8 encoding (indicated by entry's general
      *        purpose flag).
@@ -206,7 +206,7 @@
      *
      * @param name the name of the zip file
      * @param charset
-     *        the {@link java.nio.charset.Charset {@code charset}} to
+     *        the {@linkplain java.nio.charset.Charset charset} to
      *        be used to decode the ZIP entry name and comment that are not
      *        encoded by using UTF-8 encoding (indicated by entry's general
      *        purpose flag).
@@ -230,7 +230,7 @@
      * Opens a ZIP file for reading given the specified File object.
      * @param file the ZIP file to be opened for reading
      * @param charset
-     *        The {@link java.nio.charset.Charset {@code charset}} to be
+     *        The {@linkplain java.nio.charset.Charset charset} to be
      *        used to decode the ZIP entry name and comment (ignored if
      *        the <a href="package-summary.html#lang_encoding"> language
      *        encoding bit</a> of the ZIP entry's general purpose bit

--- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java	Mon Apr 27 12:08:41 2009 -0700
+++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java	Fri May 01 12:06:14 2009 -0700
@@ -84,7 +84,7 @@
      * @param in the actual input stream
      *
      * @param charset
-     *        The {@link java.nio.charset.Charset {@code charset}} to be
+     *        The {@linkplain java.nio.charset.Charset charset} to be
      *        used to decode the ZIP entry name (ignored if the
      *        <a href="package-summary.html#lang_encoding"> language
      *        encoding bit</a> of the ZIP entry's general purpose bit

--- a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	Mon Apr 27 12:08:41 2009 -0700
+++ b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	Fri May 01 12:06:14 2009 -0700
@@ -108,7 +108,7 @@
      *
      * @param out the actual output stream
      *
-     * @param charset the {@link java.nio.charset.Charset </code>charset<code>}
+     * @param charset the {@linkplain java.nio.charset.Charset charset}
      *                to be used to encode the entry names and comments
      *
      * @since 1.7