--- a/.hgtags	Fri Sep 18 10:09:38 2015 +0200
+++ b/.hgtags	Fri Sep 25 12:04:34 2015 -0700
@@ -324,3 +324,4 @@
 3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
 3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
 2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
+6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82

--- a/.hgtags-top-repo	Fri Sep 18 10:09:38 2015 +0200
+++ b/.hgtags-top-repo	Fri Sep 25 12:04:34 2015 -0700
@@ -324,3 +324,4 @@
 ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79
 f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b jdk9-b80
 b8afcf91331d78626a583ec1b63164468d6f4181 jdk9-b81
+42b56d1f418523ecb61a49d7493302c80c8009cc jdk9-b82

--- a/common/autoconf/basics.m4	Fri Sep 18 10:09:38 2015 +0200
+++ b/common/autoconf/basics.m4	Fri Sep 25 12:04:34 2015 -0700
@@ -445,6 +445,15 @@
   # Save the current directory this script was started from
   CURDIR="$PWD"
 
+  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
+  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
+  # was not available at that time.
+  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
+  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
+    ORIGINAL_PATH="$REWRITTEN_PATH"
+    AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
+  fi
+
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     PATH_SEP=";"
     BASIC_CHECK_PATHS_WINDOWS
@@ -935,6 +944,7 @@
   BASIC_PATH_PROGS(HG, hg)
   BASIC_PATH_PROGS(STAT, stat)
   BASIC_PATH_PROGS(TIME, time)
+  BASIC_PATH_PROGS(PATCH, [gpatch patch])
   # Check if it's GNU time
   IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then

--- a/common/autoconf/compare.sh.in	Fri Sep 18 10:09:38 2015 +0200
+++ b/common/autoconf/compare.sh.in	Fri Sep 25 12:04:34 2015 -0700
@@ -29,47 +29,50 @@
 ##########################################################################################
 # Substitutions from autoconf
 
-LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
+export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
 
-OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
-OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
+export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
+export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
 
-AWK="@AWK@"
-CAT="@CAT@"
-CMP="@CMP@"
-CP="@CP@"
-CUT="@CUT@"
-DIFF="@DIFF@"
-DUMPBIN="@FIXPATH@ @DUMPBIN@"
-EXPR="@EXPR@"
-FILE="@FILE@"
-FIND="@FIND@"
-GREP="@GREP@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
-LDD="@LDD@"
-LN="@LN@"
-MKDIR="@MKDIR@"
-NAWK="@NAWK@"
-NM="@GNM@"
-OBJDUMP="@OBJDUMP@"
-OTOOL="@OTOOL@"
-PRINTF="@PRINTF@"
-READELF="@READELF@"
-RM="@RM@"
-SED="@SED@"
-SORT="@SORT@"
-STAT="@STAT@"
-STRIP="@POST_STRIP_CMD@"
-TEE="@TEE@"
-UNIQ="@UNIQ@"
-UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
-UNZIP="@UNZIP@"
+export AWK="@AWK@"
+export BASH="@BASH@"
+export CAT="@CAT@"
+export CMP="@CMP@"
+export CP="@CP@"
+export CUT="@CUT@"
+export DIFF="@DIFF@"
+export DUMPBIN="@FIXPATH@ @DUMPBIN@"
+export EXPR="@EXPR@"
+export FILE="@FILE@"
+export FIND="@FIND@"
+export GREP="@GREP@"
+export JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+export JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
+export LDD="@LDD@"
+export LN="@LN@"
+export MKDIR="@MKDIR@"
+export MV="@MV@"
+export NAWK="@NAWK@"
+export NM="@GNM@"
+export OBJDUMP="@OBJDUMP@"
+export OTOOL="@OTOOL@"
+export PRINTF="@PRINTF@"
+export READELF="@READELF@"
+export RM="@RM@"
+export SED="@SED@"
+export SORT="@SORT@"
+export STAT="@STAT@"
+export STRIP="@POST_STRIP_CMD@"
+export TEE="@TEE@"
+export UNIQ="@UNIQ@"
+export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
+export UNZIP="@UNZIP@"
 
-SRC_ROOT="@TOPDIR@"
+export SRC_ROOT="@TOPDIR@"
+export OUTPUT_ROOT="@OUTPUT_ROOT@"
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-  PATH="@VS_PATH@"
+  export PATH="@VS_PATH@"
 fi
 
 # Now locate the main script and run it.
@@ -79,4 +82,8 @@
   exit 1
 fi
 
-. "$REAL_COMPARE_SCRIPT" "$@"
+# Rotate logs
+$RM $OUTPUT_ROOT/compare.log.old 2> /dev/null
+$MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null
+
+$BASH $SRC_ROOT/common/bin/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"

--- a/common/autoconf/generated-configure.sh	Fri Sep 18 10:09:38 2015 +0200
+++ b/common/autoconf/generated-configure.sh	Fri Sep 25 12:04:34 2015 -0700
@@ -859,6 +859,7 @@
 XATTR
 DSYMUTIL
 IS_GNU_TIME
+PATCH
 TIME
 STAT
 HG
@@ -1174,6 +1175,7 @@
 HG
 STAT
 TIME
+PATCH
 DSYMUTIL
 XATTR
 CODESIGN
@@ -2053,6 +2055,7 @@
   HG          Override default value for HG
   STAT        Override default value for STAT
   TIME        Override default value for TIME
+  PATCH       Override default value for PATCH
   DSYMUTIL    Override default value for DSYMUTIL
   XATTR       Override default value for XATTR
   CODESIGN    Override default value for CODESIGN
@@ -4359,7 +4362,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1441958217
+DATE_WHEN_GENERATED=1442820958
 
 ###############################################################################
 #
@@ -13841,6 +13844,16 @@
   # Save the current directory this script was started from
   CURDIR="$PWD"
 
+  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
+  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
+  # was not available at that time.
+  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
+  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
+    ORIGINAL_PATH="$REWRITTEN_PATH"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting ORIGINAL_PATH to $REWRITTEN_PATH" >&5
+$as_echo "$as_me: Rewriting ORIGINAL_PATH to $REWRITTEN_PATH" >&6;}
+  fi
+
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     PATH_SEP=";"
 
@@ -18865,6 +18878,192 @@
   fi
 
 
+
+
+  # Publish this variable in the help.
+
+
+  if test "x$PATCH" = x; then
+    # The variable is not set by user, try to locate tool using the code snippet
+    for ac_prog in gpatch patch
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PATCH" && break
+done
+
+  else
+    # The variable is set, but is it from the command line or the environment?
+
+    # Try to remove the string !PATCH! from our list.
+    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!PATCH!/}
+    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+      # If it failed, the variable was not from the command line. Ignore it,
+      # but warn the user (except for BASH, which is always set by the calling BASH).
+      if test "xPATCH" != xBASH; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of PATCH from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of PATCH from the environment. Use command line variables instead." >&2;}
+      fi
+      # Try to locate tool using the code snippet
+      for ac_prog in gpatch patch
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PATCH" && break
+done
+
+    else
+      # If it succeeded, then it was overridden by the user. We will use it
+      # for the tool.
+
+      # First remove it from the list of overridden variables, so we can test
+      # for unknown variables in the end.
+      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+      # Check if the provided tool contains a complete path.
+      tool_specified="$PATCH"
+      tool_basename="${tool_specified##*/}"
+      if test "x$tool_basename" = "x$tool_specified"; then
+        # A command without a complete path is provided, search $PATH.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool PATCH=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool PATCH=$tool_basename" >&6;}
+        # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x$PATCH" = x; then
+          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+        fi
+      else
+        # Otherwise we believe it is a complete path. Use it as it is.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool PATCH=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool PATCH=$tool_specified" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PATCH" >&5
+$as_echo_n "checking for PATCH... " >&6; }
+        if test ! -x "$tool_specified"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "User supplied tool PATCH=$tool_specified does not exist or is not executable" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+      fi
+    fi
+  fi
+
+
   # Check if it's GNU time
   IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then

--- a/common/autoconf/spec.gmk.in	Fri Sep 18 10:09:38 2015 +0200
+++ b/common/autoconf/spec.gmk.in	Fri Sep 25 12:04:34 2015 -0700
@@ -495,6 +495,7 @@
 MKDIR:=@MKDIR@
 MV:=@MV@
 NAWK:=@NAWK@
