diff a/src/jdk.net/share/classes/jdk/net/Sockets.java b/src/jdk.net/share/classes/jdk/net/Sockets.java
--- a/src/jdk.net/share/classes/jdk/net/Sockets.java
+++ b/src/jdk.net/share/classes/jdk/net/Sockets.java
@@ -76,10 +76,11 @@
      *
      * @param s the socket
      * @param name The socket option
      * @param value The value of the socket option. May be null for some
      *              options.
+     * @param <T> The type of the socket option
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
      *
      * @throws IllegalArgumentException if the value is not valid for
@@ -105,10 +106,11 @@
     /**
      * Returns the value of a socket option from a {@link java.net.Socket}
      *
      * @param s the socket
      * @param name The socket option
+     * @param <T> The type of the socket option
      *
      * @return The value of the socket option.
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
@@ -133,11 +135,12 @@
     /**
      * Sets the value of a socket option on a {@link java.net.ServerSocket}
      *
      * @param s the socket
      * @param name The socket option
-     * @param value The value of the socket option.
+     * @param value The value of the socket option
+     * @param <T> The type of the socket option
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
      *
      * @throws IllegalArgumentException if the value is not valid for
@@ -163,10 +166,11 @@
     /**
      * Returns the value of a socket option from a {@link java.net.ServerSocket}
      *
      * @param s the socket
      * @param name The socket option
+     * @param <T> The type of the socket option
      *
      * @return The value of the socket option.
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
@@ -192,11 +196,12 @@
      * Sets the value of a socket option on a {@link java.net.DatagramSocket}
      * or {@link java.net.MulticastSocket}
      *
      * @param s the socket
      * @param name The socket option
-     * @param value The value of the socket option.
+     * @param value The value of the socket option
+     * @param <T> The type of the socket option
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
      *
      * @throws IllegalArgumentException if the value is not valid for
@@ -223,10 +228,11 @@
      * Returns the value of a socket option from a
      * {@link java.net.DatagramSocket} or {@link java.net.MulticastSocket}
      *
      * @param s the socket
      * @param name The socket option
+     * @param <T> The type of the socket option
      *
      * @return The value of the socket option.
      *
      * @throws UnsupportedOperationException if the socket does not support
      *         the option.
@@ -253,10 +259,12 @@
      * given socket type. This set may include standard options and also
      * non standard extended options.
      *
      * @param socketType the type of java.net socket
      *
+     * @return A set of socket options
+     *
      * @throws IllegalArgumentException if socketType is not a valid
      *         socket type from the java.net package.
      *
      * @deprecated use {@link Socket#supportedOptions()}, {@link ServerSocket#supportedOptions()},
      *             or {@link DatagramSocket#supportedOptions()} instead.