# HG changeset patch
# User lana
# Date 1435878506 25200
# Node ID f9f3706bd24c42c07cb260fe05730a749b8e52f4
# Parent  0e988eecdbe1571a7a316decd78babaa88c52d3c# Parent  c580f8cf1bc873d1cb1f6d19507fdb9fc1b694fc
Merge

diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Thu Jul 02 16:08:26 2015 -0700
@@ -65,7 +65,7 @@
 import sun.corba.Bridge;
 
 /**
- * A ObjectStreamClass describes a class that can be serialized to a stream
+ * An ObjectStreamClass describes a class that can be serialized to a stream
  * or a class that was serialized to a stream.  It contains the name
  * and the serialVersionUID of the class.
  * <br>
@@ -788,9 +788,9 @@
     /* Compare the base class names of streamName and localName.
      *
      * @return  Return true iff the base class name compare.
-     * @parameter streamName    Fully qualified class name.
-     * @parameter localName     Fully qualified class name.
-     * @parameter pkgSeparator  class names use either '.' or '/'.
+     * @param streamName    Fully qualified class name.
+     * @param localName     Fully qualified class name.
+     * @param pkgSeparator  class names use either '.' or '/'.
      *
      * Only compare base class name to allow package renaming.
      */
diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java	Thu Jul 02 16:08:26 2015 -0700
@@ -656,9 +656,9 @@
     /* Compare the base class names of streamName and localName.
      *
      * @return  Return true iff the base class name compare.
-     * @parameter streamName    Fully qualified class name.
-     * @parameter localName     Fully qualified class name.
-     * @parameter pkgSeparator  class names use either '.' or '/'.
+     * @param streamName    Fully qualified class name.
+     * @param localName     Fully qualified class name.
+     * @param pkgSeparator  class names use either '.' or '/'.
      *
      * Only compare base class name to allow package renaming.
      */
diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java
--- a/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java	Thu Jul 02 16:08:26 2015 -0700
@@ -27,10 +27,10 @@
 
 
 /**
- * This Helper class is used to facilitate the marshalling of <tt>Bounds</tt>.
+ * This Helper class is used to facilitate the marshalling of {@code Bounds}.
  * For more information on Helper files, see
  * <a href="doc-files/generatedfiles.html#helper">
- * "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.
  */
 
 abstract public class BoundsHelper
diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java
--- a/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java	Thu Jul 02 16:08:26 2015 -0700
@@ -28,10 +28,10 @@
 
 /**
  * This Helper class is used to facilitate the marshalling of
- * <tt>ORBPackage/InvalidName</tt>.
+ * {@code ORBPackage/InvalidName}.
  * For more information on Helper files, see
  * <a href="doc-files/generatedfiles.html#helper">
- * "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.
  */
 
 abstract public class InvalidNameHelper
diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java
--- a/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java	Thu Jul 02 16:08:26 2015 -0700
@@ -28,10 +28,10 @@
 
 /**
  * This Helper class is used to facilitate the marshalling of
- * <tt>TypeCodePackage/BadKind</tt>.
+ * {@code TypeCodePackage/BadKind}.
  * For more information on Helper files, see
  * <a href="doc-files/generatedfiles.html#helper">
- * "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.
  */
 
 abstract public class BadKindHelper
diff -r 0e988eecdbe1 -r f9f3706bd24c src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java
--- a/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java	Thu Jul 02 08:53:57 2015 -0700
+++ b/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java	Thu Jul 02 16:08:26 2015 -0700
@@ -28,10 +28,10 @@
 
 /**
  * This Helper class is used to facilitate the marshalling of
- * <tt>TypeCodePackage/Bounds</tt>.
+ * {@code TypeCodePackage/Bounds}.
  * For more information on Helper files, see
  * <a href="doc-files/generatedfiles.html#helper">
- * "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.
  */
 
 abstract public class BoundsHelper