diff --git a/src/macosx/classes/com/apple/eawt/event/package.html b/src/macosx/classes/com/apple/eawt/event/package.html
index 9c05d88c8211f618725dc5b853649ef710aa0a99..0946e60f3097b8314aa72a39cf014f4ef308444b 100644
--- a/src/macosx/classes/com/apple/eawt/event/package.html
+++ b/src/macosx/classes/com/apple/eawt/event/package.html
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<title></title>
 </head>
 <body bgcolor="white">
 Classes for receiving gesture events.
diff --git a/src/macosx/classes/com/apple/eawt/package.html b/src/macosx/classes/com/apple/eawt/package.html
index e11ed40ba3ff742bd4f500e2e5a833261676523e..81bc1a8d3f8e9e642545cdee3708a9e0c1f51ca7 100644
--- a/src/macosx/classes/com/apple/eawt/package.html
+++ b/src/macosx/classes/com/apple/eawt/package.html
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<title></title>
 </head>
 <body bgcolor="white">
 Provides classes for integrating Java applications with the native application environment.
diff --git a/src/share/classes/java/awt/color/package.html b/src/share/classes/java/awt/color/package.html
index 8b82f8e59ebd01281ba199be7b2dde54fa3d0b08..13ab17419a3dff07f1c03f04ceb341ee5aeaccdf 100644
--- a/src/share/classes/java/awt/color/package.html
+++ b/src/share/classes/java/awt/color/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides classes for color spaces.  It contains an
diff --git a/src/share/classes/java/awt/datatransfer/package.html b/src/share/classes/java/awt/datatransfer/package.html
index a16e0090889de6c8e819dbffbde24e468b5cabb1..f33946cac586ec912671cf11b9b1ac861a497dd0 100644
--- a/src/share/classes/java/awt/datatransfer/package.html
+++ b/src/share/classes/java/awt/datatransfer/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides interfaces and classes for transferring data
diff --git a/src/share/classes/java/awt/dnd/package.html b/src/share/classes/java/awt/dnd/package.html
index b39c069b0c58560b026b5b766e85e7a638165644..f2df34617bd92656c77cb251a2f12ad120f1a71f 100644
--- a/src/share/classes/java/awt/dnd/package.html
+++ b/src/share/classes/java/awt/dnd/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Drag and Drop is a direct manipulation gesture found in many Graphical
@@ -51,18 +52,18 @@ states (not entirely sequentially):
 associated with some presentation
 element (<code>Component</code>) in the GUI, to initiate a Drag and Drop of
 some potentially <code>Transferable</code> data. 
-<P>
+<br><br>
 <LI>1 or more <code>DropTarget</code>(s) come into/go out of 
 existence, associated
 with presentation elements in the GUI (Components), potentially
 capable of consuming <code>Transferable</code> data types. 
-<P>
+<br><br>
 <LI> A <code>DragGestureRecognizer</code> is 
 obtained from the <code>DragSource</code> and is
 associated with a <code>Component</code> in order 
 to track and identify any Drag
 initiating gesture by the user over the <code>Component</code>. 
-<P>
+<br><br>
 <LI> A user makes a Drag gesture over the <code>Component</code>, 
 which the registered
 <code>DragGestureRecognizer</code> detects, and notifies its
@@ -76,13 +77,13 @@ contains the abstract class <code>MouseDragGestureRecognizer</code> for
 recognizing mouse device gestures. Other abstract subclasses may be
 provided by the platform to support other input devices or
 particular <code>Component</code> class semantics. 
-    <P>
+<br><br>
 <LI> The <code>DragGestureListener</code> causes the 
 <code>DragSource</code> to initiate the Drag
 and Drop operation on behalf of the user, perhaps animating the
 GUI Cursor and/or rendering an <code>Image</code> of the item(s) that are the
 subject of the operation.
-<P>
+<br><br>
 <LI> As the user gestures navigate over <code>Component</code>(s) 
 in the GUI with
 associated <code>DropTarget</code>(s), the <code>DragSource</code> 
@@ -111,11 +112,11 @@ as follows:
 <UL>
 <LI> By the transfer "operation" selected by the user, and supported by
 both the <code>DragSource</code> and <code>DropTarget</code>: Copy, Move or Reference(link). 
-<P>
+<br><br>
 <LI> By the intersection of the set of data types provided by the
 <code>DragSource</code> and the set of data types comprehensible by the 
 <code>DropTarget</code>. 
-<P>
+<br><br>
 <LI>When the user terminates the drag operation, normally resulting in a
 successful Drop, both the <code>DragSource</code> and <code>DropTarget</code>
 receive
diff --git a/src/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
index 735cfdd97d6325c22ce272863d96326d71d50bef..93d185181fe9a80d2969bffa2cafe24a783e4767 100644
--- a/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -23,7 +23,11 @@
  questions.
 -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
+<head>
+<title></title>
+</head>
 <body bgcolor=white>
 
 <h1 align=center>AWT Threading Issues</h1>
@@ -81,13 +85,13 @@ this machinery are as follows:
        dispatched:
        <ul>
            <li> Sequentially.
-           <dd> That is, it is not permitted that several events from
-	        this queue are dispatched simultaneously. 
+           <dl><dd> That is, it is not permitted that several events from
+	        this queue are dispatched simultaneously. </dd></dl>
            <li> In the same order as they are enqueued.
-           <dd> That is, if <code>AWTEvent</code>&nbsp;A is enqueued
+           <dl><dd> That is, if <code>AWTEvent</code>&nbsp;A is enqueued
 	        to the <code>EventQueue</code> before
 		<code>AWTEvent</code>&nbsp;B then event B will not be 
-                dispatched before event A.
+                dispatched before event A.</dd></dl>
        </ul>
   <li> There is at least one alive non-daemon thread while there is at
        least one displayable AWT or Swing component within the
diff --git a/src/share/classes/java/awt/doc-files/DesktopProperties.html b/src/share/classes/java/awt/doc-files/DesktopProperties.html
index ff9b144951c132f226265caf22b819a58bcd3248..8a3923c0f40222f43883fc07a837b459d3f12b9f 100644
--- a/src/share/classes/java/awt/doc-files/DesktopProperties.html
+++ b/src/share/classes/java/awt/doc-files/DesktopProperties.html
@@ -23,7 +23,11 @@
  questions.
 -->
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
+<head>
+<title></title>
+</head>
 <body bgcolor=white>
 
 <h1 align=center>AWT Desktop Properties</h1>
@@ -51,8 +55,8 @@ unavailable for any reason, the implementation will return
 <p>
 The following table summarizes the desktop properties documented
 here, and their value types.