+PATCH:=@PATCH@
 PRINTF:=@PRINTF@
 PWD:=@THEPWDCMD@
 RM:=@RM@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/blessed-modifier-order.sh	Fri Sep 25 12:04:34 2015 -0700
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright 2015 Google, Inc.  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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+
+usage() {
+  (
+    echo "$0 DIR ..."
+    echo "Modifies in place all the java source files found"
+    echo "in the given directories so that all java language modifiers"
+    echo "are in the canonical order given by Modifier#toString()."
+    echo "Tries to get it right even within javadoc comments,"
+    echo "and even if the list of modifiers spans 2 lines."
+    echo
+    echo "See:"
+    echo "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Modifier.html#toString-int-"
+    echo
+    echo "Example:"
+    echo "$0 jdk/src/java.base jdk/test/java/{util,io,lang}"
+  ) >&2
+  exit 1
+}
+
+set -eu
+declare -ar dirs=("$@")
+[[ "${#dirs[@]}" > 0 ]] || usage
+for dir in "${dirs[@]}"; do [[ -d "$dir" ]] || usage; done
+
+declare -ar modifiers=(
+  public protected private
+  abstract static final transient
+  volatile synchronized native strictfp
+)
+declare -r SAVE_IFS="$IFS"
+for ((i = 3; i < "${#modifiers[@]}"; i++)); do
+  IFS='|'; x="${modifiers[*]:0:i}" y="${modifiers[*]:i}"; IFS="$SAVE_IFS"
+  if [[ -n "$x" && -n "$y" ]]; then
+    find "${dirs[@]}" -name '*.java' -type f -print0 | \
+      xargs -0 perl -0777 -p -i -e \
+      "do {} while s/^([A-Za-z@* ]*)\b($y)(\s|(?:\s|\n\s+\*)*\s)($x)\b/\1\4\3\2/mg"
+  fi
+done

--- a/corba/.hgtags	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/.hgtags	Fri Sep 25 12:04:34 2015 -0700
@@ -324,3 +324,4 @@
 4ab250b8fac66ef8cd15ee78c40f0c651c96e16a jdk9-b79
 821a0373ef2d1642a9824facb938b901ad010413 jdk9-b80
 45c35b7f5b40d5af0085e4a7b3a4d6e3e0347c35 jdk9-b81
+c20d8ebddaa6fb09cc81d3edf3d1d05f4232700a jdk9-b82

--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java	Fri Sep 25 12:04:34 2015 -0700
@@ -37,9 +37,9 @@
     protected byte elementData[];
 
     /**
-     * The number of valid components in this <tt>ByteBuffer</tt> object.
-     * Components <tt>elementData[0]</tt> through
-     * <tt>elementData[elementCount-1]</tt> are the actual items.
+     * The number of valid components in this {@code ByteBuffer} object.
+     * Components {@code elementData[0]} through
+     * {@code elementData[elementCount-1]} are the actual items.
      *
      * @serial
      */
