diff --git a/corba/src/java.corba/share/classes/javax/activity/package.html b/corba/src/java.corba/share/classes/javax/activity/package.html
index bceb353231a..d9696cc090a 100644
--- a/corba/src/java.corba/share/classes/javax/activity/package.html
+++ b/corba/src/java.corba/share/classes/javax/activity/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2004, 2015, Oracle and/or its affiliates. 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
@@ -30,7 +30,7 @@ questions.
 <body bgcolor="white">
 Contains Activity service related exceptions thrown by the ORB machinery during
 unmarshalling.
-<p>
+
 @since 1.5
 </body>
 </html>
diff --git a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java
index 61d91c7673a..5a18212765a 100644
--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -232,6 +232,8 @@ Tie#deactivate}
      * and <tt>loader</tt> is non-null, then call <tt>loader.loadClass(className)</tt>.
      * <LI>If a class was successfully loaded by step 1, 2, 3, or 4, then
      *  return the loaded class, else throw <tt>ClassNotFoundException</tt>.
+     * </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.
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java
index a5f7a9c0459..df47eeccf9d 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Any.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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
@@ -52,21 +52,21 @@ import org.omg.CORBA.portable.IDLEntity;
  * </OL>
  *
  * <P>
- * <a name="anyOps"</a>
+ * <a name="anyOps"></a>
  * A large part of the <code>Any</code> class consists of pairs of methods
  * for inserting values into and extracting values from an
  * <code>Any</code> object.
  * <P>
  * For a given primitive type X, these methods are:
  *  <dl>
- *      <dt><code><bold> void insert_X(X x)</bold></code>
+ *      <dt><code><b>void insert_X(X x)</b></code>
  *      <dd> This method allows the insertion of
  *        an instance <code>x</code> of primitive type <code>X</code>
  *    into the <code>value</code> field of the <code>Any</code> object.
  *    Note that the method
  *    <code>insert_X</code> also resets the <code>Any</code> object's
  *    <code>type</code> field if necessary.
- *      <dt> <code><bold>X extract_X()</bold></code>
+ *      <dt> <code><b>X extract_X()</b></code>
  *      <dd> This method allows the extraction of an instance of
  *        type <code>X</code> from the <code>Any</code> object.
  *    <BR>
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java
index b3ba945415a..a8ad47d058b 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. 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
@@ -40,10 +40,10 @@ package org.omg.CORBA;
  * <P>
  * The class also contains two methods:
  * <UL>
- * <LI><code>public int <bold>value</bold>()</code> -- which accesses the
+ * <LI><code>public int <b>value</b>()</code> -- which accesses the
  * <code>value</code> field of a <code>CompletionStatus</code> object
  * <LI><code>public static CompletionStatus