-<p>
-<table align="center" border="0" cellspacing="0" cellpadding="2" width="%95
+<br><br>
+<table align="center" border="0" cellspacing="0" cellpadding="2"
   summary="Standard AWT Desktop Properties">
 <tr bgcolor="#ccccff">
 <th valign="TOP" align="LEFT">Property Name</th>
@@ -60,17 +64,17 @@ here, and their value types.
 <th valign="TOP" align="LEFT">Summary Description</th>
 </tr>
 <tr>
-<td valign="TOP"><A href=#awt.font.desktophints>awt.font.desktophints</A</td>
-<td valign="TOP"><a href="../../util/Map.html">java.util.Map<a/></td>
-<td valign="TOP">Font smoothing (text antialiasing) settings.<a/></td>
+<td valign="TOP"><A href="#awt.font.desktophints">awt.font.desktophints</A></td>
+<td valign="TOP"><a href="../../util/Map.html">java.util.Map</a></td>
+<td valign="TOP">Font smoothing (text antialiasing) settings.</td>
 </tr>
 <tr>
-<td valign="TOP"><A href=#"sun.awt.enableExtraMouseButtons">sun.awt.enableExtraMouseButtons</A</td>
-<td valign="TOP"><a href="../../lang/Boolean.html">java.lang.Boolean<a/></td>
-<td valign="TOP">Controls if mouse events from extra buttons are to be generated or not<a/></td>
+<td valign="TOP"><A href="#sun.awt.enableExtraMouseButtons">sun.awt.enableExtraMouseButtons</A></td>
+<td valign="TOP"><a href="../../lang/Boolean.html">java.lang.Boolean</a></td>
+<td valign="TOP">Controls if mouse events from extra buttons are to be generated or not</td>
 </tr>
 </table>
-<p>
+
 <h2>Desktop Font Rendering Hints</h2>
 <b>Desktop Property: <A name="awt.font.desktophints">"awt.font.desktophints"</A></b>
 <p>
@@ -84,14 +88,14 @@ This is particularly important when creating
 <a href="../../../javax/swing/JComponent.html"> Swing components</a> which
 are required to appear consistent with native desktop components or other
 Swing components.
-<p>
+
 <h3>Basic Usage</h3>
 The standard desktop property named
 <b>"awt.font.desktophints"</b>
 can be used to obtain the rendering hints that best match the desktop settings.
 
 The return value is a
-<a href="../../util/Map.html"> Map<a/> of
+<a href="../../util/Map.html"> Map</a> of
 <a href="../RenderingHints.html"> <code>RenderingHints</code></a> which
 can be directly applied to a <code>Graphics2D</code>.
 <p>
@@ -105,7 +109,7 @@ if (map != null) {
 }
 </code></pre>
 <h3>Advanced Usage Tips</h3>
-<p>
+
 <h4>Listening for changes</h4>
 <p>
 An application can listen for changes in the property
