diff -r bb38b4bc2063 -r 394ab6a6658d jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
--- a/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java	Thu Aug 13 09:35:45 2015 +0300
+++ b/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java	Thu Aug 13 12:40:07 2015 +0300
@@ -223,7 +223,7 @@
      * Accepts a connection made to this channel's socket.
      *
      * <p> If this channel is in non-blocking mode then this method will
-     * immediately return <tt>null</tt> if there are no pending connections.
+     * immediately return {@code null} if there are no pending connections.
      * Otherwise it will block indefinitely until a new connection is available
      * or an I/O error occurs.
      *
@@ -239,7 +239,7 @@
      * java.lang.SecurityManager#checkAccept checkAccept} method.  </p>
      *
      * @return  The socket channel for the new connection,
-     *          or <tt>null</tt> if this channel is in non-blocking mode
+     *          or {@code null} if this channel is in non-blocking mode
      *          and no connection is available to be accepted
      *
      * @throws  ClosedChannelException