- * <bold>from_int</bold>(int i)</code> --
+ * <b>from_int</b>(int i)</code> --
  * for creating an instance from one of the <code>int</code> members
  * </UL>
  * @see     org.omg.CORBA.SystemException
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java
index 653d304afb2..d90792a44ae 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DataInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -35,7 +35,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 {
     /** Reads an IDL <code>Any</code> value from the input stream.
     * @return  the <code>Any</code> read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -43,7 +43,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL boolean value from the input stream.
     * @return  the boolean read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -51,7 +51,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL character value from the input stream.
     * @return  the character read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -59,7 +59,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL wide character value from the input stream.
     * @return  the wide character read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -67,7 +67,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL octet value from the input stream.
     * @return  the octet value read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -75,7 +75,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL short from the input stream.
     * @return  the short read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -83,7 +83,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL unsigned short from the input stream.
     * @return  the unsigned short read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -91,7 +91,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL long from the input stream.
     * @return  the long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -99,7 +99,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL unsigned long from the input stream.
     * @return  the unsigned long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -107,7 +107,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL long long from the input stream.
     * @return  the long long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -115,7 +115,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an unsigned IDL long long from the input stream.
     * @return  the unsigned long long read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -123,7 +123,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL float from the input stream.
     * @return  the float read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -131,7 +131,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL double from the input stream.
     * @return  the double read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -140,7 +140,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL string from the input stream.
     * @return  the string read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -148,7 +148,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL wide string from the input stream.
     * @return  the wide string read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -156,7 +156,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL CORBA::Object from the input stream.
     * @return  the CORBA::Object read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -164,7 +164,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL Abstract interface from the input stream.
     * @return  the Abstract interface read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -172,7 +172,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL value type from the input stream.
     * @return  the value type read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -180,7 +180,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
 
     /** Reads an IDL typecode from the input stream.
     * @return  the typecode read.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -192,7 +192,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -204,7 +204,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -216,7 +216,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -228,7 +228,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -240,7 +240,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -252,7 +252,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -264,7 +264,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -276,7 +276,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -288,7 +288,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -300,7 +300,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -312,7 +312,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -324,7 +324,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
@@ -336,7 +336,7 @@ public interface DataInputStream extends org.omg.CORBA.portable.ValueBase
     * @param offset The index into seq of the first element to read from the
     * input stream.
     * @param length The number of elements to read from the input stream.
-    * @throws <code>org.omg.CORBA.MARSHAL</code>
+    * @throws org.omg.CORBA.MARSHAL
     * If an inconsistency is detected, including not having registered
     * a streaming policy, then the standard system exception MARSHAL is raised.
     */
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java
index 048c6a23048..6aba94ad75d 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -71,7 +71,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * to attempt determination of whether two distinct object references
      * refer to the same object, since such determination could be impractically
      * expensive.
-     * <P>Default implementation of the org.omg.CORBA.Object method. <P>
+     * <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
@@ -87,7 +87,7 @@ public class LocalObject implements org.omg.CORBA.Object
     /**
      * Always returns <code>false</code>.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @return <code>false</code>
      */
@@ -99,9 +99,10 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param maximum an <code>int</code> identifying maximum value of
-     *                  the hashcode
+     *                the hashcode
      * @return this instance's hashcode
      */
     public int _hash(int maximum) {
@@ -113,7 +114,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param repository_id a <code>String</code>
      * @return NO_IMPLEMENT because this is a locally constrained object
@@ -131,7 +132,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @return a duplicate of this <code>LocalObject</code> instance.
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -145,7 +147,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -158,7 +161,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param operation a <code>String</code> giving the name of an operation
      *        to be performed by the request that is returned
@@ -175,7 +178,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param ctx          a <code>Context</code> object containing
      *                     a list of properties
@@ -202,7 +205,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
      *
      * @param ctx          a <code>Context</code> object containing
      *                     a list of properties
@@ -237,7 +240,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @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
@@ -254,7 +258,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -275,7 +280,7 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
      * @return the ORB instance that created the Delegate contained in this
      * <code>ObjectImpl</code>
      * @exception NO_IMPLEMENT
@@ -291,7 +296,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param policy_type  an <code>int</code>
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -310,7 +316,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -347,7 +354,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * Returns <code>true</code> for this <code>LocalObject</code> instance.
+     *
      * @return <code>true</code> always
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -361,7 +369,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param operation a <code>String</code> indicating which operation
      *                  to preinvoke
      * @param expectedType the class of the type of operation mentioned above
@@ -381,7 +390,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> 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>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @param servant the servant object on which to post-invoke
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -403,8 +413,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * <code>org.omg.CORBA.Object</code> 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).<P>
+     * 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
@@ -433,7 +443,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
      * <code>ApplicationException</code> object which contains an
      * <code>InputStream</code> from
-     * which the user exception state may be unmarshaled.<P>
+     * which the user exception state may be unmarshaled.
+     *
      * @param output the <code>OutputStream</code> to invoke
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -470,7 +481,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * <code>ApplicationException.getInputStream()</code>.
      * A null
      * value may also be passed to <code>_releaseReply</code>, in which case the
-     * method is a no-op.<P>
+     * method is a no-op.
+     *
      * @param input the reply stream back to the ORB or null
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -485,7 +497,8 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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.<P>
+     * <code>org.omg.CORBA.Object</code> method.
+     *
      * @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
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java b/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java
index 993610f55b1..e60a7e32e79 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/NVList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. 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
@@ -63,7 +63,6 @@ package org.omg.CORBA;
  * Note also that you can add any number of
  * <code>NamedValue</code> objects to this list regardless of
  * its original length.
- * <P>
  * <LI><code>org.omg.CORBA.ORB.create_operation_list</code>
  * <PRE>
  *    org.omg.CORBA.NVList nv = orb.create_operation_list(myOperationDef);
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
index cc66222b692..1f1fbd04f0d 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2015, Oracle and/or its affiliates. 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
@@ -101,7 +101,7 @@ import sun.reflect.misc.ReflectUtil;
  * <P>
  * When an ORB instance is being created, the class name of the ORB
  * implementation is located using
- * the following standard search order:<P>
+ * the following standard search order:
  *
  * <OL>
  *     <LI>check in Applet parameter or application string array, if any
@@ -1036,7 +1036,7 @@ abstract public class ORB {
      * <P>
      * Recursive types can only appear within sequences which can be empty.
      * That way marshaling problems, when transmitting the struct in an Any, are avoided.
-     * <P>
+     *
      * @param id                 the logical id of the referenced type
      * @return                   the requested TypeCode
      */
@@ -1179,7 +1179,7 @@ abstract public class ORB {
      * value <tt>true</tt>. If no information for the requested
      * services type is available, the operation returns <tt>false</tt>
      *  (i.e., the service is not supported by this ORB).
-     * <P>
+     *
      * @param service_type a <code>short</code> indicating the
      *        service type for which information is being requested
      * @param service_info a <code>ServiceInformationHolder</code> object
@@ -1203,7 +1203,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynAny</code> object from the given
      * <code>Any</code> object.
-     * <P>
+     *
      * @param value the <code>Any</code> object from which to create a new
      *        <code>DynAny</code> object
      * @return the new <code>DynAny</code> object created from the given
@@ -1221,7 +1221,7 @@ abstract public class ORB {
     /**
      * Creates a basic <code>DynAny</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynAny</code> object
      * @return the new <code>DynAny</code> object created from the given
@@ -1241,7 +1241,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynStruct</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynStruct</code> object
      * @return the new <code>DynStruct</code> object created from the given
@@ -1261,7 +1261,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynSequence</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynSequence</code> object
      * @return the new <code>DynSequence</code> object created from the given
@@ -1282,7 +1282,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynArray</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynArray</code> object
      * @return the new <code>DynArray</code> object created from the given
@@ -1302,7 +1302,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynUnion</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynUnion</code> object
      * @return the new <code>DynUnion</code> object created from the given
@@ -1322,7 +1322,7 @@ abstract public class ORB {
     /**
      * Creates a new <code>DynEnum</code> object from the given
      * <code>TypeCode</code> object.
-     * <P>
+     *
      * @param type the <code>TypeCode</code> object from which to create a new
      *        <code>DynEnum</code> object
      * @return the new <code>DynEnum</code> object created from the given
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java
index df7c023967b..7875dd99138 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Object.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2015, Oracle and/or its affiliates. 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
@@ -53,7 +53,7 @@ package org.omg.CORBA;
  * <code>org.omg.CORBA.Object</code>
  * are provided in the class <code>org.omg.CORBA.portable.ObjectImpl</code>,
  * which is the base class for stubs and object implementations.
- * <p>
+ *
  * @see org.omg.CORBA.portable.ObjectImpl
  */
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java b/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java
index 8c30a84aae1..f8459706fdc 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Principal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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
@@ -31,7 +31,7 @@ package org.omg.CORBA;
  * the client, for access control
  * and other purposes. It contains a single attribute, the name of the
  * <code>Principal</code>, encoded as a sequence of bytes.
- * <P>
+ *
  * @deprecated Deprecated by CORBA 2.2.
  */
 @Deprecated
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java
index 9131cf8102b..f4f5ed264ae 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. 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
@@ -57,7 +57,7 @@ package org.omg.CORBA;
  * Similarly, type information needs to be provided for the response,
  * for either the expected result or for an exception, so the methods
  * <code>result</code> and <code>except</code> take an <code>Any</code>
- * object as a parameter. <p>
+ * object as a parameter.
  *
  * @see org.omg.CORBA.DynamicImplementation
  * @see org.omg.CORBA.NVList
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java
index 646730c3a03..8ed7eb3e658 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ShortHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2015, Oracle and/or its affiliates. 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
@@ -32,8 +32,8 @@ import org.omg.CORBA.portable.OutputStream;
 /**
  * The Holder for <tt>Short</tt>.  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>short</code>
+ * "Generated Files: Holder Files"</a>.
+ * <P>A Holder class for a <code>short</code>
  * that is used to store "out" and "inout" parameters in IDL operations.
  * If an IDL operation signature has an IDL <code>short</code> as an "out"
  * or "inout" parameter, the programmer must pass an instance of
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java
index bfacebf18d9..60e89a82702 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TCKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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
@@ -52,7 +52,7 @@ package org.omg.CORBA;
  * The variable <code>k</code> represents the <code>TCKind</code>
  * instance for the IDL type <code>string</code>, which is
  * <code>tk_string</code>.
- * <P>
+ *
  * <LI>the method <code>value</code> for accessing the
  * <code>_value</code> field of a <code>TCKind</code> constant
  * <P>Example:
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java
index 74fc7d9c64c..8366a75d31c 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. 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
@@ -31,7 +31,7 @@ import org.omg.CORBA.portable.IDLEntity;
 /**
  * A container for information about a specific CORBA data
  * type.
- *<P>
+ * <P>
  * <code>TypeCode</code> objects are used:
  * <UL>
  * <LI>in the Dynamic Invocation Interface -- to indicate the types
@@ -59,7 +59,7 @@ import org.omg.CORBA.portable.IDLEntity;
  * with the value
  * <code>TCKind.tk_sequence</code> and also fields with the values
  * <code>boolean</code> and <code>10</code> for the
- * type of sequence elements and the length of the sequence. <p>
+ * type of sequence elements and the length of the sequence.
  * </UL>
  *
  * <code>TypeCode</code> objects can be obtained in various ways:
@@ -164,8 +164,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * Java IDL extends the CORBA specification to allow all operations permitted
  * on a <code>struct</code> <code>TypeCode</code> to be permitted
- * on an <code>exception</code> <code>TypeCode</code> as well. <p>
- *
+ * on an <code>exception</code> <code>TypeCode</code> as well.
  */
 public abstract class TypeCode implements IDLEntity {
 
@@ -175,23 +174,21 @@ public abstract class TypeCode implements IDLEntity {
      * they are interchangeable and give identical results when
      * <code>TypeCode</code> operations are applied to them.
      *
-     * @param tc                the <code>TypeCode</code> object to compare against
-     * @return          <code>true</code> if the type codes are equal;
+     * @param tc      the <code>TypeCode</code> object to compare against
+     * @return        <code>true</code> if the type codes are equal;
      *                <code>false</code> otherwise
      */
-
     public abstract boolean equal(TypeCode tc);
 
     /**
-         * Tests to see if the given <code>TypeCode</code> object is
-         * equivalent to this <code>TypeCode</code> object.
-         * <P>
-         *
-         *
-         * @param tc the typecode to compare with this typecode
-         *
-         * @return <code>true</code> if the given typecode is equivalent to
-         *         this typecode; <code>false</code> otherwise
+     * Tests to see if the given <code>TypeCode</code> object is
+     * equivalent to this <code>TypeCode</code> object.
+     *
+     *
+     * @param tc the typecode to compare with this typecode
+     *
+     * @return <code>true</code> if the given typecode is equivalent to
+     *         this typecode; <code>false</code> otherwise
      *
      */
     public abstract boolean equivalent(TypeCode tc);
@@ -199,9 +196,9 @@ public abstract class TypeCode implements IDLEntity {
     /**
      * Strips out all optional name and member name fields,
      * but leaves all alias typecodes intact.
-         * @return a <code>TypeCode</code> object with optional name and
-         *         member name fields stripped out, except for alias typecodes,
-         *         which are left intact
+     * @return a <code>TypeCode</code> object with optional name and
+     *         member name fields stripped out, except for alias typecodes,
+     *         which are left intact
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
@@ -220,7 +217,6 @@ public abstract class TypeCode implements IDLEntity {
      *            value of the <code>kind</code> field of this
      *                  <code>TypeCode</code> object
      */
-
     public abstract TCKind kind();
 
     /**
@@ -239,13 +235,12 @@ public abstract class TypeCode implements IDLEntity {
      * also always have a RepositoryId. If there is no RepositoryId, the
      * method can return an empty string.
      *
-     * @return          the RepositoryId for this <code>TypeCode</code> object
-     *                or an empty string if there is no RepositoryID
+     * @return the RepositoryId for this <code>TypeCode</code> object
+     *         or an empty string if there is no RepositoryID
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if the method
      *           is invoked on an inappropriate kind of<code>TypeCode</code>
      *           object
      */
-
     public abstract String id() throws BadKind;
 
     /**
@@ -268,7 +263,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of<code>TypeCode</code>
      *           object
      */
-
     public abstract String name() throws BadKind;
 
     /**
@@ -287,7 +281,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract int member_count() throws BadKind;
 
     /**
@@ -312,7 +305,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract String member_name(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -336,7 +328,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode member_type(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -344,13 +335,13 @@ public abstract class TypeCode implements IDLEntity {
      * Retrieves the label of the union member
      * identified by the given index. For the default member,
      * the label is the zero octet.
-     *<P>
+     * <P>
      * The method <code>member_label</code> can only be invoked on union
      * <code>TypeCode</code> objects.
      *
-     * @param index     index of the union member for which the
+     * @param index   index of the union member for which the
      *                label is being requested
-     * @return          an <code>Any</code> object describing the label of
+     * @return        an <code>Any</code> object describing the label of
      *                the requested union member or the zero octet for
      *                the default member
      * @throws org.omg.CORBA.TypeCodePackage.Bounds if the index is
@@ -360,7 +351,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract Any member_label(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds;
 
@@ -376,7 +366,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode discriminator_type()
         throws BadKind;
 
@@ -393,7 +382,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on a non-union <code>TypeCode</code>
      *           object
      */
-
     public abstract int default_index() throws BadKind;
 
     /**
@@ -412,7 +400,6 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract int length() throws BadKind;
 
     /**
@@ -424,7 +411,7 @@ public abstract class TypeCode implements IDLEntity {
      * that multidimensional arrays are represented by nesting
      * <code>TypeCode</code> objects, one per dimension.
      * For boxed valuetypes, it returns the boxed type.
-     *<P>
+     * <P>
      * The method <code>content_type</code> can be invoked on sequence, array,
      * alias, and boxed valuetype <code>TypeCode</code> objects.
      *
@@ -436,37 +423,36 @@ public abstract class TypeCode implements IDLEntity {
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
      */
-
     public abstract TypeCode content_type() throws BadKind;
 
 
     /**
-         * Returns the number of digits in the fixed type described by this
-         * <code>TypeCode</code> object. For example, the typecode for
-         * the number 3000.275d could be <code>fixed<7,3></code>, where
-         * 7 is the precision and 3 is the scale.
-         *
-         * @return the total number of digits
+     * Returns the number of digits in the fixed type described by this
+     * <code>TypeCode</code> object. For example, the typecode for
+     * the number 3000.275d could be <code>fixed&lt;7,3&gt;</code>, where
+     * 7 is the precision and 3 is the scale.
+     *
+     * @return the total number of digits
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
-         *
+     *
      */
     public abstract short fixed_digits() throws BadKind ;
 
     /**
-         * Returns the scale of the fixed type described by this
-         * <code>TypeCode</code> object. A positive number indicates the
-         * number of digits to the right of the decimal point.
-         * For example, the number 3000d could have the
-         * typecode <code>fixed<4,0></code>, where the first number is
-         * the precision and the second number is the scale.
-         * A negative number is also possible and adds zeroes to the
-         * left of the decimal point.  In this case, <code>fixed<1,-3></code>,
-         * could be the typecode for the number 3000d.
-         *
-         * @return the scale of the fixed type that this
-         *         <code>TypeCode</code> object describes
+     * Returns the scale of the fixed type described by this
+     * <code>TypeCode</code> object. A positive number indicates the
+     * number of digits to the right of the decimal point.
+     * For example, the number 3000d could have the
+     * typecode <code>fixed&lt;4,0&gt;</code>, where the first number is
+     * the precision and the second number is the scale.
+     * A negative number is also possible and adds zeroes to the
+     * left of the decimal point.  In this case, <code>fixed&lt;1,-3&gt;</code>,
+     * could be the typecode for the number 3000d.
+     *
+     * @return the scale of the fixed type that this
+     *         <code>TypeCode</code> object describes
      * @throws org.omg.CORBA.TypeCodePackage.BadKind if this method
      *           is invoked on an inappropriate kind of <code>TypeCode</code>
      *           object
@@ -492,7 +478,6 @@ public abstract class TypeCode implements IDLEntity {
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public short member_visibility(int index)
         throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds ;
 
@@ -512,7 +497,6 @@ public abstract class TypeCode implements IDLEntity {
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public short type_modifier() throws BadKind ;
 
     /**
@@ -528,6 +512,5 @@ public abstract class TypeCode implements IDLEntity {
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
-
     abstract public TypeCode concrete_base_type() throws BadKind ;
 }
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html
index ff57fbd24be..1ccbbfd6496 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/compliance.html
@@ -55,44 +55,30 @@ file.</li>
 
 <li>
 CORBA 2.3.1 chapter 4 with the following replacements from the Portable
-Interceptors specification:</li>
-
-	<ul>
-	<li>
-	section 4.2.3.5 <TT>destroy</TT></li>
-
-	<li>
-	section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
-
-	<li>
-	Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
-	</ul>
+Interceptors specification:
+ <ul>
+ <li>section 4.2.3.5 <TT>destroy</TT></li>
+ <li>section 4.5.2 <TT>CodeFactory</TT> and <TT>PICurrent</TT> are required</li>
+ <li>Section 4.5.3.4 as updated for <TT>register_initial_reference</TT></li>
+ </ul>
+</li>
 
 <li>
 CORBA 2.3.1 chapter 5 with the following update from the Portable Interceptors
-specification:</li>
-
-	<ul>
-	<li>
-	5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required. This adds the 
-following 
-	classes
-	to <TT>org.omg.CORBA</TT>:</li>
-
-	<ul>
-	<li>
-	<TT>StringSeqHolder</TT></li>
-
-	<li>
-	<TT>StringSeqHelper</TT></li>
-
-	<li>
-	<TT>WStringSeqHolder</TT></li>
-
-	<li>
-	<TT>WStringSeqHelper</TT></li>
-	</ul>
-</ul>
+specification:
+ <ul>
+  <li>
+  5.5.2 <TT>StringSeq</TT> and <TT>WStringSeq</TT> are required. 
+  This adds the following classes to <TT>org.omg.CORBA</TT>:
+    <ul>
+    <li><TT>StringSeqHolder</TT></li>
+    <li><TT>StringSeqHelper</TT></li>
+    <li><TT>WStringSeqHolder</TT></li>
+    <li><TT>WStringSeqHelper</TT></li>
+    </ul>
+  </li>
+ </ul>
+</li>
 
 <li>
 CORBA 2.3.1 sections 10.6.1 and 10.6.2 are supported for repository IDs.</li>
@@ -101,18 +87,13 @@ CORBA 2.3.1 sections 10.6.1 and 10.6.2 are supported for repository IDs.</li>
 CORBA 2.3.1 section 10.7 for <TT>TypeCode</TT> APIs.</li>
 
 <li>
-CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:</li>
-
-<ul>
-<li>
-Section 11.3.7 POAs must preserve all policies</li>
-
-<li>
-Section 11.3.8.2 again states that POAs must preserve all policies</li>
-
-<li>
-Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
-</ul>
+CORBA 2.3.1 chapter 11, Portable Object Adapter (POA), with the following updates from the Portable Interceptors specification:
+  <ul>
+  <li>Section 11.3.7 POAs must preserve all policies</li>
+  <li>Section 11.3.8.2 again states that POAs must preserve all policies</li>
+  <li>Section 11.3.8.26 <tt>POA::id</tt> is required.</li>
+  </ul>
+</li>
 
 <li>
 CORBA 2.3.1 chapters 13 and 15 define GIOP 1.0, 1.1, and 1.2. The Java SE 6
@@ -124,8 +105,7 @@ All of the Interoperable Naming Service is supported.</li>
 
 <li>
 Portable Interceptors section 13.8 (the new <TT>Coder</TT>/<TT>Decoder</TT> interfaces) 
-and
-all of chapter 21 (the interceptor specification).</li>
+and all of chapter 21 (the interceptor specification).</li>
 
 <li>Section 1.21.8 of the Revised IDL to Java Language Mapping Specification (ptc/00-11-03) 
 has been changed from the version in the  IDL to Java Language Mapping Specification (ptc/00-01-08).</li>
@@ -135,40 +115,24 @@ has been changed from the version in the  IDL to Java Language Mapping Specifica
 Tools</h2>
 
 <ul>
-<li>
-The IDL to Java compiler (<TT>idlj</TT>) complies with:</li>
+<li>The IDL to Java compiler (<TT>idlj</TT>) complies with:
+  <ul>
+  <li>CORBA 2.3.1 chapter 3 (IDL definition)</li>
+  <li>CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
+  <li>CORBA 2.3.1 section 10.6.5 (pragmas)</li>
+  <li>The IDL to Java mapping specification</li>
+  <li>The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
+  </ul>
+</li>
 
-<ul>
-<li>
-CORBA 2.3.1 chapter 3 (IDL definition)</li>
-
-<li>
-CORBA 2.3.1 chapters 5 and 6 (semantics of Value types)</li>
-
-<li>
-CORBA 2.3.1 section 10.6.5 (pragmas)</li>
-
-<li>
-The IDL to Java mapping specification</li>
-
-<li>
-The Revised IDL to Java language mapping specification section 1.12.1 "local interfaces"</li>
-</ul>
-
-<li>
-The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:</li>
-
-<ul>
-<li>
-CORBA 2.3.1 chapters 5 and 6 (value types)</li>
-
-<li>
-The Java to IDL language mapping. Note that this implicitly references
-section 1.21 of the IDL to Java language mapping</li>
-
-<li>
-IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
-</ul>
+<li>The Java to IDL compiler (the IIOP backend for <tt>rmic</tt>) complies with:
+  <ul>
+  <li>CORBA 2.3.1 chapters 5 and 6 (value types)</li>
+  <li>The Java to IDL language mapping. Note that this implicitly references
+      section 1.21 of the IDL to Java language mapping</li>
+  <li>IDL generated by the <tt>-idl</tt> flag complies with CORBA 2.3.1 chapter 3.</li>
+  </ul>
+</li>
 </ul>
 
 </body>
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html
index d63460d0871..fdc02ae8335 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/doc-files/generatedfiles.html
@@ -8,65 +8,101 @@
 
 <H1>IDL-to-Java Generated Files</H1>
 
-<P>The files that are generated by the IDL-to-Java compiler, in accordance with the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>, which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 according the <a href="compliance.html">compliance</a> document.
+<P>The files that are generated by the IDL-to-Java compiler, in accordance with 
+the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>,
+which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 
+according the <a href="compliance.html">compliance</a> document.
 
 
-<P>In general IDL names and identifiers are mapped to Java names and identifiers with no change. Because of the nature of the Java language, a single IDL construct may be mapped to several (differently named) Java constructs. The  additional  names are constructed by appending a descriptive suffix. For example, the IDL interface <tt>foo</tt> is mapped to the Java interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>, and optionally <tt>fooPOATie</tt>. 
+<P>In general IDL names and identifiers are mapped to Java names 
+and identifiers with no change. Because of the nature of the Java language,
+a single IDL construct may be mapped to several (differently named) Java constructs.
+The additional names are constructed by appending a descriptive suffix.
+For example, the IDL interface <tt>foo</tt> is mapped to the Java
+interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional
+Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>,
+and optionally <tt>fooPOATie</tt>.
 
 
 
-<P>The mapping in effect reserves the use of several names for its own purposes. These are: 
-<P>
+<P>The mapping in effect reserves the use of several names for its own purposes. These are:
 <UL>
-<LI>The Java class <tt><a href="#helper">&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type. 
-<LI>The Java class <tt><a href="#holder">&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
-<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt> is one of the Java primitive datatypes that is used by one of the IDL basic datatypes. 
-<LI>The Java classes <tt><a href="#operations">&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>, and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type. 
-<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface.
+<LI>The Java class <a href="#helper"><tt>&lt;type&gt;Helper</tt></a>, where <tt>&lt;type&gt;</tt> is the name of an IDL defined type.
+<LI>The Java class <a href="#holder"><tt>&lt;type&gt;Holder</tt></a>, where <tt>&lt;type&gt;</tt>
+is the name of an IDL defined type (with certain exceptions such as <tt>typedef</tt> aliases).
+<LI>The Java classes <tt>&lt;basicJavaType&gt;Holder</tt>, where <tt>&lt;basicJavaType&gt;</tt>
+is one of the Java primitive datatypes that is used by one of the IDL basic datatypes.
+<LI>The Java classes <a href="#operations"><tt>&lt;interface&gt;Operations</tt></a>, <tt>&lt;interface&gt;POA</tt>,
+and <tt>&lt;interface&gt;POATie</tt>, where <tt>&lt;interface&gt;</tt> is the name of an IDL interface type.
+<LI>The nested scope Java package name <tt>&lt;interface&gt;Package</tt>, where <tt>&lt;interface&gt;</tt>
+is the name of an IDL interface.
+</UL>
 
 
-<a name="helper">
-<H2>Helper Files</H2></a>
-<P>
-Helper files supply several static methods needed to manipulate the type. These include <tt>Any</tt> insert and extract operations for the type, getting the repository id, getting the typecode, and reading and writing the type from and to a stream. 
+<H2><a name="helper">Helper Files</a></H2>
 
-<P>The helper class for a mapped IDL interface or abstract interface also include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt> to be narrowed to the object reference of a more specific type. The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because the object reference does not support the requested type. A different system exception is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
+<P>Helper files supply several static methods needed to manipulate the type.
+These include <tt>Any</tt> insert and extract operations for the type,
+getting the repository id, getting the typecode, and reading
+and writing the type from and to a stream.
+
+<P>The helper class for a mapped IDL interface or abstract interface also
+include narrow operation(s). The static narrow method allows an <tt>org.omg.CORBA.Object</tt>
+to be narrowed to the object reference of a more specific type.
+The IDL exception <tt>CORBA::BAD_PARAM</tt> is thrown if the narrow fails because
+the object reference does not support the requested type. A different system exception
+is raised to indicate other kinds of errors. Trying to narrow a null will always succeed with a return value of null.
+
+<H2><a name="holder">Holder Files</a></H2>
+
+<P>Support for out and inout parameter passing modes requires the use of additional holder classes.
+These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package
+and are generated for all named user defined IDL types except those defined by typedefs.
+(Note that in this context user defined includes types that are defined in OMG specifications
+such as those for the Interface Repository, and other OMG services.)
+
+<P>Each holder class has a constructor from an instance, a default constructor, and has
+a public instance member, <tt>value</tt> which is the typed value. The default constructor
+sets the value field to the default value for the type as defined by the Java language:
+false for boolean, 0 for numeric and char types, null for strings, null for object references.
+
+<P>To support portable stubs and skeletons, holder classes also implement
+the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
 
 
+<H2><a name="operations">Operations Files</a></H2>
 
-<P>
+<P>A non abstract IDL interface is mapped to two public Java interfaces:
+a <em>signature</em> interface and an <em>operations</em> interface.
+The signature interface, which extends <tt>IDLEntity</tt>, has the same
+name as the IDL interface name and is used as the signature type in method declarations
+when interfaces of the specified type are used in other interfaces.
+The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt>
+appended to the end and is used in the server-side mapping and as a mechanism
+for providing optimized calls for collocated client and servers.
+
+<P>The Java operations interface contains the mapped operation signatures.
+The Java signature interface extends the operations interface,
+the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>.
+Methods can be invoked on the signature interface. Interface inheritance
+expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
 
 
-<a name="holder">
-<H2>Holder Files</H2></a>
-<P>
-Support for out and inout parameter passing modes requires the use of additional  holder  classes. These classes are available for all of the basic IDL datatypes in the <tt>org.omg.CORBA</tt> package and are generated for all named user defined IDL types except those defined by typedefs. (Note that in this context user defined includes types that are defined in OMG specifications such as those for the Interface Repository, and other OMG services.) 
+<H2><a name="stub">Stubs</a></H2>
 
-
-<P>Each holder class has a constructor from an instance, a default constructor, and has a public instance member, <tt>value</tt> which is the typed value. The default constructor sets the value field to the default value for the type as defined by the Java language: false for boolean, 0 for numeric and char types, null for strings, null for object references.
-
-<P>To support portable stubs and skeletons, holder classes also implement the <tt>org.omg.CORBA.portable.Streamable</tt> interface.
-
-
-<a name="operations">
-<H2>Operations Files</H2></a>
-<P>
-A non abstract IDL interface is mapped to two public Java interfaces: a <em>signature</em> interface and an <em>operations</em> interface. The signature interface, which extends <tt>IDLEntity</tt>, has the same name as the IDL interface name and is used as the signature type in method declarations when interfaces of the specified type are used in other interfaces. The operations interface has the same name as the IDL interface with the suffix <tt>Operations</tt> appended to the end and is used in the server-side mapping and as a mechanism for providing optimized calls for collocated client and servers.
-
-<P>The Java operations interface contains the mapped operation signatures. The Java signature interface extends the operations interface, the (mapped) base <tt>org.omg.CORBA.Object</tt>, as well as <tt>org.omg.portable.IDLEntity</tt>. Methods can be invoked on the signature interface. Interface inheritance expressed in IDL is reflected in both the Java signature interface and operations interface hierarchies.
-
-
-
-
-<a name="stub">
-<H2>Stubs</H2></a>
-<P>For the mapping of a non-object-oriented language, there will be a programming interface to the stubs for each interface type. Generally, the stubs will present access to the OMG IDL-defined operations on an object in a way that is easy for programmers to predict once they are familiar with OMG IDL and the language mapping for the particular programming language. The stubs make calls on the rest of the ORB using interfaces that are private to, and presumably optimized for, the particular ORB Core. If more than one ORB is available, there may be different stubs corresponding to the different ORBs. In this case, it is necessary for the ORB and language mapping to cooperate to associate the correct stubs with the particular object reference. 
+<P>For the mapping of a non-object-oriented language, there will be
+a programming interface to the stubs for each interface type. Generally, the stubs
+will present access to the OMG IDL-defined operations on an object in a way that is easy
+for programmers to predict once they are familiar with OMG IDL and the language mapping
+for the particular programming language. The stubs make calls on the rest of the ORB
+using interfaces that are private to, and presumably optimized for, the particular ORB Core.
+If more than one ORB is available, there may be different stubs corresponding to the different ORBs.
+In this case, it is necessary for the ORB and language mapping to cooperate to associate
+the correct stubs with the particular object reference.
 
 <P>Object-oriented programming languages, such as Java, C++, and Smalltalk, do not require stub interfaces.
-<P><P><BR><BR>
-
-
 
+<BR><BR>
 
 </body>
 </html>
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/package.html
index 437b84870a4..2d28793965c 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/package.html
@@ -6,7 +6,7 @@
    <TITLE>package</TITLE>
 <!--
 /*
-* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -73,7 +73,6 @@ a holder class.
 <TT>ORB</TT> Methods</H3>
 
 <P>Before an application can enter the CORBA environment, it must first: 
-<P>
 <UL>
 <LI>Be initialized into the ORB and possibly the object adapter (POA) environments.
 <LI>Get references to ORB object (for use in future ORB operations) 
@@ -81,7 +80,6 @@ and perhaps other objects (including the root POA or some Object Adapter objects
 </UL>
 <P>The following operations are provided to initialize applications and obtain
  the appropriate object references:
- <P>
  <UL>
  <LI>Operations providing access to the ORB, which are discussed in this
  section.
@@ -107,13 +105,13 @@ identifier for the ORB for which the object reference is required,
  that provide access to the ORB:
 <UL>
 <LI>
-<TT><bold>init</bold>()</TT> 
+<TT><b>init</b>()</TT>
 
 <LI>
-<TT><bold>init</bold>(String [] args, Properties props)</TT>
+<TT><b>init</b>(String [] args, Properties props)</TT>
 
 <LI>
-<TT><bold>init</bold>(Applet app, Properties props)</TT>
+<TT><b>init</b>(Applet app, Properties props)</TT>
 </UL>
 
 <P>Using the <tt>init()</tt> method without parameters initiates 
@@ -142,11 +140,11 @@ the ORB object interface, providing facilities to list and
 resolve initial object references.  These are:
 <UL>
 <LI>
-<TT><bold>resolve_initial_references</bold>(String name)</TT>
+<TT><b>resolve_initial_references</b>(String name)</TT>
 <LI>
-<TT><bold>list_initial_services</bold>()</TT>
+<TT><b>list_initial_services</b>()</TT>
 <LI>
-<TT><bold>register_initial_reference</bold>(String id, 
+<TT><b>register_initial_reference</b>(String id, 
 org.omg.CORBA.Object obj)</TT>
 </UL>
 
@@ -278,7 +276,6 @@ that can be modified.   To support portable stubs and skeletons, holder classes
 
 
 <P>Each holder class has:
-<P>
 <UL>
 <LI>a constructor from an instance
 <LI>a default constructor
@@ -291,7 +288,6 @@ type's <tt>value</tt> field
 
 <P>The default constructor sets the value field to the default value for the 
 type as defined by the Java language: 
-<P>
 <UL>
 <LI><tt>false</tt> for boolean
 <LI><tt>0</tt> for numeric and char types
@@ -391,7 +387,6 @@ in the package <TT>org.omg.CORBA</TT> are:
 <h2>Helper Classes </h2>
 <P>Helper files supply several static methods needed to manipulate the type.
  These include:
- <P>
  <UL>
  <LI><tt>Any</tt> insert and extract operations for the type
  <LI>getting the repository id
@@ -455,14 +450,13 @@ both versions of the <code>narrow</code> method.
 <P>The <A HREF="{@docRoot}/../technotes/guides/idl/jidlExample.html"><em>Hello World</em></A> 
 tutorial uses a <tt>narrow</tt> method that looks 
 like this:
-<P>
 <PRE>
         // create and initialize the ORB
-	ORB orb = ORB.init(args, null);
+        ORB orb = ORB.init(args, null);
 
         // get the root naming context
         org.omg.CORBA.Object objRef = 
-	    orb.resolve_initial_references("NameService");
+            orb.resolve_initial_references("NameService");
         // Use NamingContextExt instead of NamingContext. This is 
         // part of latest Inter-Operable naming Service.  
         NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
@@ -554,7 +548,6 @@ abstract public class AccountHelper
 
 }
 </PRE>
-<P>
 
 <h3>Value Type Helper Classes</h3>
 A helper class for a value type includes different renderings of
@@ -844,7 +837,7 @@ implementation of an interface repository, the following IR classes and
 interfaces have been included for the purpose of creating typecodes (see
 create_value_tc, create_struct_tc, create_union_tc and create_exception_tc
 methods in interface org.omg.CORBA.ORB):
-<BR>&nbs
+<BR>&nbsp;
 <UL>
 <LI>
 IRObject
@@ -893,20 +886,19 @@ extensions and products.
 <P>Some of the API included in <TT>org.omg</TT> subpackages throw 
 <tt>NO_IMPLEMENT</tt> exceptions for various reasons.  Among these reasons
 are:
-<P>
-	<UL>
-	<LI>In some cases, for example <tt>LocalObject</tt>, the complete
-	implementation according to the specification indicates that 
-	these API should throw <tt>NO_IMPLEMENT</tt>.
-	<P>
-	<LI>In most cases, for example methods in <tt>ORB.java</tt>, 
-	methods that throw  
-	<tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
-	elsewhere in the ORB code.
-	<P>
-	<LI>In some cases, for example <tt>_get_interface_def()</tt> 
-	and <tt>_get_interface</tt>, API are really not yet implemented.
-	</UL>
+    <UL>
+    <LI>In some cases, for example <tt>LocalObject</tt>, the complete
+    implementation according to the specification indicates that 
+    these API should throw <tt>NO_IMPLEMENT</tt>.
+
+    <LI>In most cases, for example methods in <tt>ORB.java</tt>, 
+    methods that throw  
+    <tt>NO_IMPLEMENT</tt> are actually implemented in subclasses
+    elsewhere in the ORB code.
+
+    <LI>In some cases, for example <tt>_get_interface_def()</tt> 
+    and <tt>_get_interface</tt>, API are really not yet implemented.
+    </UL>
 
 
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java
index 158ba407a9a..b626a5cda1c 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/InvokeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -56,7 +56,7 @@ public interface InvokeHandler {
      * <p>5. Marshal reply into OutputStream returned by
      *    ResponseHandler.
      * <p>6. Return OutputStream to ORB.
-     * <p>
+     *
      * @param method The method name.
      * @param input The <code>InputStream</code> containing the marshalled arguments.
      * @param handler The <code>ResponseHandler</code> which the servant uses
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html
index 445b78d1ec6..c8f6b33ae37 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/portable/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -46,57 +46,51 @@ Some methods throw NO_IMPLEMENT() exceptions by default, but ORB vendors
 can override them to provide real implementations.  The ORB included in
 Sun's release of the Java[tm] Platform, Standard Edition 6, includes 
 implementations for the following methods.
-<p>
+
 <h2>List of Unimplemented Features in Package
 <code>org.omg.CORBA.portable</code></h2>
-<p>
+
 <h3>Unimplemented Interfaces in package <code>org.omg.CORBA.portable</code></h3>
   <ul>
-<code>
-    <li>InvokeHandler
-    <li>ResponseHandler
-</code>
+    <li><code>InvokeHandler</code>
+    <li><code>ResponseHandler</code>
   </ul>
-<p>
+
 <h3>Unimplemented Methods in package <code>org.omg.CORBA.portable</code></h3>
 <ul>
-<code>
-<li>InputStream
+<li><code>InputStream</code>
   <ul>
-    <li>public int read()
-    <li>public.math.BigDecimal read_fixed()
-    <li>public org.omg.CORBA.Context read_Context() 
-    <li>public  org.omg.CORBA.Object read_Object(java.lang.Class clz)
-    <li>public org.omg.CORBA.ORB orb() 
+    <li><code>public int read()</code>
+    <li><code>public.math.BigDecimal read_fixed()</code>
+    <li><code>public org.omg.CORBA.Context read_Context()</code>
+    <li><code>public  org.omg.CORBA.Object read_Object(java.lang.Class clz)</code>
+    <li><code>public org.omg.CORBA.ORB orb()</code>
   </ul>
-<li>OutputStream
+<li><code>OutputStream</code>
   <ul>
-    <li>public org.omg.CORBA.ORB orb()
-    <li>public void write_Context(org.omg.CORBA.Context ctx,
-			      org.omg.CORBA.ContextList contexts) 
-    <li>public void write_fixed(java.math.BigDecimal value) 
-    <li>public void write(int b) 
+    <li><code>public org.omg.CORBA.ORB orb()</code>
+    <li><code>public void write_Context(org.omg.CORBA.Context ctx,
+        org.omg.CORBA.ContextList contexts)</code>
+    <li><code>public void write_fixed(java.math.BigDecimal value)</code>
+    <li><code>public void write(int b)</code>
   </ul>
-<li>Delegate
+<li><code>Delegate</code>
   <ul>
-    <li>public void releaseReply(org.omg.CORBA.Object self, InputStream input)
-    <li>public InputStream invoke(org.omg.CORBA.Object self, OutputStream output)
-    <li>public OutputStream request(org.omg.CORBA.Object self, String operation,
-				 boolean responseExpected)
-    <li>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
+    <li><code>public void releaseReply(org.omg.CORBA.Object self, InputStream input)</code>
+    <li><code>public InputStream invoke(org.omgl.CORBA.Object self, OutputStream output)</code>
+    <li><code>public OutputStream request(org.omg.CORBA.Object self, String operation,
+        boolean responseExpected)</code>
+    <li><code>public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self,
                                         org.omg.CORBA.Policy[] policies,
-                                        org.omg.CORBA.SetOverrideType set_add)
-    <li>public org.omg.CORBA.DomainManager[] get_domain_managers(
-                                                org.omg.CORBA.Object
-						self)
-    <li>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
-                                         int policy_type)
+                                        org.omg.CORBA.SetOverrideType set_add)</code>
+    <li><code>public org.omg.CORBA.DomainManager[] get_domain_managers(
+                                                org.omg.CORBA.Objectself)</code>
+    <li><code>public org.omg.CORBA.Policy get_policy(org.omg.CORBA.Object self,
+                                         int policy_type)</code>
   </ul>
-</code>
 </ul>
 
 @since JDK1.2
 @serial exclude
 </body>
 </html>
-
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html
index 53d923b5f07..c1869b1c512 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/package.html
@@ -6,7 +6,7 @@
    <title>package</title>
 <!--
 /*
-* Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2015, Oracle and/or its affiliates. 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
@@ -43,23 +43,21 @@ breaking the JCK tests.
  
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
-HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
+HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
 support in Java[tm] SE 6</A>.
 <P>
 <a name="unimpl"></a>
 The following methods in the abstract class 
 <code>org.omg.CORBA_2_3.ORB</code> are unimplemented:
 <UL>
-  <code>
-  <LI>public org.omg.CORBA.portable.ValueFactory 
-  <b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory 
-factory)</b>
-  <LI>public void <b>unregister_value_factory(String id)</b>
-  <LI>public org.omg.CORBA.portable.ValueFactory 
-  <b>lookup_value_factory(String id)</b>
-  <LI>public org.omg.CORBA.Object <b>get_value_def(String repid)</b>
-  <LI>public void <b>set_delegate(java.lang.Object wrapper)</b>
-  </code>
+  <LI><code>public org.omg.CORBA.portable.ValueFactory 
+  <b>register_value_factory(String id, org.omg.CORBA.portable.ValueFactory
+     factory)</b></code>
+  <LI><code>public void <b>unregister_value_factory(String id)</b></code>
+  <LI><code>public org.omg.CORBA.portable.ValueFactory 
+  <b>lookup_value_factory(String id)</b></code>
+  <LI><code>public org.omg.CORBA.Object <b>get_value_def(String repid)</b></code>
+  <LI><code>public void <b>set_delegate(java.lang.Object wrapper)</b></code>
 </UL>
 @since JDK 1.3
 <br>
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
index 90d9ea65286..dd32dfdaac6 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
@@ -77,7 +77,7 @@ public abstract class InputStream extends org.omg.CORBA.portable.InputStream {
      *
      * throw SecurityException if SecurityManager is installed and
      * enableSubclassImplementation SerializablePermission
-     * is not granted or jdk.corba.allowOutputStreamSubclass system
+     * is not granted or jdk.corba.allowInputStreamSubclass system
      * property is either not set or is set to 'false'
      */
     public InputStream() {
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html
index 56077546189..6b3f430e3b3 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2015, Oracle and/or its affiliates. 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
@@ -26,7 +26,6 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
-
 -->
 
 </head>
@@ -34,7 +33,7 @@
 
  Provides methods for the input and output of value types, and contains 
  other updates to the <code>org/omg/CORBA/portable</code> package.
-<p>
+
 @since 1.3
 @serial exclude
 </body>
diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
index 1d5e960eafa..4f4284cff2d 100644
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextExtPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -32,21 +32,20 @@
 <body bgcolor="white">
 <P>This package contains the following classes, which are used in 
 <tt>org.omg.CosNaming.NamingContextExt</tt>:
-<P>
 <UL>
-<LI><tt>AddressHelper</tt>
+ <LI><tt>AddressHelper</tt>
  <LI><tt>StringNameHelper</tt>
  <LI><tt>URLStringHelper</tt>
  <LI><tt>InvalidAddress</tt>
-
+</UL>
 
 <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html
index 2d699e0d4d7..ded3092c355 100644
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/NamingContextPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -32,7 +32,6 @@
 <body bgcolor="white">
 <P>This package contains Exception classes for the <tt>org.omg.CosNaming</tt>
  package.  The list  of exception classes are:
- <P>
  <UL>
   <LI><tt>AlreadyBound</tt>
   <LI><tt>CannotProceed</tt>
@@ -40,6 +39,7 @@
   <LI><tt>NotEmpty</tt>
   <LI><tt>NotFound</tt>
   <LI><tt>NotFoundReason</tt>
+ </UL>
 
 
 <H3>Package Specification</H3>
@@ -48,7 +48,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl b/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl
index 9e5ec9b439f..ff43e3292b4 100644
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. 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
@@ -64,12 +64,12 @@ module CosNaming
     Istring id;
     Istring kind;
   };
-    
+
   /**
    * A name is a sequence of name components.
    */
   typedef sequence <NameComponent> Name;
-    
+
   /**
    * Specifies whether the given binding is for a object (that is not a
    * naming context) or for a naming context.
@@ -79,7 +79,7 @@ module CosNaming
     nobject, 	// name is bound to an object
     ncontext	// name is bound to a naming context
   };
-    
+
   /**
    * A name-to-object association is called a Binding.
    */
@@ -89,12 +89,12 @@ module CosNaming
     BindingType binding_type;	// whether name is bound to an object
                                 //  or a naming context
   };
-    
+
   /**
    * List of Bindings.
    */
-  typedef sequence <Binding> BindingList;    
-    
+  typedef sequence <Binding> BindingList;
+
   /**
    * The BindingIterator interface allows a client to iterate through
    * the bindings using the next_one or next_n operations.
@@ -112,24 +112,24 @@ module CosNaming
      * @param b the returned binding
      */ 
     boolean next_one(out Binding b);
-    
+
     /**
      * This operation returns at most the requested number of bindings.
      * 
-     * @param how_many the maximum number of bindings tro return <p>
+     * @param how_many the maximum number of bindings to return
      * 
      * @param bl the returned bindings
      */ 
     boolean next_n(in unsigned long how_many, 
-		   out BindingList bl);
-        
+                   out BindingList bl);
+
     // Destroy binding iterator
     /**
      * This operation destroys the iterator.
      */ 
     void destroy();
   };
-    
+
 /** 
  * A naming context is an object that contains a set of name bindings in 
  * which each name is unique. Different names can be bound to an object 
@@ -151,7 +151,7 @@ module CosNaming
             not_context, 
             not_object 
         };
-        
+
 /** 
  * Indicates the name does not identify a binding.
  */
@@ -160,7 +160,7 @@ module CosNaming
             NotFoundReason why;
             Name rest_of_name;
         };
-    
+
 /**
  * Indicates that the implementation has given up for some reason.
  * The client, however, may be able to continue the operation at the
@@ -171,130 +171,130 @@ module CosNaming
             NamingContext cxt;
             Name rest_of_name;
         };
-                                         
+
 /** 
  * Indicates the name is invalid. 
  */
         exception InvalidName 
-        {};                        
-    
+        {};
+
 /**
  * Indicates an object is already bound to the specified name. Only
  * one object can be bound to a particular name in a context. 
  */
         exception AlreadyBound 
         {};
-    
+
 /**
  * Indicates that the Naming Context contains bindings.
  */
         exception NotEmpty 
         {};
-    
+
 /**
  * Creates a binding of a name and an object in the naming context.
  * Naming contexts that are bound using bind do not participate in name
  * resolution when compound names are passed to be resolved. 
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param obj The Object to bind with the given name<p>
+ * @param obj The Object to bind with the given name.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates
- * the name does not identify a binding.<p>
+ * the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed 
  * Indicates that the implementation has given up for some reason.
  * The client, however, may be able to continue the operation
- * at the returned naming context.<p>
+ * at the returned naming context.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.InvalidName 
- * Indicates that the name is invalid. <p>
+ * Indicates that the name is invalid.
  *
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound 
- * Indicates an object is already bound to the specified name.<p> 
+ * Indicates an object is already bound to the specified name.
  */ 
         void bind(in Name n, 
-	      in Object obj)
+                  in Object obj)
         raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName, 
-	     AlreadyBound);
-    
+               CannotProceed, 
+               InvalidName, 
+               AlreadyBound);
+
 /**
  * Names an object that is a naming context. Naming contexts that
  * are bound using bind_context() participate in name resolution 
  * when compound names are passed to be resolved.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param nc NamingContect object to bind with the given name <p>
+ * @param nc NamingContect object to bind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  *
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already 
- * bound to the specified name.<p>
+ * bound to the specified name.
  */ 
     void bind_context(in Name n, 
-		      in NamingContext nc)
+                      in NamingContext nc)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName, 
-	     AlreadyBound);
-    
+             CannotProceed, 
+             InvalidName, 
+             AlreadyBound);
+
 /**
  * Creates a binding of a name and an object in the naming context
  * even if the name is already bound in the context. Naming contexts 
  * that are bound using rebind do not participate in name resolution 
  * when compound names are passed to be resolved.
  * 
- * @param  n Name of the object <p>
+ * @param  n Name of the object.
  * 
- * @param obj The Object to rebind with the given name <p>
+ * @param obj The Object to rebind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void rebind(in Name n, 
-		in Object obj)
+                in Object obj)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * Creates a binding of a name and a naming context in the naming
  * context even if the name is already bound in the context. Naming 
  * contexts that are bound using rebind_context() participate in name 
  * resolution when compound names are passed to be resolved.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @param nc NamingContect object to rebind with the given name <p>
+ * @param nc NamingContect object to rebind with the given name.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void rebind_context(in Name n, 
-			in NamingContext nc)
+                        in NamingContext nc)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
+             CannotProceed, 
+             InvalidName);
 
 /** 
  * The resolve operation is the process of retrieving an object
@@ -304,39 +304,39 @@ module CosNaming
  * to the appropriate type. That is, clients typically cast the returned 
  * object from Object to a more specialized interface.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     Object resolve(in Name n)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * The unbind operation removes a name binding from a context.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     void unbind(in Name n)
       raises(NotFound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             CannotProceed, 
+             InvalidName);
+
 /**
  * The list operation allows a client to iterate through a set of
  * bindings in a naming context. <p>
@@ -351,15 +351,15 @@ module CosNaming
  * bindings, the binding iterator is a nil object reference.
  * </ul>
  * 
- * @param how_many the maximum number of bindings to return <p>
+ * @param how_many the maximum number of bindings to return.
  * 
- * @param bl the returned list of bindings <p>
+ * @param bl the returned list of bindings.
  * 
- * @param bi the returned binding iterator <p>
+ * @param bi the returned binding iterator.
  */ 
     void list(in unsigned long how_many, 
-	      out BindingList bl, 
-	      out BindingIterator bi);
+              out BindingList bl, 
+              out BindingIterator bi);
 
 /**
  * This operation returns a naming context implemented by the same
@@ -367,7 +367,7 @@ module CosNaming
  * The new context is not bound to any name.
  */ 
     NamingContext new_context();