@@ -161,7 +165,7 @@ RenderingHints getRenderingHints(Graphics2D g2d,
      if (hintsToSave.size() == 0) {
          return savedHints;
      }
-     /* RenderingHints.keySet() returns Set<Object> */
+     /* RenderingHints.keySet() returns Set&lt;Object&gt; */
      for (Object o : hintsToSave.keySet()) {
          RenderingHints.Key key = (RenderingHints.Key)o;
          Object value = g2d.getRenderingHint(key);
@@ -185,17 +189,17 @@ if (map != null) {
 <h3>Details</h3>
 <ul>
 <li>The return value will always be null or a <code>Map</code>
-<p>
+<br><br>
 <li>If the return value is null, then no desktop properties are available,
 and dynamic updates will not be available. This is a typical behaviour if
 the JDK does not recognise the desktop environment, or it is one which
 has no such settings. The <b>Headless</b> toolkit is one such example.
 Therefore it is important to test against null before using the map. 
-<p>
+<br><br>
 <li>If non-null the value will be a <code>Map</code> of
 <code>RenderingHints</code> such that every key is an instance of
 <code>RenderingHints.Key</code> and the value is a legal value for that key.
-<p>
+<br><br>
 <li>The map may contain the default value for a hint. This is
 needed in the event there is a previously a non-default value for the hint
 set on the <code>Graphics2D</code>. If the map did not contain
@@ -204,7 +208,7 @@ the previous hint which may not correspond to the desktop setting.
 <p>
 An application can use <code>setRenderingHints(Map)</code> to reinitialise
 all hints, but this would affect unrelated hints too.
-<p>
+<br><br>
 <li>A multi-screen desktop may support per-screen device settings in which
 case the returned value is for the default screen of the desktop.
 An application may want to use the settings for the screen on
diff --git a/src/share/classes/java/awt/doc-files/FocusSpec.html b/src/share/classes/java/awt/doc-files/FocusSpec.html
index 908afef4f55e59578cdb9a5ed746b1bce0bbc948..910db97b3fca3250f6e9768fb40b3b36089b57fd 100644
--- a/src/share/classes/java/awt/doc-files/FocusSpec.html
+++ b/src/share/classes/java/awt/doc-files/FocusSpec.html
@@ -27,7 +27,7 @@
 
 <html>
     <head>
-       <title align=center>The AWT Focus Subsystem</title>
+       <title>The AWT Focus Subsystem</title>
     </head>
 
     <body bgcolor="white">
@@ -660,16 +660,16 @@ All other applications, including pure AWT applications, will use
   FocusTraversalPolicy of its own. To do so, one needs to set Container's focus
   traversal policy provider property to <code>true</code> with the call to
 
-  <ul>
+  <blockquote>
     <code>Container.setFocusTraversalPolicyProvider(boolean)</code>
-  </ul>
+  </blockquote>
 
   To determine whether a Container is a focus traversal policy provider, the
   following method should be used:
 
-  <ul>
+  <blockquote>
     <code>Container.isFocusTraversalPolicyProvider()</code>
-  </ul>
+  </blockquote>
 
   If focus traversal policy provider property is set on a focus cycle root, it
   isn't considered a focus traversal policy provider and behaves just like any
@@ -750,10 +750,10 @@ traversals. The preferred way to initiate a programmatic traversal is
 to use one of the following methods on <code>KeyboardFocusManager</code>:
 
   <ul>
-    <code>KeyboardFocusManager.focusNextComponent()</code>
-    <code>KeyboardFocusManager.focusPreviousComponent()</code>
-    <code>KeyboardFocusManager.upFocusCycle()</code>
-    <code>KeyboardFocusManager.downFocusCycle()</code>
+    <li><code>KeyboardFocusManager.focusNextComponent()</code>
+    <li><code>KeyboardFocusManager.focusPreviousComponent()</code>
+    <li><code>KeyboardFocusManager.upFocusCycle()</code>
+    <li><code>KeyboardFocusManager.downFocusCycle()</code>
   </ul>
 
 <p>
@@ -1149,7 +1149,7 @@ Microsoft Windows and Solaris is as follows:
         <b>Microsoft Windows</b>: The Window is moved to front and becomes the focused
         Window.
       <br>
-        </b>Solaris</b>: The Window is moved to front. In a point-to-focus focus
+        <b>Solaris</b>: The Window is moved to front. In a point-to-focus focus
         window manager, the Window will be focused if it is now the
         top-most Window under the cursor. In a click-to-focus window
         manager, the Window will become the focused Window.
diff --git a/src/share/classes/java/awt/doc-files/Modality.html b/src/share/classes/java/awt/doc-files/Modality.html
index 777d16837ee45c2a5c09dc7cd683c98f7ab38b7a..f0bf00ca2fa990fbded384ca2fe087fff62368a9 100644
--- a/src/share/classes/java/awt/doc-files/Modality.html
+++ b/src/share/classes/java/awt/doc-files/Modality.html
@@ -43,7 +43,7 @@
       modality features and how to use them. It contains the following sections:
     </p><ul>
       <li><a href="#Definitions">Definitions</a></li>
-      </li><li><a href="#ModalityTypes">Modality types</a></li>
+      <li><a href="#ModalityTypes">Modality types</a></li>
       <li><a href="#ShowHideBlocking">Show/hide blocking</a></li>
       <li><a href="#ModalExclusion">Modal exclusion</a></li>
       <li><a href="#Related">Related AWT features</a></li>
@@ -54,13 +54,13 @@
     </ul>
 
     <a name="Definitions"></a>
-    </p><h3>Definitions</h3>
+    <h3>Definitions</h3>
 
     <p>
       <u>Document</u> - a window without an owner that, together with
       all its child hierarchy, may be operated on as a single self-contained
       document.
-      Every window belongs to some document &#151; its root can be found as
+      Every window belongs to some document &mdash; its root can be found as
       the closest ancestor window without an owner.
     </p><p>
       <a name="ModalBlocked"></a>
@@ -73,7 +73,7 @@
       <blockquote>
         <hr>
           <b>Warning!</b> Some window managers allow users to change the window
-          Z-order in an arbitrary way &#151; in that case the last requirement 
+          Z-order in an arbitrary way &mdash; in that case the last requirement 
           may not be met.
         <hr>
       </blockquote>
@@ -92,12 +92,12 @@
     </p><p>
      <blockquote><hr>
       <b>Note</b>: Everywhere in this document the notion of "window" is equal
-      to a top-level window in the Java programming language &#151; in other words
+      to a top-level window in the Java programming language &mdash; in other words
       an instance of <code>java.awt.Window</code> or any descendant class.
       <hr></blockquote>
 
     <a name="ModalityTypes"></a>
-    </p><h3>Modality types</h3>
+    <h3>Modality types</h3>
 
     <p>
       There are four supported modality types :
@@ -163,11 +163,11 @@
       <hr></blockquote>
 
     <a name="ShowHideBlocking"></a>
-    </p><h3>Show/hide blocking</h3>
+    <h3>Show/hide blocking</h3>
 
     <p>
       <u>Showing the window or modeless dialog: "F"</u><br>
-      All the visible modal dialogs are looked through &#151; if F is from the SB
+      All the visible modal dialogs are looked through &mdash; if F is from the SB
       of one of them, it becomes blocked by it. If there are several such
       dialogs, the first shown is used. If no such dialogs exist, F remains
       unblocked.
@@ -185,7 +185,7 @@
       dialogs outside M's SB and modal dialogs outside M's SB that do not
       block M).
       </ul>
-      </p><p>
+      <p>
       After the modal dialog M is shown, it becomes blocked by the first shown
       dialog from the first group (if there are any), all the windows from the
       second one become blocked by M, and all the windows from the third group
@@ -197,12 +197,12 @@
       </p><p>
       <u>Showing the document-modal dialog: "M"</u><br>
       All the visible application- and toolkit-modal dialogs are looked
-      through &#151; if M is from the SB of one of them,
+      through &mdash; if M is from the SB of one of them,
       it becomes blocked by it. If there are several such dialogs,
       the first shown is used. If no such dialogs exist, M remains unblocked.
       </p><p>
       <u>Showing the application-modal dialog: "M"</u><br>
-      All the visible toolkit-modal dialogs are looked through &#151;
+      All the visible toolkit-modal dialogs are looked through &mdash;
       if M is from the SB of one of them, it becomes blocked by it.
       If there are several such dialogs, the first shown is used.
       If no such dialogs exist, M remains unblocked.
@@ -212,7 +212,7 @@
       </p><p>
 <!--        <center> -->
           </p>
-          <table border="1" cols="5" rows="5">
+          <table border="1">
 	  <caption>The Standard Blocking Matrix</caption>
             <tbody><tr align="center">
               <td align="center">current/shown</td>
@@ -293,11 +293,10 @@
       <hr>
         <b>Implementation note</b>: Changing the modal exclusion type for a visible window
         may have no effect until it is hidden and then shown again.
-      </hr>
     </blockquote>
 
-    <a name="Related"</a>
-    </p><h3>Related AWT features</h3>
+    <a name="Related"></a>
+    <h3>Related AWT features</h3>
 
     <p>
       <u>Always-On-Top</u><br>
@@ -315,16 +314,16 @@
     <p>
       <u>Minimizing, maximizing and closing blocked windows</u><br>
       When a modal dialog blocks a window, the user may not be able to maximize or
-      minimize the blocked window&#151; however, the actual behavior is unspecified
+      minimize the blocked window&mdash; however, the actual behavior is unspecified
       and platform-dependent. In any case, the user can't close the blocked window
-      interactively&#151; but it can be closed programmatically by calling the
+      interactively&mdash; but it can be closed programmatically by calling the
       <code>setVisible(false)</code> or <code>dispose()</code> methods on the blocked
       window.
     </p>
     <p>
       <u>Blocked windows activations</u><br>
       When the user selects a blocked window, it may be brought to the front, along
-      with the blocking modal dialog which would then become the active window&#151;
+      with the blocking modal dialog which would then become the active window&mdash;
       however, the actual behavior is unspecified and platform-dependent.
     </p>
     <p>
@@ -339,9 +338,9 @@
       </li></ol>
       If the modal dialog to be hidden does not have focus, the active window remains
       unchanged.
-    </p>
+    
     <a name="Security"></a>
-    </p><h3>Security</h3>
+    <h3>Security</h3>
 
     <p>
       A special <code>AWTPermission</code>, <code>"toolkitModality"</code>,
@@ -386,35 +385,35 @@
     <a name="Examples"></a>
     </p><h3>Examples</h3>
 
-    <table cols="2" border="0">
+    <table border="0">
       <tbody><tr>
-        <td align="left" valign="center">
+        <td align="left" >
 	<ol>
           <li>Frame "F" is shown<br>
           <li>Document-modal dialog "D<sub>i</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>i</sub> &#151; it's in the same document<br>
+          <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
           <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &#151; it's in the
+          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
 	      same document<br>
 	  </ol>
           <br>
         </td>
-        <td align="center" valign="center">
+        <td align="center">
           <img src="modal-example1.gif">
           <br>
         </td>
       </tr>
       <tr>
-        <td align="left" valign="center">
+        <td align="left">
 	<ol>
          <li>Frame "F" is shown<br>
          <li>Document-modal dialog "D<sub>i</sub>" is shown<br>
-         <li>F becomes blocked by D<sub>i</sub> &#151; it's in the same document<br>
+         <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
          <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-         <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &#151;
+         <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash;
 	     it's in the same document<br>
          <li>D<sub>i</sub> is hidden<br>
-         <li>F becomes blocked by D<sub>ii</sub> &#151; it's in the same document<br>
+         <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
          </ol>
 	 <br>
         </td>
@@ -424,45 +423,45 @@
         </td>
       </tr>
       <tr>
-        <td align="left" valign="center">
+        <td align="left">
 	<ol>
           <li>Frame "F" is shown<br>
           <li>Toolkit-modal dialog "D<sub>i</sub>" is created, but not shown<br>
           <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>ii</sub> &#151; it's in the same document<br>
+          <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
           <li>Application-modal dialog "D<sub>iii</sub>" is shown<br>
-          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &#151;
+          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash;
 	      it's in the same application<br>
           <li>D<sub>i</sub> is shown<br>
-          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &#151; it's its owner<br>
-          <li>D<sub>iii</sub> remains unblocked &#151; it blocks D<sub>ii</sub> and 
+          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's its owner<br>
+          <li>D<sub>iii</sub> remains unblocked &mdash; it blocks D<sub>ii</sub> and 
 	      D<sub>ii</sub> blocks D<sub>i</sub><br>
 	  </ol>
           <br>
         </td>
-        <td align="center" valign="center">
+        <td align="center">
           <img src="modal-example3.gif">
           <br>
         </td>
       </tr>
       <tr>
-        <td align="left" valign="center">
+        <td align="left">
 	<ol>
           <li>Frame "F" is shown<br>
           <li>Toolkit-modal dialog "D<sub>i</sub>" is created, but not shown<br>
           <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>ii</sub> &#151; it's in the same document<br>
+          <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
           <li>Application-modal dialog "D<sub>iii</sub>" is shown<br>
-          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &#151; it's in the
+          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash; it's in the
 	      same application<br>
           <li>D<sub>i</sub> is shown<br>
-          <li>D<sub>iii</sub> becomes blocked by D<sub>i</sub> &#151; D<sub>i</sub>
+          <li>D<sub>iii</sub> becomes blocked by D<sub>i</sub> &mdash; D<sub>i</sub>
 	      is not blocked<br>
           <li>D<sub>i</sub> remains unblocked<br>
 	  </ol>
           <br>
         </td>
-        <td align="center" valign="center">
+        <td align="center">
           <img src="modal-example4.gif">
           <br>
         </td>
diff --git a/src/share/classes/java/awt/event/package.html b/src/share/classes/java/awt/event/package.html
index edf84c11476b729eb0c95f29bc8300665d05c874..eec07cacd6c09543bfe433876e60b48b266caed1 100644
--- a/src/share/classes/java/awt/event/package.html
+++ b/src/share/classes/java/awt/event/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides interfaces and classes for dealing with different
diff --git a/src/share/classes/java/awt/font/package.html b/src/share/classes/java/awt/font/package.html
index ec5d783e7082d9908df84da1dde5c4acbfdc6be9..d4d0a0a998d950c3b8feefcfe536da1f56ff2330 100644
--- a/src/share/classes/java/awt/font/package.html
+++ b/src/share/classes/java/awt/font/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides classes and interface relating to fonts.  It
diff --git a/src/share/classes/java/awt/geom/package.html b/src/share/classes/java/awt/geom/package.html
index e0ff8681e0489f1dfae1cf26cb21a5e9b728347e..4b18dee4c5f0258ce124d716f7957e7321c74774 100644
--- a/src/share/classes/java/awt/geom/package.html
+++ b/src/share/classes/java/awt/geom/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides the Java 2D classes for defining and performing operations
diff --git a/src/share/classes/java/awt/image/package.html b/src/share/classes/java/awt/image/package.html
index 9ef6e7f419b7fb71a85f9de185d5ab00382cd8d6..c2f4c69d5c500fe97ec29e800286b89be9e8bbb3 100644
--- a/src/share/classes/java/awt/image/package.html
+++ b/src/share/classes/java/awt/image/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides classes for creating and modifying images.
diff --git a/src/share/classes/java/awt/image/renderable/package.html b/src/share/classes/java/awt/image/renderable/package.html
index 3bcff3c39abeaab4b640f5bc7493c6f2f9f377f8..58a9694269f436d2453499feef4fb994cfea5f14 100644
--- a/src/share/classes/java/awt/image/renderable/package.html
+++ b/src/share/classes/java/awt/image/renderable/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides classes and interfaces for producing
diff --git a/src/share/classes/java/awt/package.html b/src/share/classes/java/awt/package.html
index 184ca072c9a9732783ef69b3d2fde39a6aa188cb..1b6527e45b63fc39b0d0005dafb835b0202ffed7 100644
--- a/src/share/classes/java/awt/package.html
+++ b/src/share/classes/java/awt/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Contains all of the classes for creating user
@@ -53,7 +54,7 @@ If the bounds of a Component object exceed a platform limit,
 there is no way to properly arrange them within a Container object.
 The object's bounds are defined by any object's coordinate
 in combination with its size on a respective axis. 
-<p>
+
 
 <h2>Additional Specification</h2>
 <ul>
diff --git a/src/share/classes/java/awt/print/package.html b/src/share/classes/java/awt/print/package.html
index ddbecd2ee54f9a92b66cf188f8113eb122f99fdd..c04f6f9e33b17659ab6672afca3cd872c00b6e3d 100644
--- a/src/share/classes/java/awt/print/package.html
+++ b/src/share/classes/java/awt/print/package.html
@@ -25,6 +25,7 @@
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
+<head><title></title></head>
 <body bgcolor="white">
 
 Provides classes and interfaces for a general printing API.  The
diff --git a/src/share/classes/javax/print/attribute/package.html b/src/share/classes/javax/print/attribute/package.html
index 7c848c5b29663f415002373e4bc7320ae25a4f25..661cbc2becdac03a3b17c044054fe8158a593ba8 100644
--- a/src/share/classes/javax/print/attribute/package.html
+++ b/src/share/classes/javax/print/attribute/package.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head>
 <title>javax.print.attribute package</title>
@@ -30,7 +31,6 @@ questions.
 Provides classes and interfaces
 that describe the types of Java<sup><font size="-2">TM</font></sup> Print
 Service attributes and how they can be collected into attribute sets.
-<P>
 <H3>What is an Attribute?</H3>
 When setting up a print job,
 a client specifies two things:
@@ -71,7 +71,6 @@ of the results of a print job.  The print job determines the manner in
 which it achieves the results specified by the processing instructions.
 Representing processing instructions as descriptive items
 provides more flexibility for implementing print jobs.
-<P>
 <h4>Attribute Categories and Values</h4>
 Each printer has a set of capabilities, such as the ability to print on
 different paper sizes or the ability to print more than one copy.  Each of 
@@ -222,7 +221,6 @@ one concrete implementation of each of the attribute set subinterfaces:
 All of these classes extend <A HREF="HashAttributeSet.html">HashAttributeSet</A>
 and enforce the restriction that the attribute set is only allowed to contain
 the corresponding kind of attribute.
-<P>
 <H3>Attribute Class Design</H3>
 An attribute value is a small, atomic data item,
 such as an integer or an enumerated value.  The Java Print Service API 
@@ -299,8 +297,8 @@ certain contexts also implements one or more subinterfaces of
 <code>Attribute</code>.  Most attribute classes also extend the appropriate 
 abstract syntax class to get the implementation.  Consider the 
 <code>Sides</code> attribute class:
-<pre>
 <blockquote>
+<pre>
 public class Sides
   extends EnumSyntax
   implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
@@ -311,8 +309,8 @@ public class Sides
     }
   ...
   }