@@ -88,7 +88,7 @@
 
     /**
      * Constructs an empty ByteBuffer so that its internal data array
-     * has size <tt>10</tt> and its standard capacity increment is
+     * has size {@code 10} and its standard capacity increment is
      * zero.
      */
     public ByteBuffer() {
@@ -99,7 +99,7 @@
      * Trims the capacity of this ByteBuffer to be the ByteBuffer's current
      * size. If the capacity of this cector is larger than its current
      * size, then the capacity is changed to equal the size by replacing
-     * its internal data array, kept in the field <tt>elementData</tt>,
+     * its internal data array, kept in the field {@code elementData},
      * with a smaller one. An application can use this operation to
      * minimize the storage of a ByteBuffer.
      */
@@ -138,7 +138,7 @@
      * Returns the current capacity of this ByteBuffer.
      *
      * @return  the current capacity (the length of its internal
-     *          data arary, kept in the field <tt>elementData</tt>
+     *          data arary, kept in the field {@code elementData}
      *          of this ByteBuffer.
      */
     public int capacity() {
@@ -157,9 +157,9 @@
     /**
      * Tests if this ByteBuffer has no components.
      *
-     * @return  <code>true</code> if and only if this ByteBuffer has
+     * @return  {@code true} if and only if this ByteBuffer has
      *          no components, that is, its size is zero;
-     *          <code>false</code> otherwise.
+     *          {@code false} otherwise.
      */
     public boolean isEmpty() {
         return elementCount == 0;

--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java	Fri Sep 25 12:04:34 2015 -0700
@@ -438,11 +438,11 @@
     }
 
     /**
-     * Writes a java.lang.Object as a CORBA Object. If <code>obj</code> is
+     * Writes a java.lang.Object as a CORBA Object. If {@code obj} is
      * an exported RMI-IIOP server object, the tie is found
-     * and wired to <code>obj</code>, then written to <code>out.write_Object(org.omg.CORBA.Object)</code>.
-     * If <code>obj</code> is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * and wired to {@code obj}, then written to {@code out.write_Object(org.omg.CORBA.Object)}.
+     * If {@code obj} is a CORBA Object, it is written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -457,10 +457,10 @@
 
     /**
      * Writes a java.lang.Object as either a value or a CORBA Object.
-     * If <code>obj</code> is a value object or a stub object, it is written to
-     * <code>out.write_abstract_interface(java.lang.Object)</code>. If <code>obj</code> is an exported
-     * RMI-IIOP server object, the tie is found and wired to <code>obj</code>,
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
+     * If {@code obj} is a value object or a stub object, it is written to
+     * {@code out.write_abstract_interface(java.lang.Object)}. If {@code obj} is an exported
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
+     * then written to {@code out.write_abstract_interface(java.lang.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -595,7 +595,7 @@
      * the class might be found. May be null.
      * @param loader a class whose ClassLoader may be used to
      * load the class if all other methods fail.
-     * @return the <code>Class</code> object representing the loaded class.
+     * @return the {@code Class} object representing the loaded class.
      * @exception ClassNotFoundException if class cannot be loaded.
      */
     public Class loadClass( String className, String remoteCodebase,
@@ -605,20 +605,20 @@
     }
 
     /**
-     * The <tt>isLocal</tt> method has the same semantics as the
+     * The {@code isLocal} method has the same semantics as the
      * ObjectImpl._is_local method, except that it can throw a RemoteException.
      * (no it doesn't but the spec says it should.)
      *
-     * The <tt>_is_local()</tt> method is provided so that stubs may determine
+     * The {@code _is_local()} method is provided so that stubs may determine
      * if a particular object is implemented by a local servant and hence local
      * invocation APIs may be used.
      *
      * @param stub the stub to test.
      *
-     * @return The <tt>_is_local()</tt> method returns true if
+     * @return The {@code _is_local()} method returns true if
      * the servant incarnating the object is located in the same process as
-     * the stub and they both share the same ORB instance.  The <tt>_is_local()</tt>
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
+     * method returns false otherwise. The default behavior of {@code _is_local()} is
      * to return false.
      *
      * @throws RemoteException The Java to IDL specification does to

--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java	Fri Sep 25 12:04:34 2015 -0700
@@ -93,7 +93,7 @@
      * @param name Ignored
      * @param ctx The non-null CNCtx whose ORB to use.
      * @param env Ignored
-     * @return The CORBA object for <tt>orig</tt> or null.
+     * @return The CORBA object for {@code orig} or null.
      * @exception ConfigurationException If the CORBA object cannot be obtained
      *    due to configuration problems
      * @exception NamingException If some other problem prevented a CORBA

--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java	Fri Sep 25 12:04:34 2015 -0700
@@ -165,7 +165,7 @@
      * If number is 0 then use an emphemeral port for the listener of
      * the associated type. <p>
      *
-     * If number is greater then 0 use that port number. <p>
+     * If number is greater than 0 use that port number. <p>
      *
      * An ORB creates a listener socket for each type
      * specified by the user by calling

--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Fri Sep 25 12:04:34 2015 -0700
@@ -108,12 +108,12 @@
     }
 
     /**
-     * Writes a java.lang.Object as a CORBA Object. If <code>obj</code> is
+     * Writes a java.lang.Object as a CORBA Object. If {@code obj} is
      * an exported RMI-IIOP server object, the tie is found
-     * and wired to <code>obj</code>, then written to
-<code>out.write_Object(org.omg.CORBA.Object)</code>.
-     * If <code>obj</code> is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * and wired to {@code obj}, then written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
+     * If {@code obj} is a CORBA Object, it is written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -128,12 +128,11 @@
 
     /**
      * Writes a java.lang.Object as either a value or a CORBA Object.
-     * If <code>obj</code> is a value object or a stub object, it is written to
-     * <code>out.write_abstract_interface(java.lang.Object)</code>. If <code>obj</code>
-is
-an exported
-     * RMI-IIOP server object, the tie is found and wired to <code>obj</code>,
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
+     * If {@code obj} is a value object or a stub object, it is written to
+     * {@code out.write_abstract_interface(java.lang.Object)}.
+     * If {@code obj} is an exported
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
+     * then written to {@code out.write_abstract_interface(java.lang.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -161,8 +160,8 @@
     }
 
     /**
-     * Removes the associated tie from an internal table and calls {@link
-Tie#deactivate}
+     * Removes the associated tie from an internal table
+     * and calls {@link Tie#deactivate}
      * to deactivate the object.
      * @param target the object to unexport.
      */
@@ -219,27 +218,27 @@
      * <P>The spec for this method is the "Java to IDL language
      * mapping", ptc/00-01-06.
      * <P>In Java SE Platform, this method works as follows:
-     * <UL><LI>Find the first non-null <tt>ClassLoader</tt> on the
+     * <UL><LI>Find the first non-null {@code ClassLoader} on the
      * call stack and attempt to load the class using this
-     * <tt>ClassLoader</tt>.
-     * <LI>If the first step fails, and if <tt>remoteCodebase</tt>
+     * {@code ClassLoader}.
+     * <LI>If the first step fails, and if {@code remoteCodebase}
      * is non-null and
-     * <tt>useCodebaseOnly</tt> is false, then call
-     * <tt>java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)</tt>.
-     * <LI>If <tt>remoteCodebase</tt> is null or <tt>useCodebaseOnly</tt>
-     * is true, then call <tt>java.rmi.server.RMIClassLoader.loadClass(className)</tt>.
+     * {@code useCodebaseOnly} is false, then call
+     * {@code java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)}.
+     * <LI>If {@code remoteCodebase} is null or {@code useCodebaseOnly}
+     * is true, then call {@code java.rmi.server.RMIClassLoader.loadClass(className)}.
      * <LI>If a class was not successfully loaded by step 1, 2, or 3,
-     * and <tt>loader</tt> is non-null, then call <tt>loader.loadClass(className)</tt>.
+     * and {@code loader} is non-null, then call {@code loader.loadClass(className)}.
      * <LI>If a class was successfully loaded by step 1, 2, 3, or 4, then
-     *  return the loaded class, else throw <tt>ClassNotFoundException</tt>.
+     *  return the loaded class, else throw {@code ClassNotFoundException}.
      * </UL>
      *
      * @param className the name of the class.
      * @param remoteCodebase a space-separated list of URLs at which
      * the class might be found. May be null.
-     * @param loader a <tt>ClassLoader</tt> that may be used to
+     * @param loader a {@code ClassLoader} that may be used to
      * load the class if all other methods fail.
-     * @return the <code>Class</code> object representing the loaded class.
+     * @return the {@code Class} object representing the loaded class.
      * @exception ClassNotFoundException if class cannot be loaded.
      */
     public static Class loadClass(String className,
@@ -254,24 +253,24 @@
 
 
     /**
-     * The <tt>isLocal</tt> method has the same semantics as the
-     * <tt>ObjectImpl._is_local</tt>
-     * method, except that it can throw a <tt>RemoteException</tt>.
+     * The {@code isLocal} method has the same semantics as the
+     * {@code ObjectImpl._is_local}
+     * method, except that it can throw a {@code RemoteException}.
      *
-     * The <tt>_is_local()</tt> method is provided so that stubs may determine if a
+     * The {@code _is_local()} method is provided so that stubs may determine if a
      * particular object is implemented by a local servant and hence local
      * invocation APIs may be used.
      *
      * @param stub the stub to test.
      *
-     * @return The <tt>_is_local()</tt> method returns true if
+     * @return The {@code _is_local()} method returns true if
      * the servant incarnating the object is located in the same process as
-     * the stub and they both share the same ORB instance.  The <tt>_is_local()</tt>
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
+     * method returns false otherwise. The default behavior of {@code _is_local()} is
      * to return false.
      *
      * @throws RemoteException The Java to IDL specification does not
-     * specify the conditions that cause a <tt>RemoteException</tt> to be thrown.
+     * specify the conditions that cause a {@code RemoteException} to be thrown.
      */
     public static boolean isLocal(Stub stub) throws RemoteException {
 

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -30,52 +30,52 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Any</tt>.  For more information on
+ * The Holder for {@code Any}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for <code>Any</code> objects
+ * A Holder class for {@code Any} objects
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>any</code> as an "out"
+ * If an IDL method signature has an IDL {@code any} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>AnyHolder</code> as the corresponding
+ * {@code AnyHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myAnyHolder</code> is an instance of <code>AnyHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myAnyHolder.value</code>.
+ * If {@code myAnyHolder} is an instance of {@code AnyHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myAnyHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class AnyHolder implements  Streamable {
     /**
-     * The <code>Any</code> value held by this <code>AnyHolder</code> object.
+     * The {@code Any} value held by this {@code AnyHolder} object.
      */
 
     public Any value;
 
     /**
-     * Constructs a new <code>AnyHolder</code> object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * Constructs a new {@code AnyHolder} object with its
+     * {@code value} field initialized to {@code null}.
      */
     public AnyHolder() {
     }
 
     /**
-     * Constructs a new <code>AnyHolder</code> object for the given
-     * <code>Any</code> object.
-     * @param initial the <code>Any</code> object with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>AnyHolder</code> object
+     * Constructs a new {@code AnyHolder} object for the given
+     * {@code Any} object.
+     * @param initial the {@code Any} object with which to initialize
+     *                the {@code value} field of the new
+     *                {@code AnyHolder} object
      */
     public AnyHolder(Any initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in the Holder
+     * Reads from {@code input} and initalizes the value in the Holder
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -85,8 +85,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>AnyHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code AnyHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -95,11 +95,11 @@
     }
 
     /**
-     * Returns the <code>TypeCode</code> object corresponding to the value
-     * held in this <code>AnyHolder</code> object.
+     * Returns the {@code TypeCode} object corresponding to the value
+     * held in this {@code AnyHolder} object.
      *
      * @return    the TypeCode of the value held in
-     *              this <code>AnyHolder</code> object
+     *              this {@code AnyHolder} object
      */
     public TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_any);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>AnySeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/AnySeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
-*
-*       <li> IDL/Java Language Mapping as defined in
-*       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code AnySeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/AnySeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+ *       </li>
+ *
+ *       <li> IDL/Java Language Mapping as defined in
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class AnySeqHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>AnySeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/AnySeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code AnySeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/AnySeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class AnySeqHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java	Fri Sep 25 12:04:34 2015 -0700
@@ -25,8 +25,8 @@
 
 package org.omg.CORBA;
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * A {@code PolicyErrorCode} which would be filled in
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,8 +26,8 @@
 package org.omg.CORBA;
 
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * A {@code PolicyErrorCode} which would be filled in
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java	Fri Sep 25 12:04:34 2015 -0700
@@ -27,7 +27,7 @@
 
 /**
  * Exception thrown when the ORB has encountered a malformed type code
- * (for example, a type code with an invalid <tt>TCKind</tt> value).<P>
+ * (for example, a type code with an invalid {@code TCKind} value).<P>
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -40,7 +40,7 @@
 public final class BAD_TYPECODE extends SystemException {
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with a default
+     * Constructs a {@code BAD_TYPECODE} exception with a default
      * minor code of 0 and a completion state of COMPLETED_NO.
      */
     public BAD_TYPECODE() {
@@ -48,7 +48,7 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified detail,
+     * Constructs a {@code BAD_TYPECODE} exception with the specified detail,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      *
      * @param s the String containing a detail message
@@ -58,10 +58,10 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified
+     * Constructs a {@code BAD_TYPECODE} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
-     * @param completed an instance of <code>CompletionStatus</code> indicating
+     * @param completed an instance of {@code CompletionStatus} indicating
      *                  the completion status
      */
     public BAD_TYPECODE(int minor, CompletionStatus completed) {
@@ -69,12 +69,12 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified detail
+     * Constructs a {@code BAD_TYPECODE} exception with the specified detail
      * message, minor code, and completion status.
      * A detail message is a String that describes this particular exception.
      * @param s the String containing a detail message
      * @param minor the minor code
-     * @param completed an instance of <code>CompletionStatus</code> indicating
+     * @param completed an instance of {@code CompletionStatus} indicating
      *                  the completion status
      */
     public BAD_TYPECODE(String s, int minor, CompletionStatus completed) {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -30,56 +30,56 @@
 
 
 /**
- * The Holder for <tt>Boolean</tt>.  For more information on
+ * The Holder for {@code Boolean}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>boolean</code>
+ * A Holder class for a {@code boolean}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>boolean</code> as an "out"
+ * If an IDL method signature has an IDL {@code boolean} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>BooleanHolder</code> as the corresponding
+ * {@code BooleanHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myBooleanHolder</code> is an instance of <code>BooleanHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myBooleanHolder.value</code>.
+ * If {@code myBooleanHolder} is an instance of {@code BooleanHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myBooleanHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class BooleanHolder implements Streamable {
 
     /**
-     * The <code>boolean</code> value held by this <code>BooleanHolder</code>
+     * The {@code boolean} value held by this {@code BooleanHolder}
      * object.
      */
     public boolean value;
 
     /**
-     * Constructs a new <code>BooleanHolder</code> object with its
-     * <code>value</code> field initialized to <code>false</code>.
+     * Constructs a new {@code BooleanHolder} object with its
+     * {@code value} field initialized to {@code false}.
      */
     public BooleanHolder() {
     }
 
     /**
-     * Constructs a new <code>BooleanHolder</code> object with its
-     * <code>value</code> field initialized with the given <code>boolean</code>.
-     * @param initial the <code>boolean</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>BooleanHolder</code> object
+     * Constructs a new {@code BooleanHolder} object with its
+     * {@code value} field initialized with the given {@code boolean}.
+     * @param initial the {@code boolean} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code BooleanHolder} object
      */
     public BooleanHolder(boolean initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to this
-     * <code>BooleanHolder</code> object's <code>value</code> field.
+     * Reads unmarshalled data from {@code input} and assigns it to this
+     * {@code BooleanHolder} object's {@code value} field.
      *
-     * @param input the <code>InputStream</code> object containing
+     * @param input the {@code InputStream} object containing
      *              CDR formatted data from the wire
      */
     public void _read(InputStream input) {
@@ -87,8 +87,8 @@
     }
 
     /**
-     * Marshals the value in this <code>BooleanHolder</code> object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * Marshals the value in this {@code BooleanHolder} object's
+     * {@code value} field to the output stream {@code output}.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -97,11 +97,11 @@
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds to the
-     * value held in this <code>BooleanHolder</code> object.
+     * Retrieves the {@code TypeCode} object that corresponds to the
+     * value held in this {@code BooleanHolder} object.
      *
-     * @return    the <code>TypeCode</code> for the value held
-     *            in this <code>BooleanHolder</code> object
+     * @return    the {@code TypeCode} for the value held
+     *            in this {@code BooleanHolder} object
      */
     public TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_boolean);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>BooleanSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
-*
-*       <li> IDL/Java Language Mapping as defined in
-*       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code BooleanSeq}.  For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/BooleanSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+ *       </li>
+ *
+ *       <li> IDL/Java Language Mapping as defined in
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class BooleanSeqHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>BooleanSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code BooleanSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/BooleanSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class BooleanSeqHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -31,54 +31,54 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Byte</tt>.  For more information on
+ * The Holder for {@code Byte}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>byte</code>
+ * A Holder class for a {@code byte}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>octet</code> as an "out"
+ * If an IDL method signature has an IDL {@code octet} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>ByteHolder</code> as the corresponding
+ * {@code ByteHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myByteHolder</code> is an instance of <code>ByteHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myByteHolder.value</code>.
+ * If {@code myByteHolder} is an instance of {@code ByteHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myByteHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class ByteHolder implements Streamable {
     /**
-     * The <code>byte</code> value held by this <code>ByteHolder</code>
+     * The {@code byte} value held by this {@code ByteHolder}
      * object.
      */
 
     public byte value;
 
     /**
-     * Constructs a new <code>ByteHolder</code> object with its
-     * <code>value</code> field initialized to 0.
+     * Constructs a new {@code ByteHolder} object with its
+     * {@code value} field initialized to 0.
      */
     public ByteHolder() {
     }
 
     /**
-     * Constructs a new <code>ByteHolder</code> object for the given
-     * <code>byte</code>.
-     * @param initial the <code>byte</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>ByteHolder</code> object
+     * Constructs a new {@code ByteHolder} object for the given
+     * {@code byte}.
+     * @param initial the {@code byte} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code ByteHolder} object
      */
     public ByteHolder(byte initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
-     * this <code>ByteHolder</code> object
+     * Reads from {@code input} and initalizes the value in
+     * this {@code ByteHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -88,8 +88,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>ByteHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code ByteHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -99,10 +99,10 @@
 
     /**
      * Returns the TypeCode corresponding to the value held in
-     * this <code>ByteHolder</code> object.
+     * this {@code ByteHolder} object.
      *
-     * @return    the TypeCode of the value held in
-     *               this <code>ByteHolder</code> object
+     * @return  the TypeCode of the value held in
+     *          this {@code ByteHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_octet);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -31,54 +31,54 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Char</tt>.  For more information on
+ * The Holder for {@code Char}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>char</code>
+ * A Holder class for a {@code char}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>char</code> as an "out"
+ * If an IDL method signature has an IDL {@code char} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>CharHolder</code> as the corresponding
+ * {@code CharHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myCharHolder</code> is an instance of <code>CharHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myCharHolder.value</code>.
+ * If {@code myCharHolder} is an instance of {@code CharHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myCharHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class CharHolder implements Streamable {
 
     /**
-     * The <code>char</code> value held by this <code>CharHolder</code>
+     * The {@code char} value held by this {@code CharHolder}
      * object.
      */
     public char value;
 
     /**
-     * Constructs a new <code>CharHolder</code> object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * Constructs a new {@code CharHolder} object with its
+     * {@code value} field initialized to {@code 0}.
      */
     public CharHolder() {
     }
 
     /**
-     * Constructs a new <code>CharHolder</code> object for the given
-     * <code>char</code>.
-     * @param initial the <code>char</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>CharHolder</code> object
+     * Constructs a new {@code CharHolder} object for the given
+     * {@code char}.
+     * @param initial the {@code char} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code CharHolder} object
      */
     public CharHolder(char initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
-     * this <code>CharHolder</code> object
+     * Reads from {@code input} and initalizes the value in
+     * this {@code CharHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire
@@ -88,8 +88,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>CharHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code CharHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -98,12 +98,12 @@
     }
 
     /**
-     * Returns the <code>TypeCode</code> object  corresponding
+     * Returns the {@code TypeCode} object  corresponding
      * to the value held in
-     * this <code>CharHolder</code> object.
+     * this {@code CharHolder} object.
      *
      * @return    the TypeCode of the value held in
-     *            this <code>CharHolder</code> object
+     *            this {@code CharHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_char);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>CharSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CharSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
-*
-*       <li> IDL/Java Language Mapping as defined in
-*       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code CharSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CharSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+ *       </li>
+ *
+ *       <li> IDL/Java Language Mapping as defined in
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class CharSeqHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>CharSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CharSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code CharSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/CharSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class CharSeqHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,13 +26,13 @@
 
 
 /**
-* The Helper for <tt>CompletionStatus</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CompletionStatusHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ * The Helper for {@code CompletionStatus}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CompletionStatusHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
+ */
 
 abstract public class CompletionStatusHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,16 +26,16 @@
 
 
 /**
-* Interfaces derived from the <tt>Current</tt> interface enable ORB and CORBA
+* Interfaces derived from the {@code Current} interface enable ORB and CORBA
 * services to provide access to information (context) associated with
 * the thread of execution in which they are running. This information
 * is accessed in a structured manner using interfaces derived from the
-* <tt>Current</tt> interface defined in the CORBA module.
+* {@code Current} interface defined in the CORBA module.
 *
 * <P>Each ORB or CORBA service that needs its own context derives an
-* interface from the CORBA module's <tt>Current</tt>. Users of the
-* service can obtain an instance of the appropriate <tt>Current</tt>
-* interface by invoking <tt>ORB::resolve_initial_references</tt>.<P>
+* interface from the CORBA module's {@code Current}. Users of the
+* service can obtain an instance of the appropriate {@code Current}
+* interface by invoking {@code ORB::resolve_initial_references}.<P>
 *
 * org/omg/CORBA/Current.java
 * Generated by the IDL-to-Java compiler (portable), version "3.0"

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>Current</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CurrentHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Helper for {@code Current}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CurrentHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 abstract public class CurrentHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -25,14 +25,14 @@
 package org.omg.CORBA;
 
 /**
-* The Holder for <tt>Current</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CurrentHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Holder for {@code Current}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/CurrentHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 public final class CurrentHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,15 +26,15 @@
 
 
 /**
-* The interface for <tt>Current</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html">
-* "Generated Files"</a>.
-*
-* org/omg/CORBA/CurrentOperations.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT.
-*/
+ * The interface for {@code Current}. For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html">
+ * "Generated Files"</a>.
+ *
+ * org/omg/CORBA/CurrentOperations.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT.
+ */
 
 public interface CurrentOperations
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java	Fri Sep 25 12:04:34 2015 -0700
@@ -34,7 +34,7 @@
  * as a custom value type's implicit base class, although the custom
  * valuetype does not actually inherit it in IDL. The implementer
  * of a custom value type shall provide an implementation of the
- * <tt>CustomMarshal</tt> operations. The manner in which this is done is
+ * {@code CustomMarshal} operations. The manner in which this is done is
  * specified in the IDL to Java langauge mapping. Each custom
  * marshaled value type shall have its own implementation.
  * @see DataInputStream

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>DefinitionKind</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DefinitionKindHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:43 o'clock GMT+00:00
-*/
+ * The Helper for {@code DefinitionKind}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/DefinitionKindHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:43 o'clock GMT+00:00
+ */
 
 abstract public class DefinitionKindHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java	Fri Sep 25 12:04:34 2015 -0700
@@ -25,11 +25,12 @@
 
 package org.omg.CORBA;
 
-/** Provides mechanisms for establishing and navigating relationships to
+/**
+ *  Provides mechanisms for establishing and navigating relationships to
  *  superior and subordinate domains, as well as for creating and accessing
- *  policies. The <tt>DomainManager</tt> has associated with it the policy
- *  objects for a
- *  particular domain. The domain manager also records the membership of
+ *  policies. The {@code DomainManager} has associated with it the policy
+ *  objects for a particular domain.
+ *  The domain manager also records the membership of
  *  the domain and provides the means to add and remove members. The domain
  *  manager is itself a member of a domain, possibly the domain it manages.
  *  The domain manager provides mechanisms for establishing and navigating

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,9 +26,9 @@
 package org.omg.CORBA;
 
 /**
- *  Provides the <tt>DomainManager</tt> with the means to access policies.
+ *  Provides the {@code DomainManager} with the means to access policies.
  *  <P>
- *  The <tt>DomainManager</tt> has associated with it the policy objects for a
+ *  The {@code DomainManager} has associated with it the policy objects for a
  *  particular domain. The domain manager also records the membership of
  *  the domain and provides the means to add and remove members. The domain
  *  manager is itself a member of a domain, possibly the domain it manages.
@@ -39,11 +39,12 @@
 
 public interface DomainManagerOperations
 {
-    /** This returns the policy of the specified type for objects in
+    /**
+     *  This returns the policy of the specified type for objects in
      *  this domain.  The types of policies available are domain specific.
      *  See the CORBA specification for a list of standard ORB policies.
      *
-     *@param policy_type Type of policy to request
+     *  @param policy_type Type of policy to request
      */
     public org.omg.CORBA.Policy get_domain_policy(int policy_type);
 }

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -30,47 +30,47 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Double</tt>.  For more information on
+ * The Holder for {@code Double}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>double</code>
+ * A Holder class for a {@code double}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>double</code> as an "out"
+ * If an IDL method signature has an IDL {@code double} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>DoubleHolder</code> as the corresponding
+ * {@code DoubleHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myDoubleHolder</code> is an instance of <code>DoubleHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myDoubleHolder.value</code>.
+ * If {@code myDoubleHolder} is an instance of {@code DoubleHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myDoubleHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class DoubleHolder implements Streamable {
 
     /**
-     * The <code>double</code> value held by this <code>DoubleHolder</code>
+     * The {@code double} value held by this {@code DoubleHolder}
      * object.
      */
 
     public double value;
 
     /**
-     * Constructs a new <code>DoubleHolder</code> object with its
-     * <code>value</code> field initialized to 0.0.
+     * Constructs a new {@code DoubleHolder} object with its
+     * {@code value} field initialized to 0.0.
      */
     public DoubleHolder() {
     }
 
     /**
-     * Constructs a new <code>DoubleHolder</code> object for the given
-     * <code>double</code>.
-     * @param initial the <code>double</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>DoubleHolder</code> object
+     * Constructs a new {@code DoubleHolder} object for the given
+     * {@code double}.
+     * @param initial the {@code double} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code DoubleHolder} object
      */
     public DoubleHolder(double initial) {
         value = initial;
@@ -80,7 +80,7 @@
      * Read a double value from the input stream and store it in the
      * value member.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_double();
@@ -88,18 +88,18 @@
 
     /**
      * Write the double value stored in this holder to an
-     * <code>OutputStream</code>.
+     * {@code OutputStream}.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_double(value);
     }
 
     /**
-     * Return the <code>TypeCode</code> of this holder object.
+     * Return the {@code TypeCode} of this holder object.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_double);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>DoubleSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
-*
-*       <li> IDL/Java Language Mapping as defined in
-*       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code DoubleSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/DoubleSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+ *       </li>
+ *
+ *       <li> IDL/Java Language Mapping as defined in
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class DoubleSeqHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>DoubleSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ * The Holder for {@code DoubleSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/DoubleSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ */
 
 public final class DoubleSeqHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Fri Sep 25 12:04:34 2015 -0700
@@ -27,367 +27,368 @@
 package org.omg.CORBA;
 
 
-/** Enables <tt>org.omg.CORBA.Any</tt> values to be dynamically
+/**
+ * Enables {@code org.omg.CORBA.Any} values to be dynamically
  * interpreted (traversed) and
- *  constructed. A <tt>DynAny</tt> object is associated with a data value
- *  which may correspond to a copy of the value inserted into an <tt>Any</tt>.
- *  The <tt>DynAny</tt> APIs enable traversal of the data value associated with an
- *  Any at runtime and extraction of the primitive constituents of the
- *  data value.
+ * constructed. A {@code DynAny} object is associated with a data value
+ * which may correspond to a copy of the value inserted into an {@code Any}.
+ * The {@code DynAny} APIs enable traversal of the data value associated with an
+ * Any at runtime and extraction of the primitive constituents of the
+ * data value.
  * @deprecated Use the new <a href="../DynamicAny/DynAny.html">DynAny</a> instead
  */
 @Deprecated
 public interface DynAny extends org.omg.CORBA.Object
 {
     /**
-     * Returns the <code>TypeCode</code> of the object inserted into
-     * this <code>DynAny</code>.
+     * Returns the {@code TypeCode} of the object inserted into
+     * this {@code DynAny}.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode type() ;
 
     /**
      * Copy the contents from one Dynamic Any into another.
      *
-     * @param dyn_any the <code>DynAny</code> object whose contents
-     *                are assigned to this <code>DynAny</code>.
+     * @param dyn_any the {@code DynAny} object whose contents
+     *                are assigned to this {@code DynAny}.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     * <code>DynAny</code> is invalid
+     * {@code DynAny} is invalid
      */
     public void assign(org.omg.CORBA.DynAny dyn_any)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Make a <code>DynAny</code> object from an <code>Any</code>
+     * Make a {@code DynAny} object from an {@code Any}
      * object.
      *
-     * @param value the <code>Any</code> object.
+     * @param value the {@code Any} object.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     * <code>Any</code> object is empty or bad
+     * {@code Any} object is empty or bad
      */
     public void from_any(org.omg.CORBA.Any value)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Convert a <code>DynAny</code> object to an <code>Any</code>
+     * Convert a {@code DynAny} object to an {@code Any}
      * object.
      *
-     * @return the <code>Any</code> object.
+     * @return the {@code Any} object.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if this
-     * <code>DynAny</code> is empty or bad.
+     * {@code DynAny} is empty or bad.
      *            created or does not contain a meaningful value
      */
     public org.omg.CORBA.Any to_any()
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Destroys this <code>DynAny</code> object and frees any resources
+     * Destroys this {@code DynAny} object and frees any resources
      * used to represent the data value associated with it. This method
-     * also destroys all <code>DynAny</code> objects obtained from it.
+     * also destroys all {@code DynAny} objects obtained from it.
      * <p>
-     * Destruction of <code>DynAny</code> objects should be handled with
+     * Destruction of {@code DynAny} objects should be handled with
      * care, taking into account issues dealing with the representation of
-     * data values associated with <code>DynAny</code> objects.  A programmer
-     * who wants to destroy a <code>DynAny</code> object but still be able
+     * data values associated with {@code DynAny} objects.  A programmer
+     * who wants to destroy a {@code DynAny} object but still be able
      * to manipulate some component of the data value associated with it,
-     * should first create a <code>DynAny</code> object for the component
-     * and then make a copy of the created <code>DynAny</code> object.
+     * should first create a {@code DynAny} object for the component
+     * and then make a copy of the created {@code DynAny} object.
      */
     public void destroy() ;
 
     /**
-     * Clones this <code>DynAny</code> object.
+     * Clones this {@code DynAny} object.
      *
-     * @return a copy of this <code>DynAny</code> object
+     * @return a copy of this {@code DynAny} object
      */
     public org.omg.CORBA.DynAny copy() ;
 
     /**
-     * Inserts the given <code>boolean</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code boolean} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>boolean</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code boolean} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_boolean(boolean value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>byte</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code byte} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>byte</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code byte} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_octet(byte value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>char</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code char} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>char</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code char} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_char(char value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>short</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code short} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>short</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code short} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_short(short value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>short</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code short} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>short</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code short} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ushort(short value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>int</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code int} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>int</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code int} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_long(int value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>int</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code int} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>int</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code int} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ulong(int value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>float</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code float} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>float</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code float} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_float(float value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>double</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code double} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>double</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code double} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_double(double value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>String</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code String} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>String</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code String} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_string(String value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.Object</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.Object} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.Object</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.Object} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_reference(org.omg.CORBA.Object value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.TypeCode</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.TypeCode} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.TypeCode</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.TypeCode} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_typecode(org.omg.CORBA.TypeCode value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>long</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code long} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>long</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code long} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_longlong(long value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>long</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code long} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>long</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code long} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ulonglong(long value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>char</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code char} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>char</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code char} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_wchar(char value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>String</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code String} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>String</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code String} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_wstring(String value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.Any</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.Any} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.Any</code> object to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.Any} object to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_any(org.omg.CORBA.Any value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
@@ -395,32 +396,32 @@
     // orbos 98-01-18: Objects By Value -- begin
 
     /**
-     * Inserts the given <code>java.io.Serializable</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code java.io.Serializable} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>java.io.Serializable</code> object to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code java.io.Serializable} object to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_val(java.io.Serializable value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Retrieves the <code>java.io.Serializable</code> object contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code java.io.Serializable} object contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>java.io.Serializable</code> object that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code java.io.Serializable} object that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>java.io.Serializable</code> object
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code java.io.Serializable} object
      */
     public java.io.Serializable get_val()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
@@ -428,284 +429,284 @@
     // orbos 98-01-18: Objects By Value -- end
 
     /**
-     * Retrieves the <code>boolean</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code boolean} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>boolean</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code boolean} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>boolean</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code boolean}
      */
     public boolean get_boolean()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>byte</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code byte} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>byte</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code byte} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>byte</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code byte}
      */
     public byte get_octet()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
     /**
-     * Retrieves the <code>char</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code char} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code char} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code char}
      */
     public char get_char()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code short} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code short} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code short}
      */
     public short get_short()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code short} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code short} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code short}
      */
     public short get_ushort()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code int} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code int} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code int}
      */
     public int get_long()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code int} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code int} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code int}
      */
     public int get_ulong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>float</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code float} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>float</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code float} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>float</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code float}
      */
     public float get_float()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>double</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code double} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>double</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code double} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>double</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code double}
      */
     public double get_double()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code String} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code String} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code String}
      */
     public String get_string()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.Other</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.Other} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Other</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.Other} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Other</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for an {@code org.omg.CORBA.Other}
      */
     public org.omg.CORBA.Object get_reference()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.TypeCode</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.TypeCode} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.TypeCode</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.TypeCode} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>org.omg.CORBA.TypeCode</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code org.omg.CORBA.TypeCode}
      */
     public org.omg.CORBA.TypeCode get_typecode()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>long</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code long} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code long} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code long}
      */
     public long get_longlong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>long</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code long} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code long} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code long}
      */
     public long get_ulonglong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>char</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code char} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code char} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code char}
      */
     public char get_wchar()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code String} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code String} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code String}
      */
     public String get_wstring()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.Any</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.Any} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Any</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.Any} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Any</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for an {@code org.omg.CORBA.Any}
      */
     public org.omg.CORBA.Any get_any()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
     /**
-     * Returns a <code>DynAny</code> object reference that can
+     * Returns a {@code DynAny} object reference that can
      * be used to get/set the value of the component currently accessed.
-     * The appropriate <code>insert</code> method
-     * can be called on the resulting <code>DynAny</code> object
+     * The appropriate {@code insert} method
+     * can be called on the resulting {@code DynAny} object
      * to initialize the component.
-     * The appropriate <code>get</code> method
-     * can be called on the resulting <code>DynAny</code> object
+     * The appropriate {@code get} method
+     * can be called on the resulting {@code DynAny} object
      * to extract the value of the component.
          *
-         * @return a <code>DynAny</code> object reference that can be
+         * @return a {@code DynAny} object reference that can be
          *         used to retrieve or set the value of the component currently
          *         accessed
      */
     public org.omg.CORBA.DynAny current_component() ;
 
     /**
-     * Moves to the next component of this <code>DynAny</code> object.
+     * Moves to the next component of this {@code DynAny} object.
      * This method is used for iterating through the components of
      * a constructed type, effectively moving a pointer from one
      * component to the next.  The pointer starts out on the first
-     * component when a <code>DynAny</code> object is created.
+     * component when a {@code DynAny} object is created.
      *
-     * @return <code>true</code> if the pointer points to a component;
-     * <code>false</code> if there are no more components or this
-     * <code>DynAny</code> is associated with a basic type rather than
+     * @return {@code true} if the pointer points to a component;
+     * {@code false} if there are no more components or this
+     * {@code DynAny} is associated with a basic type rather than
      * a constructed type
      */
     public boolean next() ;