-    
+
 /**
  * This operation creates a new context and binds it to the name
  * supplied as an argument. The newly-created context is implemented 
@@ -375,25 +375,25 @@ module CosNaming
  * is, the naming server that implements the context denoted by the 
  * name argument excluding the last component).
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already 
- * bound to the specified name.<p>
+ * bound to the specified name.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has
  * given up for some reason. The client, however, may be able to 
- * continue the operation at the returned naming context.<p>
+ * continue the operation at the returned naming context.
  * 
- * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. <p>
+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.
  */ 
     NamingContext bind_new_context(in Name n)
       raises(NotFound, 
-	     AlreadyBound, 
-	     CannotProceed, 
-	     InvalidName);
-    
+             AlreadyBound, 
+             CannotProceed, 
+             InvalidName);
+
 /** 
  * The destroy operation deletes a naming context. If the naming 
  * context contains bindings, the NotEmpty exception is raised.
@@ -402,7 +402,7 @@ module CosNaming
  */
     void destroy()
       raises(NotEmpty);
-    
+
   };
 
 
@@ -413,7 +413,7 @@ module CosNaming
  * part of Interoperable Naming Service.
  * Different names can be bound to an object in the same or different
  * contexts at the same time. Using <tt>NamingContextExt</tt>, you can use