-</blockquote>  
 </pre>
+</blockquote>  
 <p>
 Since every attribute class implements <code>Attribute</code>, every attribute
 class must provide an implementation for the 
@@ -363,9 +361,8 @@ because print-request attributes are the types of attributes that
 client usually specifies.  This example demonstrates creating an attribute
 set of print-request attributes and locating a printer that can
 print the document according to the specified attributes:
-<p>
-<pre>
 <blockquote>
+<pre>
 
 FileInputStream psStream;
 try {
@@ -392,8 +389,8 @@ if (services.length > 0) {
 	job.print(myDoc, aset);
    } catch (PrintException pe) {}
 }
-</blockquote>
 </pre>
+</blockquote>
 <P>
 Please note: In the javax.print APIs, a null reference parameter to methods 
 is incorrect unless explicitly documented on the method as having a meaningful
diff --git a/src/share/classes/javax/print/attribute/standard/package.html b/src/share/classes/javax/print/attribute/standard/package.html
index b71b72b79bbad0f0eca13c3041538205cbbe7b85..540f8ede65afbe41824191d4e22c277b4ad5b41f 100644
--- a/src/share/classes/javax/print/attribute/standard/package.html
+++ b/src/share/classes/javax/print/attribute/standard/package.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>javax.print.attribute.standard package</title>
@@ -199,7 +200,6 @@ never appear in attribute sets,
 so there is no restricted <A HREF="../AttributeSet.html">
 AttributeSet</A>
 subinterface for them.
