diff --git a/src/share/classes/javax/net/ssl/HostnameVerifier.java b/src/share/classes/javax/net/ssl/HostnameVerifier.java
index 402a8cd66a2ea2665f601778179050974762d0ec..49b3163a00d48e864a761f4b5b9b8108248e1f20 100644
--- a/src/share/classes/javax/net/ssl/HostnameVerifier.java
+++ b/src/share/classes/javax/net/ssl/HostnameVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, 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
@@ -40,7 +40,6 @@ package javax.net.ssl;
  * verification fail.
  *
  * @author Brad R. Wetmore
- * @see HostnameVerifierFactory
  * @since 1.4
  */
 
diff --git a/src/share/classes/javax/net/ssl/SNIHostName.java b/src/share/classes/javax/net/ssl/SNIHostName.java
index 6f2092c662fa96fd2ddfb1de42dbdab01566d5e6..1d02104e1724d0f05f5c5393de707edf80565afb 100644
--- a/src/share/classes/javax/net/ssl/SNIHostName.java
+++ b/src/share/classes/javax/net/ssl/SNIHostName.java
@@ -135,7 +135,8 @@ public final class SNIHostName extends SNIServerName {
      * <A HREF="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</A>,
      * <A HREF="http://www.ietf.org/rfc/rfc1122.txt">RFC 1122</A>,
      * <A HREF="http://www.ietf.org/rfc/rfc1123.txt">RFC 1123</A>)
-     * for {@code encoded} argument, or use {@link SNIHostName(String)} instead.
+     * for {@code encoded} argument, or use
+     * {@link SNIHostName#SNIHostName(String)} instead.
      * <P>
      * The {@code encoded} argument is illegal if it:
      * <ul>
diff --git a/src/share/classes/javax/net/ssl/SNIMatcher.java b/src/share/classes/javax/net/ssl/SNIMatcher.java
index 5025b99ed79952c7ef5fc50dba4f6b181c3481ee..a6c9ab92ee21c7991af54f1d907a1557697cd8fb 100644
--- a/src/share/classes/javax/net/ssl/SNIMatcher.java
+++ b/src/share/classes/javax/net/ssl/SNIMatcher.java
@@ -44,7 +44,7 @@ package javax.net.ssl;
  * @see SNIServerName
  * @see SNIHostName
  * @see SSLParameters#getSNIMatchers()
- * @see SSLParameters#setSNIMatchers(Collection<SNIMatcher>)
+ * @see SSLParameters#setSNIMatchers(Collection)
  *
  * @since 1.8
  */
diff --git a/src/share/classes/javax/net/ssl/SNIServerName.java b/src/share/classes/javax/net/ssl/SNIServerName.java
index afc2286d761319e4b417cf98cb533bb50a877c3e..1ef9d05c21e300eb23935997771588f6ce9bfff0 100644
--- a/src/share/classes/javax/net/ssl/SNIServerName.java
+++ b/src/share/classes/javax/net/ssl/SNIServerName.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
  * methods that can change the state of an instance once it has been created.
  *
  * @see SSLParameters#getServerNames()
- * @see SSLParameters#setServerNames(List<SNIServerName>)
+ * @see SSLParameters#setServerNames(List)
  *
  * @since 1.8
  */
diff --git a/src/share/classes/javax/net/ssl/SSLParameters.java b/src/share/classes/javax/net/ssl/SSLParameters.java
index c499b666091ebeabc79460750e59ec43f8cd3904..1dc6f3315d0b81a99c83c68d4326f00f1e7fc388 100644
--- a/src/share/classes/javax/net/ssl/SSLParameters.java
+++ b/src/share/classes/javax/net/ssl/SSLParameters.java
@@ -343,7 +343,7 @@ public class SSLParameters {
      * @return null or an immutable list of non-null {@link SNIServerName}s
      *
      * @see List
-     * @see #setServerNames(List<SNIServerName>)
+     * @see #setServerNames(List)
      *
      * @since 1.8
      */
@@ -418,7 +418,7 @@ public class SSLParameters {
      * @return null or an immutable collection of non-null {@link SNIMatcher}s
      *
      * @see SNIMatcher
-     * @see #setSNIMatchers(Collection<SNIMatcher>)
+     * @see #setSNIMatchers(Collection)
      *
      * @since 1.8
      */
diff --git a/src/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/share/classes/javax/net/ssl/SSLSocketFactory.java
index 151880d026f21cdf98831737399014e14cede821..5c6fdc0faf8fc080323928b884ee669566bff7ad 100644
--- a/src/share/classes/javax/net/ssl/SSLSocketFactory.java
+++ b/src/share/classes/javax/net/ssl/SSLSocketFactory.java
@@ -198,8 +198,8 @@ public abstract class SSLSocketFactory extends SocketFactory
      * (RFC6066)</A>).  Data that has been already removed from the
      * underlying {@link InputStream} should be loaded into the
      * {@code consumed} stream before this method is called, perhaps
-     * using a {@link ByteArrayInputStream}.  When this {@link Socket}
-     * begins handshaking, it will read all of the data in
+     * using a {@link java.io.ByteArrayInputStream}.  When this
+     * {@link Socket} begins handshaking, it will read all of the data in
      * {@code consumed} until it reaches {@code EOF}, then all further
      * data is read from the underlying {@link InputStream} as
      * usual.