- * URL-based names to bind and resolve. <p>
+ * URL-based names to bind and resolve.
  * 
  * See <a href="http://www.omg.org/technology/documents/formal/naming_service.htm">
  * CORBA COS 
@@ -425,86 +425,84 @@ module CosNaming
  * StringName is the Stringified Name, Array of Name Components 
  * represented as a String.
  */
-	typedef string StringName;
+        typedef string StringName;
 
 /**
  * Address is the Host and Port information represented as a String.
  */
-	typedef string Address;
-   
+        typedef string Address;
+
 /**
  * URLString is the URL address (corbaloc: or corbaname:) represented as
  * a String.
  */
-	typedef string URLString;
+        typedef string URLString;
 
 /**
  * This operation creates a stringified name from the array of Name
  * components.
  * 
- * @param n Name of the object <p>
+ * @param n Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	StringName to_string( in Name n ) raises (InvalidName);
+        StringName to_string( in Name n ) raises (InvalidName);
 
 /**
  * This operation  converts a Stringified Name into an  equivalent array
- * of Name Components. 
+ * of Name Components.
  * 
- * @param sn Stringified Name of the object <p>
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	Name to_name( in StringName sn ) raises (InvalidName);
+        Name to_name( in StringName sn ) raises (InvalidName);
 
 
 /** 
  * Indicates the invalid Stringified name for the object, The
  * reason could be invalid syntax. 
  */