@@ -714,12 +715,12 @@
      * Moves the internal pointer to the given index. Logically, this method
      * sets a new offset for this pointer.
      *
-     * @param index an <code>int</code> indicating the position to which
+     * @param index an {@code int} indicating the position to which
      *              the pointer should move.  The first position is 0.
-     * @return <code>true</code> if the pointer points to a component;
-     * <code>false</code> if there is no component at the designated
-     * index.  If this <code>DynAny</code> object is associated with a
-     * basic type, this method returns <code>false</code> for any index
+     * @return {@code true} if the pointer points to a component;
+     * {@code false} if there is no component at the designated
+     * index.  If this {@code DynAny} object is associated with a
+     * basic type, this method returns {@code false} for any index
      * other than 0.
      */
     public boolean seek(int index) ;

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Fri Sep 25 12:04:34 2015 -0700
@@ -27,8 +27,9 @@
 package org.omg.CORBA;
 
 
-/** Represents a <tt>DynAny</tt> object associated
- *  with an array.
+/**
+ * Represents a {@code DynAny} object associated with an array.
+ *
  * @deprecated Use the new <a href="../DynamicAny/DynArray.html">DynArray</a> instead
  */
 @Deprecated

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,8 +26,9 @@
 
 package org.omg.CORBA;
 