-<P>
 
 <H4>Attribute Table</H4>
 The table below lists all the printing attributes.
@@ -213,7 +213,6 @@ the column marked "SupportedValuesAttribute"
 lists the supported-values attribute class, if any,
 with which a print service 
 indicates the supported values for that attribute category.
-<P>
 <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=1 SUMMARY="Lists all printing attributes as described in above text">
 <TR BGCOLOR="#E5E5E5">
 <TH VALIGN="bottom">Attribute Class</TH>
diff --git a/src/share/classes/javax/print/event/package.html b/src/share/classes/javax/print/event/package.html
index 4074b949cb3a4615747a6fd33e278020722b33a2..69c54bda2d855888271890a853d7bf586468e8c3 100644
--- a/src/share/classes/javax/print/event/package.html
+++ b/src/share/classes/javax/print/event/package.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head>
 <title>javax.print.event package</title>
@@ -30,7 +31,7 @@ questions.
 Package javax.print.event contains event classes  and listener interfaces.
 <p>
 They may be used to monitor both print services (such as printers going
-on-line & off-line), and the progress of a specific print job.
+on-line &amp; off-line), and the progress of a specific print job.
 <P>
 Please note: In the javax.print APIs, a null reference parameter to methods 
 is incorrect unless explicitly documented on the method as having a meaningful
diff --git a/src/share/classes/javax/print/package.html b/src/share/classes/javax/print/package.html
index df8c04573c6c4aed094980e5154180c00be9a082..942e554199c03360b70fcd2abd885946e8040f02 100644
--- a/src/share/classes/javax/print/package.html
+++ b/src/share/classes/javax/print/package.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <html>
 <head>
 <title>javax.print package</title>
@@ -52,7 +53,7 @@ such as IPP printers or JINI printers, a print-service provider can write
 implementations of <code>PrintServiceLookup</code>.  The print-service provider 
 can dynamically install these <code>PrintServiceLookup</code> implementations 
 using the 
-<a href="../../../technotes/guides/jar/jar.html#Service Provider">
+<a href="../../../technotes/guides/jar/jar.html#Service%20Provider">
 SPI JAR file specification</a>.
 
 <h3>Attribute Definitions</h3>
@@ -105,9 +106,8 @@ Service API: locating printers that can print five double-sided copies
 of a Postscript document on size A4 paper, creating a print job from 
 one of the returned print services, and calling print.
 
-<p>
-<pre>
 <blockquote>
+<pre>
 FileInputStream psStream;
 try {
    psStream = new FileInputStream("file.ps");
@@ -132,8 +132,8 @@ if (services.length > 0) {
 	job.print(myDoc, aset);
    } catch (PrintException pe) {}
 }
-</blockquote>
 </pre>
+</blockquote>
 <P>
 Please note: In the javax.print APIs, a null reference parameter to methods 
 is incorrect unless explicitly documented on the method as having a meaningful
diff --git a/src/share/classes/javax/swing/border/package.html b/src/share/classes/javax/swing/border/package.html
index 9bd379bd9922530918bbd1d966307ae9072761e7..c11b6747eabefc2f11b02edc49cdb1555266489f 100644
--- a/src/share/classes/javax/swing/border/package.html
+++ b/src/share/classes/javax/swing/border/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/colorchooser/package.html b/src/share/classes/javax/swing/colorchooser/package.html
index d64ba91b64b04a16d199174f9364bba8eeecbbfc..bf405aa45c112ceaed87b6fa096df7d6510e6f8b 100644
--- a/src/share/classes/javax/swing/colorchooser/package.html
+++ b/src/share/classes/javax/swing/colorchooser/package.html
@@ -25,6 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/event/package.html b/src/share/classes/javax/swing/event/package.html
index 5a90113561d10db674be772ca23beb2e196d41fc..c1fab2cfd122bd45a604c01af8a2dfbbc04e4699 100644
--- a/src/share/classes/javax/swing/event/package.html
+++ b/src/share/classes/javax/swing/event/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/filechooser/package.html b/src/share/classes/javax/swing/filechooser/package.html
index 58048bab8017253684540a2108bdeabf6f238c92..6303e9fd35fe53218aa0398e198200f5be672aa6 100644
--- a/src/share/classes/javax/swing/filechooser/package.html
+++ b/src/share/classes/javax/swing/filechooser/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 
 <body bgcolor="white">
diff --git a/src/share/classes/javax/swing/plaf/basic/package.html b/src/share/classes/javax/swing/plaf/basic/package.html
index f48ba91ad765dd158a0edb6e79fc9e10145eba5e..d453d348595457e782202e36f4bddf8e26f5af51 100644
--- a/src/share/classes/javax/swing/plaf/basic/package.html
+++ b/src/share/classes/javax/swing/plaf/basic/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/plaf/metal/package.html b/src/share/classes/javax/swing/plaf/metal/package.html
index e60da42ed4645a6ee1b04a23da4d94d9ad7fc345..146cbbbc79b037d67d53bb0f9034bd54e5abeb36 100644
--- a/src/share/classes/javax/swing/plaf/metal/package.html
+++ b/src/share/classes/javax/swing/plaf/metal/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html b/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
index 5160494f7506027034149098e0f9530de03f110a..3ae0bf2c6c01cebf8ab934d5d92f527a6f86d15e 100644
--- a/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
+++ b/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
@@ -14,14 +14,14 @@ Using the Multiplexing Look and Feel
 
 <blockquote>
 <hr>
-<i>
 <p>
+<i>
 This document is based on an article
 originally published in
 <a href="http://java.sun.com/products/jfc/tsc/" target="_top"><em>The Swing
 Connection</em></a>.
-</p>
 </i>
+</p>
 <hr>
 </blockquote>
 
@@ -43,7 +43,6 @@ the Java or Windows look and feel, for example --
 and requires no modifications to work with auxiliary look and feels.
 </p>
 
-</p>
 
 <p>
 This document has the following sections:
@@ -76,14 +75,12 @@ a <em>Swing Connection</em> article.
 </p>
 
 <p> 
-<a name="overview">
+<a name="overview"></a>
 <hr width=100% align=LEFT size=2>
-</a>
 <b>
 <font color="#000080" size="+2">Overview</font>
 </b>
 
-<p></p>
 
 <p>
 
@@ -146,14 +143,12 @@ is called (unsurprisingly)
 the Multiplexing look and feel.
 
 <p> 
-<a name="howtouse">
+<a name="howtouse"></a>
 <hr width=100% align=LEFT size=2>
-</a>
 <b>
 <font color="#000080" size="+2">How to Use Auxiliary Look and Feels</font>
 </b>
 
-<p></p>
 
 <p>
 It's easy to use auxiliary look and feels with Swing. To instruct 
@@ -204,14 +199,12 @@ of the UIs obtained from the default and auxiliary look and feels.
 </p>
 
 <p> 
-<a name="howtowrite">
+<a name="howtowrite"></a>
 <hr width=100% align=LEFT size=2>
-</a>
 <b>
 <font color="#000080" size="+2">Tips for Writing an Auxiliary Look and Feel</font>
 </b>
 
-<p></p>
 
 <p>
 An auxiliary look and feel is like any other look and feel,
@@ -252,7 +245,6 @@ the <code>javax.swing.plaf</code> package.
 <font color="#000080" size="+1"><b>Dos and Don'ts</b></font> 
 </a>
 </p>
-<p></p>
 
 <p>
 The following paragraphs provide some general recommendations for developing 
@@ -264,22 +256,19 @@ auxiliary look and feels.
 to perform all initialization,
 and the <code>uninstallUI</code> method
 to perform all cleanup.</b></font>
-</font>
 </p>
-<ul>
-<p>
+<blockquote>
 The <code>installUI</code> and <code>uninstallUI</code>
 methods are invoked when a component's look and feel is set.
 The <code>installUI</code> method gives the new UI object
 a chance to add listeners on the component and its data model.
 Similarly, the <code>uninstallUI</code> method
 lets the previous UI object remove its listeners.
-</p>
-            </ul>
+</blockquote>
             <p> <font color="#000080"><b>Don't extend 
               visual look and feels.</b></font></p>
-            <ul>
-              <p> We recommended that you <i>don't</i> implement 
+<blockquote>
+               We recommended that you <i>don't</i> implement 
                 UI classes of an auxiliary look and feel as subclasses of the 
                 UI classes of a visual look and feel.�Why not? Because they might 
                 accidentally inherit code that installs listeners on a component 
@@ -290,13 +279,13 @@ lets the previous UI object remove its listeners.
                 Instead, we recommend that the UI classes of an auxiliary look 
                 and feel directly extend the abstract UI classes in the <code>javax.swing.plaf</code> 
                 package.�By using this strategy, the developer of an auxiliary 
-                look and feel can avoid competing with the default look and feel.</p>
-            </ul>
+                look and feel can avoid competing with the default look and feel.
+</blockquote>
             <p> <font color="#000080"><b>Override all UI-specific methods
 	    your UI classes inherit.</b></font>
 	    </p>
-            <ul>
-              <p> We recommend that each UI class of 
+<blockquote>
+               We recommend that each UI class of 
                 an auxiliary look and feel override the methods 
 		defined in the <code>javax.swing.plaf</code>
                 UI classes it descends from
@@ -309,15 +298,14 @@ lets the previous UI object remove its listeners.
 		if the 
                 component is opaque. If a UI class from a non-visual auxiliary 
                 look and feel does not override this method, all 
-                opaque components appear as blank areas on the screen!</p>
-            </ul>
+                opaque components appear as blank areas on the screen!
+</blockquote>
             <p> 
 
 <br>
 <a name="uidefaults">
 <font color="#000080" size="+1"><b>Extending UIDefaults</b></font> 
 </a>
-            <p></p>
 
             <p>In many cases, you 
               might want an auxiliary look and feel to be &quot;incomplete.&quot;�That 
@@ -379,7 +367,6 @@ In the preceding example, an auxiliary look and feel named <code>MyAux</code>
 <a name="defaultui">
 <b><font color="#000080" size="+1">Examining Other UI Objects</font></b> 
 </a>
-<p></p>
 
             <p>In 
               rare instances, a UI object from an auxiliary look and feel 
@@ -395,12 +382,10 @@ In the preceding example, an auxiliary look and feel named <code>MyAux</code>
 	      </p>
 
 <p> 
-<a name="implementation">
+<a name="implementation"></a>
 <hr width=100% align=LEFT size=2>
-</a>
 <font color="#000080" size="+2"><b>How the Multiplexing Look and Feel
 Is Implemented</b></font> 
-<p></p>
 
 <p>
 The Multiplexing look and feel
@@ -437,8 +422,8 @@ all developers and users.
                 and feel is always the first to be created. After that, a UI object 
                 is created from each auxiliary look and feel in the order 
                 they are specified in the <code>swing.auxiliarylaf</code> 
-                property.</li>
-<p>
+                property.<br><br></li>
+
               <li> When a method that requests information 
                 from a UI object is invoked, the multiplexing UI object 
 		invokes the method on all the UI objects, but returns 
@@ -450,8 +435,8 @@ all developers and users.
 		The <code>getPreferredSize</code> method
 		is also invoked on the UI object for each auxiliary look and feel,
 		but the return values are ignored.
-                </li>
-<p>
+                <br><br></li>
+
               <li> When a method that does not request information 
                 from the UI object is invoked, the multiplexing UI object 
                 invokes that method on all UIs --
@@ -474,14 +459,12 @@ all developers and users.
 
 <p> 
 
-<a name="custom">
+<a name="custom"></a>
 <hr width=100% align=LEFT size=2>
-</a>
 <font color="#000080" size="+2"><b>How to Provide a Custom Multiplexing Look
 and Feel</b></font> 
-<p></p>
 
-            <p><font color="#000080" size="+2"><b></b></font>While 
+            <p>While 
               we hope the behavior of the Multiplexing look and feel is 
               flexible enough not to require an alternative multiplexing look 
               and feel, Swing allows the user to specify another multiplexing look 
diff --git a/src/share/classes/javax/swing/plaf/multi/package.html b/src/share/classes/javax/swing/plaf/multi/package.html
index 31b212bfbdb4218b2d62705eb0fe10da2a4b74ed..94e73080e3d6efc6dd22d3326396e474262fef6e 100644
--- a/src/share/classes/javax/swing/plaf/multi/package.html
+++ b/src/share/classes/javax/swing/plaf/multi/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
index bedeffb5db70bd76804eee559c1e433ade78921f..67048cf10879c975049c84f10337e47bcc391f57 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
+++ b/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
@@ -1,5 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<title></title>
 </head>
 <body>
 <h1 id="primaryColors">Primary Colors</h1>
diff --git a/src/share/classes/javax/swing/plaf/nimbus/package.html b/src/share/classes/javax/swing/plaf/nimbus/package.html
index 338df175b512901631d44259d8d22daa38b3359f..5a60f7a78856188d199f987a2dbf72789185cd6e 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/package.html
+++ b/src/share/classes/javax/swing/plaf/nimbus/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
@@ -39,11 +39,11 @@ component states.
 
 <p>Nimbus allows customizing many of its properties, including painters, by
 altering the {@link javax.swing.UIDefaults} table. Here's an example:
-<code><pre>
+<pre>
     UIManager.put("ProgressBar.tileWidth", myTileWidth);
     UIManager.put("ProgressBar[Enabled].backgroundPainter", myBgPainter);
     UIManager.put("ProgressBar[Enabled].foregroundPainter", myFgPainter);
-</pre></code>
+</pre>
 
 <p>Per-component customization is also possible. When rendering a component,
 Nimbus checks its client property named "Nimbus.Overrides". The value of this
@@ -53,14 +53,14 @@ only. An optional client property, "Nimbus.Overrides.InheritDefaults" of type
 Boolean, specifies whether the overriding settings should be merged with
 default ones ({@code true}), or replace them ({@code false}). By default they
 are merged:
-<code><pre>
+<pre>
     JProgressBar bar = new JProgressBar();
     UIDefaults overrides = new UIDefaults();
     overrides.put("ProgressBar.cycleTime", 330);
     ...
     bar.putClientProperty("Nimbus.Overrides", overrides);
     bar.putClientProperty("Nimbus.Overrides.InheritDefaults", false);
-</pre></code>
+</pre>
 
 <p>Colors in Nimbus are derived from a core set of
 <a href="doc-files/properties.html#primaryColors">primary colors</a>. There are also
diff --git a/src/share/classes/javax/swing/plaf/package.html b/src/share/classes/javax/swing/plaf/package.html
index fdd354d8c0a5653b03f50848782a445d01eee4a9..4e1745e445789c2f94eb7d38255c756299cd93ab 100644
--- a/src/share/classes/javax/swing/plaf/package.html
+++ b/src/share/classes/javax/swing/plaf/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index dfb99f4ef50700f79a77f4aee8a31285cb2ab66a..ad84defba088b38c1eaeda4517553ab9b6be1392 100644
--- a/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Synth File Format</title>
-  <style>
+  <style type="text/css">
 div.dtd-fragment {
     width: 100%;
     border: none;
@@ -24,7 +24,7 @@ div.example {
       Synth's file format (<a href="synth.dtd">dtd</a>)
       allows for specifying all the pieces
       necessary to create your own look and feel. A synth file is
-      loaded by way of the <A HREF="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.io.InputStream, java.lang.Class)">SynthLookAndFeel.load(InputStream, Class)</a> or
+      loaded by way of the <A HREF="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.io.InputStream,%20java.lang.Class)">SynthLookAndFeel.load(InputStream, Class)</a> or
       <a href="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.net.URL)">SynthLookAndFeel.load(URL)</a> methods.
       The following example uses the <code>load</code> method to configure 
       a <code>SynthLookAndFeel</code> and sets it as the current look
@@ -110,7 +110,7 @@ div.example {
 	    style.</dd>
     </dl>
     <p>
-      A <a name="e.style">style</a> element corresponds to a
+      A style element corresponds to a
       <code>SynthStyle</code>, with the child elements specifying
       properties that apply to all states or state elements which
       contain properties specific to a particular state. The following
@@ -216,7 +216,6 @@ div.example {
       contains at least SELECTED and PRESSED, state <code>one</code> will be
       chosen, otherwise if the state is SELECTED, but not does not
       contain PRESSED, state <code>two</code> will be used.
-    <p>
 
     <h3>The font element</h3>
 <div class="dtd-fragment">
@@ -462,7 +461,6 @@ div.example {
 	for idref properties this will be the unique id of a
 	previously defined object.</dd>
     </dl>
-    </dl>
     <p>
       <a href="#e.defaultsProperty">DefaultsProperty</a> elements are
       used to define properties that will be placed in the
@@ -738,7 +736,7 @@ div.example {
   &lt;state value="SELECTED">
     &lt;painter idref="stateFallbackPainter"/>
     &lt;painter idref="stateButtonBackgroundPainter" method="buttonBackground"/>
-  &lt/state>
+  &lt;/state>
 &lt;/style>
       </pre>
     </div>      
diff --git a/src/share/classes/javax/swing/plaf/synth/package.html b/src/share/classes/javax/swing/plaf/synth/package.html
index db63d14f5c69e9ddf2e7e2e210e9005a8cf8c0b5..2cf96801f579bfdd7e17124c3832c50c3f21d5e7 100644
--- a/src/share/classes/javax/swing/plaf/synth/package.html
+++ b/src/share/classes/javax/swing/plaf/synth/package.html
@@ -27,6 +27,7 @@ questions.
 
 
 -->
+<title></title>
 </head>
 <body bgcolor="white">
     <p>
diff --git a/src/share/classes/javax/swing/table/package.html b/src/share/classes/javax/swing/table/package.html
index bb173fbc724662e931f0217d5b483b992f94aa32..e046826cde13b1330d1a534308947ae9f0919c91 100644
--- a/src/share/classes/javax/swing/table/package.html
+++ b/src/share/classes/javax/swing/table/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/text/html/package.html b/src/share/classes/javax/swing/text/html/package.html
index 74e17f0581c367ed0928478ff8a1996e83efd72c..e838b626a4cfdfd44ff41f91d31448943e46160e 100644
--- a/src/share/classes/javax/swing/text/html/package.html
+++ b/src/share/classes/javax/swing/text/html/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/text/html/parser/package.html b/src/share/classes/javax/swing/text/html/parser/package.html
index b21527f98fe260533b5699c70e42071d062ad9e9..9ccd18c70a18ae976386d910d90dd572c4d5e398 100644
--- a/src/share/classes/javax/swing/text/html/parser/package.html
+++ b/src/share/classes/javax/swing/text/html/parser/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/text/package.html b/src/share/classes/javax/swing/text/package.html
index 8dddf882946b6ce06cb7ee9762a4d9cbc806cfb9..b1be2321477706b31bead31ef6b7b254dc864f46 100644
--- a/src/share/classes/javax/swing/text/package.html
+++ b/src/share/classes/javax/swing/text/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/text/rtf/package.html b/src/share/classes/javax/swing/text/rtf/package.html
index 70edc453bf1c489f522d17807d9d5de06b0ce7a2..8754907fdd6cf10fb2d1902f1a4df6c86b0d8790 100644
--- a/src/share/classes/javax/swing/text/rtf/package.html
+++ b/src/share/classes/javax/swing/text/rtf/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/tree/package.html b/src/share/classes/javax/swing/tree/package.html
index 39a0c8b217138e56b83334261333cc8e43187632..c66476549a45751bd79cab48e66cf210a69e2d2f 100644
--- a/src/share/classes/javax/swing/tree/package.html
+++ b/src/share/classes/javax/swing/tree/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 
diff --git a/src/share/classes/javax/swing/undo/package.html b/src/share/classes/javax/swing/undo/package.html
index c13c55ff42162ceeb679768813007fb27fe3c4d7..563fb1524bd5eb12bea020cec09a7bf29a6cf8cc 100644
--- a/src/share/classes/javax/swing/undo/package.html
+++ b/src/share/classes/javax/swing/undo/package.html
@@ -25,7 +25,7 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
 -->
-
+<title></title>
 </head>
 <body bgcolor="white">
 

Property Name	Summary Description
awt.font.desktophints -	java.util.Map	Font smoothing (text antialiasing) settings.	awt.font.desktophints	java.util.Map	Font smoothing (text antialiasing) settings.
sun.awt.enableExtraMouseButtons -	java.lang.Boolean	Controls if mouse events from extra buttons are to be generated or not	sun.awt.enableExtraMouseButtons	java.lang.Boolean	Controls if mouse events from extra buttons are to be generated or not
+	Frame "F" is shown Document-modal dialog "D_i" is shown - F becomes blocked by D_i — it's in the same document + F becomes blocked by D_i — it's in the same document Document-modal dialog "D_ii" is shown - D_i becomes blocked by D_ii — it's in the + D_i becomes blocked by D_ii — it's in the same document	+
+	Frame "F" is shown Document-modal dialog "D_i" is shown - F becomes blocked by D_i — it's in the same document + F becomes blocked by D_i — it's in the same document Document-modal dialog "D_ii" is shown - D_i becomes blocked by D_ii — + D_i becomes blocked by D_ii — it's in the same document D_i is hidden - F becomes blocked by D_ii — it's in the same document + F becomes blocked by D_ii — it's in the same document
+	Frame "F" is shown Toolkit-modal dialog "D_i" is created, but not shown Document-modal dialog "D_ii" is shown - F becomes blocked by D_ii — it's in the same document + F becomes blocked by D_ii — it's in the same document Application-modal dialog "D_iii" is shown - D_ii becomes blocked by D_iii — + D_ii becomes blocked by D_iii — it's in the same application D_i is shown - D_i becomes blocked by D_ii — it's its owner - D_iii remains unblocked — it blocks D_ii and + D_i becomes blocked by D_ii — it's its owner + D_iii remains unblocked — it blocks D_ii and D_ii blocks D_i	+
+	Frame "F" is shown Toolkit-modal dialog "D_i" is created, but not shown Document-modal dialog "D_ii" is shown - F becomes blocked by D_ii — it's in the same document + F becomes blocked by D_ii — it's in the same document Application-modal dialog "D_iii" is shown - D_ii becomes blocked by D_iii — it's in the + D_ii becomes blocked by D_iii — it's in the same application D_i is shown - D_iii becomes blocked by D_i — D_i + D_iii becomes blocked by D_i — D_i is not blocked D_i remains unblocked	+