-	exception InvalidAddress 
-	{ };
+        exception InvalidAddress 
+        { };
 
 /**
  * This operation creates a URL based "iiopname://" format name
  * from the Stringified Name of the object.
  * 
- * @param addr internet based address of the host machine where  Name Service is running <p>
- * @param sn Stringified Name of the object <p>
+ * @param addr internet based address of the host machine where Name Service is running.
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
- * Indicates the internet based address of the host machine is 
- * incorrect <p>
- * 
- */ 
-	URLString to_url( in Address addr, in StringName sn )
-			raises( InvalidAddress, InvalidName );
+ * Indicates the internet based address of the host machine is incorrect
+ */
+        URLString to_url( in Address addr, in StringName sn )
+            raises( InvalidAddress, InvalidName );
 
 
 /**
  * This operation resolves the Stringified name into the object
  * reference. 
  * 
- * @param sn Stringified Name of the object <p>
+ * @param sn Stringified Name of the object.
  * 
  * @exception org.omg.CosNaming.NamingContextPackage.NotFound
- * Indicates there is no object reference for the given name. <p>
+ * Indicates there is no object reference for the given name.
  * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
- * Indicates that the given compound name is incorrect <p>
+ * Indicates that the given compound name is incorrect.
  * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
- * Indicates the name does not identify a binding.<p>
+ * Indicates the name does not identify a binding.
  * 
  */ 