-/** Represents a <tt>DynAny</tt> object  associated
- *  with an IDL enum.
+/**
+ * Represents a {@code DynAny} object associated with an IDL enum.
+ *
  * @deprecated Use the new <a href="../DynamicAny/DynEnum.html">DynEnum</a> instead
  */
 @Deprecated
@@ -35,14 +36,14 @@
 {
     /**
      * Return the value of the IDL enum stored in this
-     * <code>DynEnum</code> as a string.
+     * {@code DynEnum} as a string.
      *
      * @return the stringified value.
      */
     public String value_as_string();
 
     /**
-     * Set a particular enum in this <code>DynEnum</code>.
+     * Set a particular enum in this {@code DynEnum}.
      *
      * @param arg the string corresponding to the value.
      */

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,13 +26,13 @@
 
 
 /**
-* The Helper for <tt>FieldName</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FieldNameHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ * The Helper for {@code FieldName}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/FieldNameHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
+ */
 
 abstract public class FieldNameHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -31,7 +31,7 @@
 
 
 /**
- * The Holder for <tt>Fixed</tt>.  For more information on
+ * The Holder for {@code Fixed}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
  * FixedHolder is a container class for values of IDL type "fixed",
@@ -69,7 +69,7 @@
      * Read a fixed point value from the input stream and store it in
      * the value member.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_fixed();
@@ -77,9 +77,9 @@
 
     /**
      * Write the fixed point value stored in this holder to an
-     * <code>OutputStream</code>.
+     * {@code OutputStream}.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_fixed(value);
@@ -87,9 +87,9 @@
 
 
     /**
-     * Return the <code>TypeCode</code> of this holder object.
+     * Return the {@code TypeCode} of this holder object.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_fixed);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -31,45 +31,45 @@
 
 
 /**
- * The Holder for <tt>Float</tt>.  For more information on
+ * The Holder for {@code Float}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>float</code>
+ * A Holder class for a {@code float}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>float</code> as an "out"
+ * If an IDL method signature has an IDL {@code float} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>FloatHolder</code> as the corresponding
+ * {@code FloatHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myFloatHolder</code> is an instance of <code>FloatHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myFloatHolder.value</code>.
+ * If {@code myFloatHolder} is an instance of {@code FloatHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myFloatHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class FloatHolder implements Streamable {
     /**
-     * The <code>float</code> value held by this <code>FloatHolder</code>
+     * The {@code float} value held by this {@code FloatHolder}
      * object.
      */
     public float value;
 
     /**
-     * Constructs a new <code>FloatHolder</code> object with its
-     * <code>value</code> field initialized to 0.0.
+     * Constructs a new {@code FloatHolder} object with its
+     * {@code value} field initialized to 0.0.
      */
     public FloatHolder() {
     }
 
     /**
-     * Constructs a new <code>FloatHolder</code> object for the given
-     * <code>float</code>.
-     * @param initial the <code>float</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>FloatHolder</code> object
+     * Constructs a new {@code FloatHolder} object for the given
+     * {@code float}.
+     * @param initial the {@code float} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code FloatHolder} object
      */
     public FloatHolder(float initial) {
         value = initial;
@@ -79,7 +79,7 @@
      * Read a float from an input stream and initialize the value
      * member with the float value.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_float();
@@ -88,16 +88,16 @@
     /**
      * Write the float value into an output stream.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_float(value);
     }
 
     /**
-     * Return the <code>TypeCode</code> of this Streamable.
+     * Return the {@code TypeCode} of this Streamable.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_float);

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>FloatSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
-*
-*       <li> IDL/Java Language Mapping as defined in
-*       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code FloatSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/FloatSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
+ *       </li>
+ *
+ *       <li> IDL/Java Language Mapping as defined in
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class FloatSeqHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>FloatSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ * The Holder for {@code FloatSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/FloatSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ */
 
 public final class FloatSeqHolder implements org.omg.CORBA.portable.Streamable
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>IDLType</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IDLTypeHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:44 o'clock GMT+00:00
-*/
+ * The Helper for {@code IDLType}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/IDLTypeHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:44 o'clock GMT+00:00
+ */
 
 abstract public class IDLTypeHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java	Fri Sep 25 12:04:34 2015 -0700
@@ -25,10 +25,10 @@
 package org.omg.CORBA;
 
 /**
-* The interface for <tt>IDLType</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
-*/
+ * The interface for {@code IDLType}. For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * "Generated Files: Operations files"</a>.
+ */
 
 /*
  tempout/org/omg/CORBA/IDLTypeOperations.java
@@ -51,8 +51,8 @@
 {
     /**
      * The type attribute describes the type defined by an object
-     * derived from <code>IDLType</code>.
-     * @return the <code>TypeCode</code> defined by this object.
+     * derived from {@code IDLType}.
+     * @return the {@code TypeCode} defined by this object.
      */
     org.omg.CORBA.TypeCode type ();
 } // interface IDLTypeOperations

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java	Fri Sep 25 12:04:34 2015 -0700
@@ -32,7 +32,7 @@
  * exception is raised by ORB::string_to_object if the passed
  * string does not decode correctly. An ORB may choose to detect
  * calls via nil references (but is not obliged to do detect them).
- * <tt>INV_OBJREF</tt> is used to indicate this.<P>
+ * {@code INV_OBJREF} is used to indicate this.<P>
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -47,7 +47,7 @@
 
 public final class INV_OBJREF extends SystemException {
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with a default
+     * Constructs an {@code INV_OBJREF} exception with a default
      * minor code of 0 and a completion state of COMPLETED_NO.
      */
     public INV_OBJREF() {
@@ -55,7 +55,7 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified detail
+     * Constructs an {@code INV_OBJREF} exception with the specified detail
      * message, a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a detail message
      */
@@ -64,10 +64,10 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified
+     * Constructs an {@code INV_OBJREF} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public INV_OBJREF(int minor, CompletionStatus completed) {
@@ -75,12 +75,12 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified detail
+     * Constructs an {@code INV_OBJREF} exception with the specified detail
      * message, minor code, and completion status.
      * A detail message is a String that describes this particular exception.
      * @param s the String containing a detail message
      * @param minor the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public INV_OBJREF(String s, int minor, CompletionStatus completed) {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java	Fri Sep 25 12:04:34 2015 -0700
@@ -28,7 +28,7 @@
 /**
  * Standard exception  thrown
  * when an invocation cannot be made because of an incompatibility between
- * <tt>Policy</tt> overrides that apply to the particular invocation.
+ * {@code Policy} overrides that apply to the particular invocation.
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -39,7 +39,7 @@
 
 public final class INV_POLICY extends SystemException {
     /**
-     * Constructs a <code>INV_POLICY</code> exception with a default minor code
+     * Constructs a {@code INV_POLICY} exception with a default minor code
      * of 0, a completion state of CompletionStatus.COMPLETED_NO,
      * and a null description.
      */
@@ -48,7 +48,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the
+     * Constructs a {@code INV_POLICY} exception with the
      * specified description message,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a detail message
@@ -58,7 +58,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the specified
+     * Constructs a {@code INV_POLICY} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
      * @param completed the completion status
@@ -68,7 +68,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the
+     * Constructs a {@code INV_POLICY} exception with the
      * specified description message, minor code, and completion status.
      * @param s the String containing a description message
      * @param minor the minor code

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,10 +26,10 @@
 
 
 /**
-* The interface for <tt>IRObject</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
-*/
+ * The interface for {@code IRObject}.  For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * "Generated Files: Operations files"</a>.
+ */
 
 /*
  tempout/org/omg/CORBA/IRObjectOperations.java
@@ -39,7 +39,7 @@
 */
 
 /**
- * This is the Operations interface for the mapping from <tt>IRObject</tt>.
+ * This is the Operations interface for the mapping from {@code IRObject}.
  * Several interfaces are used as base interfaces for objects in
  * the Interface Repository (IR). These base interfaces are not instantiable.
  * A common set of operations is used to locate objects within the
@@ -59,8 +59,8 @@
 
     // read interface
     /**
-     * Returns the <code>DefinitionKind</code> corresponding to this Interface Repository object.
-     * @return the <code>DefinitionKind</code> corresponding to this Interface Repository object.
+     * Returns the {@code DefinitionKind} corresponding to this Interface Repository object.
+     * @return the {@code DefinitionKind} corresponding to this Interface Repository object.
      */
     org.omg.CORBA.DefinitionKind def_kind ();
 
@@ -70,13 +70,13 @@
      * this method is applied to all its contents. If the object contains an IDLType
      * attribute for an anonymous type, that IDLType is destroyed.
      * If the object is currently contained in some other object, it is removed.
-     * If the method is invoked on a <code>Repository</code> or on a <code>PrimitiveDef</code>
-     * then the <code>BAD_INV_ORDER</code> exception is raised with minor value 2.
+     * If the method is invoked on a {@code Repository} or on a {@code PrimitiveDef}
+     * then the {@code BAD_INV_ORDER} exception is raised with minor value 2.
      * An attempt to destroy an object that would leave the repository in an
-     * incoherent state causes <code>BAD_INV_ORDER</code> exception to be raised
+     * incoherent state causes {@code BAD_INV_ORDER} exception to be raised
      * with the minor code 1.
      * @exception BAD_INV_ORDER if this method is invoked on a repository or
-     *            <code>PrimitiveDef</code>, or if an attempt to destroy an
+     *            {@code PrimitiveDef}, or if an attempt to destroy an
      *            object would leave the repository in an incoherent state
      */
     void destroy ();

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java	Fri Sep 25 12:04:34 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>Identifier</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IdentifierHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:42 o'clock GMT+00:00
-*/
+ * The Helper for {@code Identifier}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/IdentifierHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:42 o'clock GMT+00:00
+ */
 
 abstract public class IdentifierHelper
 {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java	Fri Sep 25 12:04:34 2015 -0700
@@ -30,57 +30,57 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Int</tt>.  For more information on
+ * The Holder for {@code Int}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for an <code>int</code>
+ * A Holder class for an {@code int}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>long</code> as an "out"
+ * If an IDL method signature has an IDL {@code long} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>IntHolder</code> as the corresponding
+ * {@code IntHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myIntHolder</code> is an instance of <code>IntHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myIntHolder.value</code>.
+ * If {@code myIntHolder} is an instance of {@code IntHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myIntHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class IntHolder implements Streamable {
 
     /**
-     * The <code>int</code> value held by this <code>IntHolder</code>
-     * object in its <code>value</code> field.
+     * The {@code int} value held by this {@code IntHolder}
+     * object in its {@code value} field.
      */
     public int value;
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * Constructs a new {@code IntHolder} object with its
+     * {@code value} field initialized to {@code 0}.
      */
     public IntHolder() {
     }
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
-     * <code>value</code> field initialized to the given
-     * <code>int</code>.
-     * @param initial the <code>int</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>IntHolder</code> object
+     * Constructs a new {@code IntHolder} object with its
+     * {@code value} field initialized to the given
+     * {@code int}.
+     * @param initial the {@code int} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code IntHolder} object
      */
     public IntHolder(int initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to
-     * the <code>value</code> field in this <code>IntHolder</code> object.
+     * Reads unmarshalled data from {@code input} and assigns it to
+     * the {@code value} field in this {@code IntHolder} object.
      *
-     * @param input the <code>InputStream</code> object containing CDR
+     * @param input the {@code InputStream} object containing CDR
      *              formatted data from the wire
      */
     public void _read(InputStream input) {
@@ -88,10 +88,10 @@
     }
 
     /**
-     * Marshals the value in this <code>IntHolder</code> object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * Marshals the value in this {@code IntHolder} object's
+     * {@code value} field to the output stream {@code output}.
      *
-     * @param output the <code>OutputStream</code> object that will contain
+     * @param output the {@code OutputStream} object that will contain
      *               the CDR formatted data
      */
     public void _write(OutputStream output) {
@@ -99,11 +99,11 @@
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds
-     * to the value held in this <code>IntHolder</code> object's
-     * <code>value</code> field.
+     * Retrieves the {@code TypeCode} object that corresponds
+     * to the value held in this {@code IntHolder} object's
+     * {@code value} field.
      *
-     * @return    the type code for the value held in this <code>IntHolder</code>
+     * @return    the type code for the value held in this {@code IntHolder}
      *            object
      */
     public org.omg.CORBA.TypeCode _type() {

--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Fri Sep 18 10:09:38 2015 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Fri Sep 25 12:04:34 2015 -0700
@@ -30,26 +30,26 @@
 /**
  * Used as a base class for implementation of a local IDL interface in the
  * Java language mapping.  It is a class which implements all the operations
- * in the <tt>org.omg.CORBA.Object</tt> interface.
+ * in the {@code org.omg.CORBA.Object} interface.
  * <P>Local interfaces are implemented by using CORBA::LocalObject
- *  to provide implementations of <code>Object</code> pseudo
- *  operations and any other ORB-specific support mechanisms that are
- *  appropriate for such objects.  Object implementation techniques are
- *  inherently language-mapping specific.  Therefore, the
- *  <code>LocalObject</code> type is not defined in IDL, but is specified
- *  in each language mapping.
- *  <P>Methods that do not apply to local objects throw
- *  an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with the message,
- *  "This is a locally contrained object."  Attempting to use a
- *  <TT>LocalObject</TT> to create a DII request results in NO_IMPLEMENT
- *  system exception.  Attempting to marshal or stringify a
- *  <TT>LocalObject</TT> results in a MARSHAL system exception.  Narrowing
- *  and widening references to <TT>LocalObjects</TT> must work as for regular
- *  object references.
- *  <P><code>LocalObject</code> is to be used as the base class of locally
- *  constrained objects, such as those in the PortableServer module.
- *  The specification here is based on the CORBA Components
- *  Volume I - orbos/99-07-01
+ * to provide implementations of {@code Object} pseudo
+ * operations and any other ORB-specific support mechanisms that are
+ * appropriate for such objects.  Object implementation techniques are
+ * inherently language-mapping specific.  Therefore, the
+ * {@code LocalObject} type is not defined in IDL, but is specified
+ * in each language mapping.
+ * <P>Methods that do not apply to local objects throw
+ * an {@code org.omg.CORBA.NO_IMPLEMENT} exception with the message,
+ * "This is a locally contrained object."  Attempting to use a
+ * {@code LocalObject} to create a DII request results in NO_IMPLEMENT
+ * system exception.  Attempting to marshal or stringify a
+ * {@code LocalObject} results in a MARSHAL system exception.  Narrowing
+ * and widening references to {@code LocalObjects} must work as for regular
+ * object references.
+ * <P>{@code LocalObject} is to be used as the base class of locally
+ * constrained objects, such as those in the PortableServer module.
+ * The specification here is based on the CORBA Components
+ * Volume I - orbos/99-07-01
  *
  * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
  *      comments for unimplemented features</a>
@@ -60,7 +60,7 @@
     private static String reason = "This is a locally constrained object.";
 
     /**
-     * Constructs a default <code>LocalObject</code> instance.
+     * Constructs a default {@code LocalObject} instance.
      */
     public LocalObject() {}
 
@@ -75,9 +75,9 @@
      * <P>Default implementation of the org.omg.CORBA.Object method.
      *
      * @param that the object reference with which to check for equivalence
-     * @return <code>true</code> if this object reference is known to be
+     * @return {@code true} if this object reference is known to be
      *         equivalent to the given object reference.
-     *         Note that <code>false</code> indicates only that the two
+     *         Note that {@code false} indicates only that the two
      *         object references are distinct, not necessarily that
      *         they reference distinct objects.
      */
@@ -86,11 +86,11 @@
     }
 
     /**
-     * Always returns <code>false</code>.
+     * Always returns {@code false}.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @return <code>false</code>
+     * @return {@code false}
      */
     public boolean _non_existent() {
         return false;
@@ -100,9 +100,9 @@
      * Returns a hash value that is consistent for the
      * lifetime of the object, using the given number as the maximum.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param maximum an <code>int</code> identifying maximum value of
+     * @param maximum an {@code int} identifying maximum value of
      *                the hashcode
      * @return this instance's hashcode
      */
@@ -111,13 +111,13 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."  This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param repository_id a <code>String</code>
+     * @param repository_id a {@code String}
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -130,12 +130,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @return a duplicate of this <code>LocalObject</code> instance.
+     * @return a duplicate of this {@code LocalObject} instance.
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -145,10 +145,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -159,14 +159,14 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param operation a <code>String</code> giving the name of an operation
+     * @param operation a {@code String} giving the name of an operation
      *        to be performed by the request that is returned
-     * @return a <code>Request</code> object with the given operation
+     * @return a {@code Request} object with the given operation
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -176,20 +176,20 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param ctx          a <code>Context</code> object containing
+     * @param ctx          a {@code Context} object containing
      *                     a list of properties
-     * @param operation    the <code>String</code> representing the name of the
+     * @param operation    the {@code String} representing the name of the
      *                     method to be invoked
-     * @param arg_list     an <code>NVList</code> containing the actual arguments
+     * @param arg_list     an {@code NVList} containing the actual arguments
      *                     to the method being invoked
-     * @param result       a <code>NamedValue</code> object to serve as a
+     * @param result       a {@code NamedValue} object to serve as a
      *                     container for the method's return value
-     * @return a new <code>Request</code> object initialized with the given
+     * @return a new {@code Request} object initialized with the given
      * arguments
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -203,25 +203,25 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param ctx          a <code>Context</code> object containing
+     * @param ctx          a {@code Context} object containing
      *                     a list of properties
      * @param operation    the name of the method to be invoked
-     * @param arg_list     an <code>NVList</code> containing the actual arguments
+     * @param arg_list     an {@code NVList} containing the actual arguments
      *                     to the method being invoked
-     * @param result       a <code>NamedValue</code> object to serve as a
+     * @param result       a {@code NamedValue} object to serve as a
      *                     container for the method's return value
-     * @param exceptions   an <code>ExceptionList</code> object containing a
+     * @param exceptions   an {@code ExceptionList} object containing a
      *                     list of possible exceptions the method can throw
-     * @param contexts     a <code>ContextList</code> object containing a list of
+     * @param contexts     a {@code ContextList} object containing a list of
      *                     context strings that need to be resolved and sent
      *                     with the
-     *                     <code>Request</code> instance
-     * @return the new <code>Request</code> object initialized with the given
+     *                     {@code Request} instance
+     * @return the new {@code Request} object initialized with the given
      * arguments
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -237,11 +237,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -256,10 +256,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -278,12 +278,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * @return the ORB instance that created the Delegate contained in this
-     * <code>ObjectImpl</code>
+     * {@code ObjectImpl}
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -293,13 +293,13 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param policy_type  an <code>int</code>
+     * @param policy_type  an {@code int}
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -313,11 +313,11 @@
 
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -328,11 +328,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @param policies an array
      * @param set_add a flag
@@ -351,13 +351,13 @@
 
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
-     * Returns <code>true</code> for this <code>LocalObject</code> instance.
+     * {@code org.omg.CORBA.Object} method.<P>
+     * Returns {@code true} for this {@code LocalObject} instance.
      *
-     * @return <code>true</code> always
+     * @return {@code true} always
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -367,12 +367,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param operation a <code>String</code> indicating which operation
+     * @param operation a {@code String} indicating which operation
      *                  to preinvoke
      * @param expectedType the class of the type of operation mentioned above
      * @return NO_IMPLEMENT because this is a locally constrained object
@@ -388,10 +388,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @param servant the servant object on which to post-invoke
      * @exception NO_IMPLEMENT
@@ -408,17 +408,17 @@
      */
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>Called by a stub to obtain an OutputStream for
      * marshaling arguments. The stub must supply the operation name,
      * and indicate if a response is expected (i.e is this a oneway call).
      *
      * @param operation the name of the operation being requested
-     * @param responseExpected <code>true</code> if a response is expected,
-     *                         <code>false</code> if it is a one-way call
+     * @param responseExpected {@code true} if a response is expected,
+     *                         {@code false} if it is a one-way call
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -432,32 +432,32 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>Called to invoke an operation. The stub provides an
-     * <code>OutputStream</code> that was previously returned by a
-     * <code>_request()</code>
-     * call. <code>_invoke</code> returns an <code>InputStream</code> which
+     * {@code OutputStream} that was previously returned by a
+     * {@code _request()}
+     * call. {@code _invoke} returns an {@code InputStream} which
      * contains the
-     * marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains an
-     * <code>InputStream</code> from
+     * marshaled reply. If an exception occurs, {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains an
+     * {@code InputStream} from
      * which the user exception state may be unmarshaled.
      *
-     * @param output the <code>OutputStream</code> to invoke
+     * @param output the {@code OutputStream} to invoke
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @throws ApplicationException If an exception occurs,
-     * <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains
-     * an <code>InputStream</code> from
+     * {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains
+     * an {@code InputStream} from
      * which the user exception state may be unmarshaled.
      * @throws RemarshalException If an exception occurs,
-     * <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains
-     * an <code>InputStream</code> from
+     * {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains
+     * an {@code InputStream} from
      * which the user exception state may be unmarshaled.
      * @exception NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -471,17 +471,17 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>May optionally be called by a stub to release a
      * reply stream back to the ORB when the unmarshaling has
-     * completed. The stub passes the <code>InputStream</code> returned by
-     * <code>_invoke()</code> or
-     * <code>ApplicationException.getInputStream()</code>.
+     * completed. The stub passes the {@code InputStream} returned by
+     * {@code _invoke()} or
+     * {@code ApplicationException.getInputStream()}.
      * A null
-     * value may also be passed to <code>_releaseReply</code>, in which case the
+     * value may also be passed to {@code _releaseReply}, in which case the
      * method is a no-op.
      *
      * @param input the reply stream back to the ORB or null
@@ -494,11 +494,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects