--- a/src/java.base/share/classes/java/net/SocketImpl.java	Mon May 06 09:43:48 2019 +0100
+++ b/src/java.base/share/classes/java/net/SocketImpl.java	Thu May 09 17:49:28 2019 +0100
@@ -43,21 +43,21 @@
  * create both client and server sockets.
  *
  * @implNote Client and server sockets created with the {@code Socket} and
- * {@code SocketServer} public constructors create a system/platform default
+ * {@code SocketServer} public constructors create a system-default
  * {@code SocketImpl}. The JDK historically used a {@code SocketImpl}
  * implementation type named "PlainSocketImpl" that has since been replaced by a
  * newer implementation. The JDK continues to ship with the older implementation
  * to allow code to run that depends on unspecified behavior that differs between
  * the old and new implementations. The old implementation will be used if the
  * Java virtual machine is started with the system property {@systemProperty
- * jdk.net.usePlainSocketImpl} set on the command line. It may also be set in
- * the JDK's network configuration file, located in {@code
- * ${java.home}/conf/net.properties}, for cases where it needs to be set without
- * changing the command line. The value of the system property is the string
+ * jdk.net.usePlainSocketImpl} set to use the old implementation. It may also be
+ * set in the JDK's network configuration file, located in {@code
+ * ${java.home}/conf/net.properties}. The value of the property is the string
  * representation of a boolean. If set without a value then it defaults to {@code
  * true}, hence running with {@code -Djdk.net.usePlainSocketImpl} or {@code
  * -Djdk.net.usePlainSocketImpl=true} will configure the Java virtual machine
- * to use the old implementation.
+ * to use the old implementation. The property and old implementation will be
+ * removed in a future version.
  *
  * @author  unascribed
  * @since   1.0