-	Object resolve_str( in StringName sn)
-		raises( NotFound, CannotProceed,
-			InvalidName);
+        Object resolve_str( in StringName sn)
+            raises( NotFound, CannotProceed,
+            InvalidName);
 
   };
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html b/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html
index a7fca8f22aa..26e027a3642 100644
--- a/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/CosNaming/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2015, Oracle and/or its affiliates. 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
@@ -32,20 +32,20 @@
 
   Provides a naming service for Java&nbsp;IDL.  The Object Request Broker Daemon
   (ORBD) also includes both a transient and persistent naming service.
-  
+
 
   <P>
   The package and all its classes and interfaces 
   were generated by running the tool <code>idlj</code> on the file
   <code>nameservice.idl</code>, which is a module written in OMG IDL.
-  
+
   <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-  <P>
+
   <H2>Interfaces</H2>
   The package <tt>org.omg.CosNaming</tt> contains two public interfaces
   and several auxiliary classes. 
@@ -62,7 +62,7 @@ support in Java[tm] SE 6</A>.
   interface supplies the main functionality for the naming service, and
   <code>BindingIterator</code> provides a means of iterating through a list
   of name/object reference bindings.
-  <P>
+
   <H2>Auxiliary Classes</H2>
   In order to map an OMG IDL interface to the Java programming language,
   the idlj compiler creates Java classes that can be thought of
@@ -70,13 +70,13 @@ support in Java[tm] SE 6</A>.
   Comments for the generated auxiliary classes
   used by the interfaces <code>NamingContext</code> and 
   <code>BindingIterator</code> are included here.
-  <P>
+
   <H3>Classes Used by <code>NamingContext</code> and
   <code>BindingIterator</code></H3>
   The following are classes used by
   the naming service.  (Helper and  holder classes, which are
   generated for each of the classes listed here,  are discussed below.)
- 
+
   <UL>
     <LI><code>public final class <B>NameComponent</B></code> -- 
     a building block for names.  (Names are bound to object references
@@ -89,8 +89,7 @@ support in Java[tm] SE 6</A>.
     A <code><B>NameComponent</B></code> object consists of two fields:
     <OL>
     <LI><code><B>id</B></code> -- a <code>String</code> used as an identifier
-    <LI><code><B>kind</B></code> -- a <code>String</code> that can be used for 
-any
+    <LI><code><B>kind</B></code> -- a <code>String</code> that can be used for any
     descriptive purpose.  Its importance is that it
     can be used to describe an object without affecting syntax.
     The C programming language, for example, uses the the syntactic convention
@@ -102,16 +101,15 @@ any
     <code>"c_source"</code>, <code>"object_code"</code>,
     <code>"executable"</code>, 
     <code>"postscript"</code>, and <code>""</code>.  It is not unusual
-	for the <code>kind</code> field to be the empty string.
+    for the <code>kind</code> field to be the empty string.
     </OL>
     <P>
     In a name, each <code>NameComponent</code> object except the last denotes
     a <code>NamingContext</code> object; the last <code>NameComponent</code>
     object denotes the bound object reference.
     This is similar to a path name, in which the last name is the
-    file name, and all names before it are directory names.<p>
-    <P>
-   
+    file name, and all names before it are directory names.
+
     <LI><code>public final class <B>Binding</B></code> -- 
     an object that associates a name with an object reference or a
     naming context.
@@ -125,45 +123,44 @@ any
     </OL>
     <P>
     The interface <code>NamingContext</code> has methods for
-	binding/unbinding names with object references or naming contexts,
-	for listing bindings,
+    binding/unbinding names with object references or naming contexts,
+    for listing bindings,
     and for resolving bindings (given a name, the method
     <code>resolve</code> returns the object reference bound to it).
-   
-  <P>
-  <LI><code>public final class <B>BindingType</B></code> --
+
+    <LI><code>public final class <B>BindingType</B></code> --
     an object that specifies whether the given <code>Binding</code>
     object is a binding between a name and an object reference (that is,
     not a naming context) or between a name and a naming context.
     <P>
     The class<code>BindingType</code> consists of two methods and
-	four constants. Two of these constants are
-	<code>BindingType</code> objects, and two are <code>int</code>s.
-	<P>
-	The <code>BindingType</code> objects
+    four constants. Two of these constants are
+    <code>BindingType</code> objects, and two are <code>int</code>s.
+    <P>
+    The <code>BindingType</code> objects
     can be passed to the constructor for the class
     <code>Binding</code> or used as parameters or return values.  These
-	<code>BindingType</code> objects are:
+    <code>BindingType</code> objects are:
     <UL>
     <LI><code>public static final BindingType <B>nobject</B></code> -- 
-	to indicate that the binding is with an object reference
+    to indicate that the binding is with an object reference
     <LI><code>public static final BindingType <B>ncontext</B></code> -- 
-	to indicate that the binding is with a naming context
+    to indicate that the binding is with a naming context
     </UL>
     <P>
-	The <code>int</code> constants can be supplied to the method
-	<code>from_int</code> to create  <code>BindingType</code> objects,
-	or they can be return values for the method <code>value</code>.
-	These constants are:
-	<UL>
+    The <code>int</code> constants can be supplied to the method
+    <code>from_int</code> to create  <code>BindingType</code> objects,
+    or they can be return values for the method <code>value</code>.
+    These constants are:
+    <UL>
     <LI><code>public static final int <B>_nobject</B></code>
     <LI><code>public static final int <B>_ncontext</B></code>
-	</UL>
+    </UL>
     If the method <code>from_int</code> is supplied with anything other
-	than <code>_nobject</code>
+    than <code>_nobject</code>
     or <code>_ncontext</code>, it will throw
-	the exception <code>org.omg.CORBA.BAD_PARAM</code>. 
-	<P>Usage is as follows:
+    the exception <code>org.omg.CORBA.BAD_PARAM</code>. 
+    <P>Usage is as follows:
     <PRE>
        BindingType btObject = from_int(_nobject);
        BindingType btContext = from_int(_ncontext);
@@ -182,9 +179,9 @@ any
        int bt = BindingType.value();
     </PRE>
   </UL>
-  
+
   <H3>Holder Classes</H3>
- 
+
   OMG IDL uses OUT and INOUT parameters for returning values from operations.
   The mapping to the Java programming language, which does not have OUT
   and INOUT parameters, creates a special class for each type, called
@@ -308,7 +305,6 @@ Context&gt;</code>.
       This associates <code>NameService</code> with the Root Naming
       Context of the <code>CosNaming</code> implementation that you 
       want to use.
-	  <P>
   <LI>Start the standalone Bootstrap server using the following command:
   <pre>
       <code>
@@ -340,13 +336,13 @@ For an overview and examples of how to use the
 <code>CosNaming</code> API, please see:
 <ul>
   <li><a href="../../../../technotes/guides/idl/tnameserv.html">
-	Naming Service</a>
+    Naming Service</a>
 </ul>
 <p>
 For an overview of Java&nbsp;IDL, please see:
 <ul>
   <li><a href="../../../../technotes/guides/idl/index.html">
-	Java&nbsp;IDL home page</a>
+    Java&nbsp;IDL home page</a>
 </ul>
 
 @since JDK1.3
diff --git a/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html b/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html
index 0a9895fc871..f8602823f5f 100644
--- a/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/Dynamic/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -45,7 +45,7 @@ refer to that OMG specification for further details.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html
index 9f9e72f12ce..fc4d237dc73 100644
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 /*
-* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -48,7 +48,7 @@ refer to that OMG specification for further details.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html
index 480ed552c05..7725f96c002 100644
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -46,7 +46,7 @@ refer to that OMG specification for further details.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html b/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html
index ced7646b061..287f8fdc819 100644
--- a/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/DynamicAny/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
- Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -197,22 +197,14 @@ exported through the <code>Object</code>
  interface may raise the standard NO_IMPLEMENT exception.
  An attempt to use a <code>DynAny</code> object with the DII may raise the NO_IMPLEMENT 
 exception.
- 
-
-
-
-
-
-<P>
-
 
 <H3>Package Specification</H3>
- 
+
 <P>For a precise list of supported sections of official specifications with which 
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
index 0a6bc3bbfa0..696233689fd 100644
--- a/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/CodecFactoryPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -42,7 +42,7 @@ specified in the IOP::CodeFactory interface (as part of the Portable
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html
index 0301fb590a5..d86dfb1de46 100644
--- a/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/CodecPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -45,7 +45,7 @@ refer to that OMG specification for further details.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/IOP/package.html b/corba/src/java.corba/share/classes/org/omg/IOP/package.html
index f0016bfc271..afc735c57f8 100644
--- a/corba/src/java.corba/share/classes/org/omg/IOP/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/IOP/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -52,7 +52,7 @@ Portable Interceptors.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/Messaging/package.html b/corba/src/java.corba/share/classes/org/omg/Messaging/package.html
index 61e73d5b685..6076bcf2126 100644
--- a/corba/src/java.corba/share/classes/org/omg/Messaging/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/Messaging/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -47,7 +47,7 @@ Portable Interceptors.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl
index 8c0ba0831f4..d3c4ed75e15 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/IOP.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -258,14 +258,14 @@ module IOP {
      * <p>
      * The <code>TAG_ALTERNATE_IIOP_ADDRESS</code> component has an 
      * associated value of type:
-     * <code>
-     *   <pre>
+     * <pre>
+     *   <code>
      *     struct { 
      *         string HostID, 
      *         short Port 
-     *     }; 
-     *   </pre>
-     * </code>
+     *     };
+     *   </code>
+     * </pre>
      * encoded as a CDR encapsulation. 
      * <p>
      * Zero or more instances of the <code>TAG_ALTERNATE_IIOP_ADDRESS</code> 
@@ -601,7 +601,7 @@ module IOP {
 
     /**
      * Create a <code>Codec</code> of the given encoding.
-     * <p>
+     *
      * @param enc The encoding for which to create a <code>Codec</code>.
      * @return A <code>Codec</code> obtained with the given encoding.
      * @exception UnknownEncoding thrown if this factory cannot create a 
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl
index e55408d704b..bcb9b544a32 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/Interceptors.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -479,7 +479,7 @@ module PortableInterceptor {
      * On the client:
      * <ul>
      *   <li>Within the <code>receive_reply</code> interception point, this 
-     *       will only return <code>SUCCESSFUL</code></li>.
+     *       will only return <code>SUCCESSFUL</code>.</li>
      *   <li>Within the <code>receive_exception</code> interception point, 
      *       this will be either <code>SYSTEM_EXCEPTION</code> or 
      *       <code>USER_EXCEPTION</code>.</li>
@@ -545,7 +545,7 @@ module PortableInterceptor {
     /**
      * Returns a copy of the service context with the given ID that 
      * is associated with the request. 
-     * <p>
+     *
      * @param id The <code>IOP.ServiceId</code> of the service context 
      *     which is to be returned. 
      * @return The <code>IOP.ServiceContext</code> obtained with the 
@@ -579,7 +579,6 @@ module PortableInterceptor {
    * validity of each attribute or operation.  If it is not valid, attempting 
    * to access it will result in a <code>BAD_INV_ORDER</code> being thrown
    * with a standard minor code of 14.
-   * <p>
    *
    * <table border=1 summary="Shows the validity of each attribute or operation">
    *  <thead>
@@ -934,7 +933,6 @@ module PortableInterceptor {
    * of each attribute or operation.  If it is not valid, attempting to access 
    * it will result in a <code>BAD_INV_ORDER</code> being thrown with a 
    * standard minor code of 14.
-   * <p>
    *
    *
    * <table border=1 summary="Shows the validity of each attribute or operation">
@@ -1028,7 +1026,7 @@ module PortableInterceptor {
    *    <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td> <td>yes</td></tr>
    * 
    *    <tr><td><b>arguments</b></td>
-   *    <td>no </td> <td>yes<sub>1</sub</td> 
+   *    <td>no </td> <td>yes<sub>1</sub></td>
    *                              <td>yes</td> <td>no<sub>2</sub></td> 
    *                                                        <td>no<sub>2</sub>
    *                                                        </td></tr>
@@ -1133,7 +1131,7 @@ module PortableInterceptor {
    *       servant, which may no longer be available to the ORB. For example, 
    *       if the object's adapter is a POA that uses a 
    *       <code>ServantLocator</code>, then the ORB invokes the interception 
-   *       point after it calls <code>ServantLocator.postinvoke()</code></li>.
+   *       point after it calls <code>ServantLocator.postinvoke()</code>.</li>
    * </ol>
    *
    * @see ServerRequestInterceptor
@@ -1889,7 +1887,7 @@ module PortableInterceptor {
      * @param type An int specifying the type of policy being created. 
      * @param value An any containing data with which to construct the 
      *     <code>CORBA.Policy</code>. 
-     * @return A <code>CORBA.Policy<code> object of the specified type and 
+     * @return A <code>CORBA.Policy</code> object of the specified type and
      *     value.
      */
     CORBA::Policy create_policy 
@@ -2124,7 +2122,7 @@ module PortableInterceptor {
    * <p>
    * A client-side logging service written by company X, for example, may 
    * have the following ORBInitializer implementation: 
-   * <code><pre>
+   * <pre><code>
    * package com.x.logging;
    * 
    * import org.omg.PortableInterceptor.Interceptor; 
@@ -2144,7 +2142,7 @@ module PortableInterceptor {
    *         // This service does not need two init points. 
    *     } 
    * } 
-   * </pre></code>
+   * </code></pre>
    * To run a program called <code>MyApp</code> using this logging 
    * service, the user could type: 
    *   <blockquote><code>
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
index d648d5af9e5..438decfc957 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -44,7 +44,7 @@ refer to that OMG specification for further details.
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html
index 08782dd520f..3e192706b72 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableInterceptor/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
 
-Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -56,41 +56,39 @@ for how to go about registering interceptors.
 <h2>Known limitations / unimplemented methods in package 
 <code>org.omg.PortableInterceptor</code></h2>
 
-<code>
 <ul>
   <li>
-    <b>RequestInfo</b>
+    <code><b>RequestInfo</b></code>
     <ul>
-      <li><b>sync_scope()</b>: Always returns SYNC_WITH_TRANSPORT</li>
-      <li><b>arguments()</b>: Only supported for DII/DSI calls</li>
-      <li><b>exceptions()</b>: Only supported for DII calls on client side.  
+      <li><code><b>sync_scope()</b></code>: Always returns SYNC_WITH_TRANSPORT</li>
+      <li><code><b>arguments()</b></code>: Only supported for DII/DSI calls</li>
+      <li><code><b>exceptions()</b></code>: Only supported for DII calls on client side.  
           Not supported on server-side.</li>
-      <li><b>contexts()</b>: Only supported for DII calls on client side.
+      <li><code><b>contexts()</b></code>: Only supported for DII calls on client side.
           Not supported on server-side since our ORB does not send contexts.
           </li>
-      <li><b>operation_context()</b>: Only supported for DII calls 
+      <li><code><b>operation_context()</b></code>: Only supported for DII calls 
           on client side.  Not supported on server-side since ORB 
           does not send contexts.</li>
-      <li><b>result()</b>: Only supported for DII/DSI calls</li>
+      <li><code><b>result()</b></code>: Only supported for DII/DSI calls</li>
     </ul>
   </li>
   <li>
-    <b>ClientRequestInfo</b>
+    <code><b>ClientRequestInfo</b></code>
     <ul>
-      <li><b>received_exception_id()</b>: Always returns null in the 
+      <li><code><b>received_exception_id()</b></code>: Always returns null in the 
           DII case</li>
-      <li><b>get_request_policy(int type)</b>: Not implemented.</li>
+      <li><code><b>get_request_policy(int type)</b></code>: Not implemented.</li>
     </ul>
   </li>
   <li>
-    <b>ServerRequestInfo</b>
+    <code><b>ServerRequestInfo</b></code>
     <ul>
-      <li><b>sending_exception()</b>: Does not support user exceptions on 
+      <li><code><b>sending_exception()</b></code>: Does not support user exceptions on 
           the server side in non-DSI case.</li>
     </ul>
   </li>
 </ul>
-</code>
 
 <h2>Package Specification</h2>
 <P>For a precise list of supported sections of official OMG specifications with which 
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html
index c3723274fd3..cb3380286f7 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/CurrentPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -53,7 +53,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html
index b93de2f1eb0..7bdbaec5455 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAManagerPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -43,7 +43,7 @@ Encapsulates the processing
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html
index 63b92b2da93..0d642f13d51 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/POAPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -36,7 +36,6 @@
 between different ORB products.  
 
 <P>The Portable Object Adaptor (POA) is designed to meet the following goals:
-<P>
 <UL>
 <LI>Allow programmers to construct object implementations that are portable between different ORB products.
 <LI>Provide support for objects with persistent identities.
@@ -66,7 +65,7 @@ be invoked by the application programmer, as well as methods which are invoked b
 the Java[tm] Platform, Standard Edition 6, ORB complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html
index 19640db5dc0..e767bdce872 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2015, Oracle and/or its affiliates. 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
@@ -43,13 +43,6 @@ follows exactly the same pattern as the other holder classes for basic types.
 the Java[tm] Platform, Standard Edition 6 complies, see <A 
 HREF="../../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
-
-
-
-
-
-
 
 @since 1.4
 <br>
diff --git a/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html b/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html
index 3f51ea1b943..497385bb9dc 100644
--- a/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/PortableServer/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -52,12 +52,10 @@ defined by the <TT>PortableServer</TT> module for the POA. In Java, the
 the Java[tm] Platform, Standard Edition 6 complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
 
 <H2>POA-related Interfaces</H2>
 
 <P>The <TT>PortableServer</TT> module defines the following POA-related interfaces:
-<P>
 <UL>
 	<LI><TT>POA</TT>
 	<LI><TT>POAManager</TT>
@@ -79,12 +77,18 @@ support in Java[tm] SE 6</A>.
 
 <H3>Operations classes</H3>
 
-<P>Each of the interfaces listed above has an associated <code>Operations</code> interface.  The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and contains the method signatures for methods defined in its associated interface.  The <code>Operations</code> interface can be accessed by both the client and the server, while its associated interface can only be called by the client.
+<P>Each of the interfaces listed above has an associated <code>Operations</code> interface.
+The <code>Operations</code> interface is generated by the <code>idlj</code> compiler and
+contains the method signatures for methods defined in its associated interface.
+The <code>Operations</code> interface can be accessed by both the client and the server,
+while its associated interface can only be called by the client.
 
 <H3>Value Classes</H3>
 
-Classes ending in the suffix <code>PolicyValue</code> provide the values used for the <code>create_POA</code> call, which sets the policy for the POA.   See the <a href="#sampleserver">sample code</a> below for a demonstration.  <code>PolicyValue</code> files include the following:
-<P>
+Classes ending in the suffix <code>PolicyValue</code> provide the values used
+for the <code>create_POA</code> call, which sets the policy for the POA. See
+the <a href="#sampleserver">sample code</a> below for a demonstration. 
+<code>PolicyValue</code> files include the following:
 <UL>
 <LI><code>IdAssignmentPolicyValue</code> 
 <LI><code>IdUniquenessPolicyValue</code>
@@ -98,8 +102,11 @@ Classes ending in the suffix <code>PolicyValue</code> provide the values used fo
 <H3>Helper Classes</H3>
 
 <P>Helper classes, which are generated for all user-defined types in an OMG IDL 
-interface, supply static methods needed to manipulate those types.  There is only one method in a helper class that an application programmer uses: the  <code>narrow</code> method.  Only Java interfaces mapped from IDL interfaces will have a helper class that includes a <code>narrow</code> method, so in the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
-<P>
+interface, supply static methods needed to manipulate those types.
+There is only one method in a helper class that an application programmer uses: 
+the  <code>narrow</code> method.  Only Java interfaces mapped from IDL interfaces 
+will have a helper class that includes a <code>narrow</code> method, so in
+the <code>PortableServer</code> package, only the following classes have a <code>narrow</code> method:
 <UL>
 <LI><code>ForwardRequestHelper</code>
 <LI><code>ServantActivatorHelper</code>
@@ -113,22 +120,31 @@ interface, supply static methods needed to manipulate those types.  There is onl
 <H3>Exceptions</H3>
 
 <P>The <code>ForwardRequest</code> exception indicates to the ORB 
-that it is responsible for delivering the current request and subsequent <code>ForwardRequest</code> requests to the object denoted in the 
- <code>forward_reference</code> member of the exception.
+that it is responsible for delivering the current request and
+subsequent <code>ForwardRequest</code> requests to the object denoted in the
+<code>forward_reference</code> member of the exception.
 
 <H3>Interfaces Implemented by the Application Programmer</H3>
 
-<P>Most of what <code>PortableServer</code> does is transparent to the user.  The result is that programmers will use only a few of the interfaces mentioned above.  The remaining interfaces will be provided by the ORB implementation.  The interfaces of interest to application programmers are the following:
-<P>
+<P>Most of what <code>PortableServer</code> does is transparent to the user.
+The result is that programmers will use only a few of the interfaces mentioned above.
+The remaining interfaces will be provided by the ORB implementation.
+The interfaces of interest to application programmers are the following:
 <ul>
-	<LI><code>AdapterActivator</code>
-	<P>Adapter activators are associated with POAs.  An adapter activator supplies a POA with the ability to create child POAs on demand, as a side-effect of receiving a request that names the child POA (or one of its children), or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>.  An application server that creates all its needed POAs at the beginning of execution does not need to use or provide an adapter activator; it is necessary only for the case in which POAs need to be created during request processing.
-	<P>
-	<LI><code>ServantLocator</code>
-	<P>When the POA has the <code>NON_RETAIN</code> policy, it uses servant managers that are <code>ServantLocator</code>s.
-	<P>
-	<LI><code>ServantActivator</code>
-	<P>When the POA has the <code>RETAIN</code> policy, it uses servant managers that are <code>ServantActivator</code>s.
+  <LI><code>AdapterActivator</code>
+  <P>Adapter activators are associated with POAs. 
+  An adapter activator supplies a POA with the ability to create child POAs on demand,
+  as a side-effect of receiving a request that names the child POA (or one of its children),
+  or when <code>find_POA</code> is called with an activate parameter value of <code>TRUE</code>.
+  An application server that creates all its needed POAs at the beginning of execution
+  does not need to use or provide an adapter activator; it is necessary
+  only for the case in which POAs need to be created during request processing.
+  <LI><code>ServantLocator</code>
+  <P>When the POA has the <code>NON_RETAIN</code> policy,
+  it uses servant managers that are <code>ServantLocator</code>s.
+  <LI><code>ServantActivator</code>
+  <P>When the POA has the <code>RETAIN</code> policy,
+  it uses servant managers that are <code>ServantActivator</code>s.
 </ul>
 
 
@@ -141,13 +157,11 @@ follows exactly the same pattern as the other holder classes for basic types.
 <H2>Related Documentation</H2>
 
 <P>For an overview of Java IDL, please see:
-<P>
-<LI><A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
+<A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
 
 <H2>Example Code</H2>
 <a name="sampleserver"></a>
 <H3>Example Server Code</H3>
-<P>
 <PRE>
 import javax.naming.InitialContext;
 import javax.naming.Context;
@@ -209,9 +223,6 @@ public class HelloServer {
 
 
 
-<P>
-
-
 @since 1.4
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html b/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html
index 3f17fafb396..a76f241b24d 100644
--- a/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/SendingContext/package.html
@@ -3,7 +3,7 @@
 <head>
 <!--
  
- Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1999, 2015, Oracle and/or its affiliates. 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
@@ -68,7 +68,7 @@
 the Java[tm] Platform, Standard Edition 6 ORB complies, see <A 
 HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA 
 support in Java[tm] SE 6</A>.
-<p>
+
 @since 1.3
 <br>
 @serial exclude
diff --git a/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html b/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html
index 0d7df8d2828..abd3fa11f18 100644
--- a/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html
+++ b/corba/src/java.corba/share/classes/org/omg/stub/java/rmi/package.html
@@ -3,7 +3,7 @@
 <title>org.omg.stub.java.rmi package</title>
 <!--
  
- Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -32,7 +32,7 @@
 <body bgcolor="white">
   Contains RMI-IIOP Stubs for the Remote types that occur in the 
   <tt>java.rmi</tt> package.
-<p>
+
 @since 1.3
 <br>
 @serial exclude
