8031082: Fix non-missing doclint problems in client libraries
authordarcy
Fri, 10 Jan 2014 09:24:47 -0800
changeset 22260 c9185e010e03
parent 22259 8e5afc67dca8
child 22261 e82547d2e78a
child 22262 949654c1c30e
8031082: Fix non-missing doclint problems in client libraries Reviewed-by: serb
jdk/src/share/classes/java/awt/Graphics2D.java
jdk/src/share/classes/java/awt/MediaTracker.java
jdk/src/share/classes/java/awt/font/TextAttribute.java
jdk/src/share/classes/java/awt/peer/ComponentPeer.java
jdk/src/share/classes/java/awt/peer/DialogPeer.java
jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java
jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java
jdk/src/share/classes/java/awt/peer/PanelPeer.java
jdk/src/share/classes/java/awt/peer/TextAreaPeer.java
jdk/src/share/classes/java/awt/peer/WindowPeer.java
jdk/src/share/classes/java/awt/print/Paper.java
jdk/src/share/classes/java/awt/print/Printable.java
jdk/src/share/classes/java/beans/XMLEncoder.java
jdk/src/share/classes/javax/accessibility/AccessibleContext.java
jdk/src/share/classes/javax/imageio/ImageWriter.java
jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java
jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java
jdk/src/share/classes/javax/print/Doc.java
jdk/src/share/classes/javax/print/DocFlavor.java
jdk/src/share/classes/javax/print/MultiDoc.java
jdk/src/share/classes/javax/print/MultiDocPrintJob.java
jdk/src/share/classes/javax/print/ServiceUI.java
jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java
jdk/src/share/classes/javax/print/attribute/AttributeSet.java
jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java
jdk/src/share/classes/javax/print/attribute/standard/Copies.java
jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java
jdk/src/share/classes/javax/print/attribute/standard/Finishings.java
jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java
jdk/src/share/classes/javax/print/attribute/standard/JobState.java
jdk/src/share/classes/javax/print/attribute/standard/MediaName.java
jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java
jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java
jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java
jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java
jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java
jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java
jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java
jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java
jdk/src/share/classes/javax/print/attribute/standard/Sides.java
jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java
jdk/src/share/classes/javax/sound/sampled/AudioPermission.java
jdk/src/share/classes/javax/sound/sampled/ReverbType.java
jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java
jdk/src/share/classes/javax/swing/JComboBox.java
jdk/src/share/classes/javax/swing/JEditorPane.java
jdk/src/share/classes/javax/swing/JLabel.java
jdk/src/share/classes/javax/swing/JLayeredPane.java
jdk/src/share/classes/javax/swing/JOptionPane.java
jdk/src/share/classes/javax/swing/JTextArea.java
jdk/src/share/classes/javax/swing/JTextPane.java
jdk/src/share/classes/javax/swing/plaf/TextUI.java
jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
jdk/src/share/classes/javax/swing/text/CompositeView.java
jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
jdk/src/share/classes/javax/swing/text/Document.java
jdk/src/share/classes/javax/swing/text/GlyphView.java
jdk/src/share/classes/javax/swing/text/JTextComponent.java
jdk/src/share/classes/javax/swing/text/NavigationFilter.java
jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
--- a/jdk/src/share/classes/java/awt/Graphics2D.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/Graphics2D.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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 @@
  * control over geometry, coordinate transformations, color management,
  * and text layout.  This is the fundamental class for rendering
  * 2-dimensional shapes, text and images on the  Java(tm) platform.
- * <p>
+ *
  * <h2>Coordinate Spaces</h2>
  * All coordinates passed to a <code>Graphics2D</code> object are specified
  * in a device-independent coordinate system called User Space, which is
@@ -229,7 +229,7 @@
  *
  * <h2>Default Rendering Attributes</h2>
  * The default values for the <code>Graphics2D</code> rendering attributes are:
- * <dl compact>
+ * <dl>
  * <dt><i><code>Paint</code></i>
  * <dd>The color of the <code>Component</code>.
  * <dt><i><code>Font</code></i>
@@ -351,7 +351,7 @@
  * fill(new Rectangle(x, y, w, h));
  * </pre>
  * is called.
- * <p>
+ *
  * <li>
  * Similarly, for draw operations, including <code>drawLine</code>,
  * <code>drawRect</code>, <code>drawRoundRect</code>,
@@ -363,7 +363,7 @@
  * draw(new Rectangle(x, y, w, h));
  * </pre>
  * is called.
- * <p>
+ *
  * <li>
  * The <code>draw3DRect</code> and <code>fill3DRect</code> methods were
  * implemented in terms of the <code>drawLine</code> and
--- a/jdk/src/share/classes/java/awt/MediaTracker.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/MediaTracker.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, 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
@@ -65,7 +65,7 @@
  *
  * <p>
  * Here is an example of using <code>MediaTracker</code>:
- * <p>
+ *
  * <hr><blockquote><pre>{@code
  * import java.applet.Applet;
  * import java.awt.Color;
--- a/jdk/src/share/classes/java/awt/font/TextAttribute.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/font/TextAttribute.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -65,7 +65,7 @@
  *   <LI>the valid values if there are limitations
  *   <LI>a description of the effect.
  * </UL>
- * <p>
+ *
  * <H3>Values</H3>
  * <UL>
  *   <LI>The values of attributes must always be immutable.
@@ -95,7 +95,6 @@
  * </UL>
  *
  * <h4>Summary of attributes</h4>
- * <p>
  * <table style="float:center" border="0" cellspacing="0" cellpadding="2" width="%95"
  *     summary="Key, value type, principal constants, and default value
  *     behavior of all TextAttributes">
--- a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/ComponentPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -457,8 +457,6 @@
      * @param caps the buffer capabilities
      *
      * @throws AWTException if flip buffering is not supported
-     *
-     * @see Component.FlipBufferStrategy#createBuffers
      */
     void createBuffers(int numBuffers, BufferCapabilities caps)
          throws AWTException;
@@ -467,8 +465,6 @@
      * Returns the back buffer as image.
      *
      * @return the back buffer as image
-     *
-     * @see Component.FlipBufferStrategy#getBackBuffer
      */
     Image getBackBuffer();
 
@@ -480,15 +476,11 @@
      * @param x2 the area to be flipped, lower right X coordinate
      * @param y2 the area to be flipped, lower right Y coordinate
      * @param flipAction the flip action to perform
-     *
-     * @see Component.FlipBufferStrategy#flip
      */
     void flip(int x1, int y1, int x2, int y2, BufferCapabilities.FlipContents flipAction);
 
     /**
      * Destroys all created buffers.
-     *
-     * @see Component.FlipBufferStrategy#destroyBuffers
      */
     void destroyBuffers();
 
--- a/jdk/src/share/classes/java/awt/peer/DialogPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/DialogPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -64,7 +64,6 @@
      * @param windows the windows to block
      *
      * @see Dialog#modalShow()
-     * @see Dialog#blockWindows()
      */
     void blockWindows(java.util.List<Window> windows);
 }
--- a/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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,6 +26,7 @@
 package java.awt.peer;
 
 import java.awt.Component;
+import java.awt.KeyboardFocusManager;
 import java.awt.Window;
 
 /**
@@ -71,7 +72,7 @@
     /**
      * Clears the current global focus owner.
      *
-     * @param activeWindow
+     * @param activeWindow the active window
      *
      * @see KeyboardFocusManager#clearGlobalFocusOwner()
      */
--- a/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -29,8 +29,8 @@
 import java.awt.Point;
 
 /**
- * Peer interface for {@link MouseInfo}. This is used to get some additional
- * information about the mouse.
+ * Peer interface for {@link java.awt.MouseInfo}. This is used to get
+ * some additional information about the mouse.
  *
  * The peer interfaces are intended only for use in porting
  * the AWT. They are not intended for use by application
--- a/jdk/src/share/classes/java/awt/peer/PanelPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/PanelPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, 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
@@ -25,7 +25,7 @@
 package java.awt.peer;
 
 /**
- * The peer interface for {@link Panel}. This is a subinterface of
+ * The peer interface for {@link java.awt.Panel}. This is a subinterface of
  * ContainerPeer and does not declare any additional methods because a Panel
  * is just that, a concrete Container.
  *
--- a/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, 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
@@ -28,7 +28,7 @@
 import java.awt.TextArea;
 
 /**
- * The peer interface for {@link TexTArea}.
+ * The peer interface for {@link TextArea}.
  *
  * The peer interfaces are intended only for use in porting
  * the AWT. They are not intended for use by application
--- a/jdk/src/share/classes/java/awt/peer/WindowPeer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/peer/WindowPeer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -57,7 +57,7 @@
      * Sets if the window should always stay
      * on top of all other windows or not.
      *
-     * @see Window#getAlwaysOnTop()
+     * @see Window#isAlwaysOnTop()
      * @see Window#setAlwaysOnTop(boolean)
      */
     void updateAlwaysOnTopState();
--- a/jdk/src/share/classes/java/awt/print/Paper.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/print/Paper.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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 @@
  * are compatible.  For example, if the paper size is changed from
  * 11 x 17 to 8.5 x 11, the application might need to reduce the
  * imageable area so that whatever is printed fits on the page.
- * <p>
  * @see #setSize(double, double)
  * @see #setImageableArea(double, double, double, double)
  */
--- a/jdk/src/share/classes/java/awt/print/Printable.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/print/Printable.java	Fri Jan 10 09:24:47 2014 -0800
@@ -94,7 +94,6 @@
  * <code>Pageable</code> then the client may provide different PageFormats
  * for each page index. Calculations of page breaks must account for this.
  * </ul>
- * <p>
  * @see java.awt.print.Pageable
  * @see java.awt.print.PageFormat
  * @see java.awt.print.PrinterJob
--- a/jdk/src/share/classes/java/beans/XMLEncoder.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/beans/XMLEncoder.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -150,7 +150,6 @@
  * Although all object graphs may be written using just these three
  * tags, the following definitions are included so that common
  * data structures can be expressed more concisely:
- * <p>
  * <ul>
  * <li>
  * The default method name is "new".
--- a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -39,7 +39,7 @@
  * obtaining more specific accessibility information about a component.
  * If the component supports them, these methods will return an object that
  * implements one or more of the following interfaces:
- * <P><ul>
+ * <ul>
  * <li>{@link AccessibleAction} - the object can perform one or more actions.
  * This interface provides the standard mechanism for an assistive
  * technology to determine what those actions are and tell the object
--- a/jdk/src/share/classes/javax/imageio/ImageWriter.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/imageio/ImageWriter.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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,8 +53,6 @@
  * which uses them for format recognition and presentation of
  * available format readers and writers.
  *
- * <p>
- *
  * @see ImageReader
  * @see ImageWriteParam
  * @see javax.imageio.spi.IIORegistry
--- a/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -54,7 +54,7 @@
  * listed in the following
  * table:
  *
- * <p><table border=1>
+ * <table border=1>
  * <caption><b>Compression Types</b></caption>
  * <tr><th>Type String</th> <th>Description</th>  <th>Image Types</th></tr>
  * <tr><td>BI_RGB</td>  <td>Uncompressed RLE</td> <td>{@literal <= } 8-bits/sample</td></tr>
--- a/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -446,7 +446,7 @@
      * <code>UTFDataFormatException</code> is thrown. Otherwise, the
      * group is converted to the character:
      *
-     * <p> <pre><code>
+     * <pre><code>
      * (char)(((a&amp; 0x1F) &lt;&lt; 6) | (b &amp; 0x3F))
      * </code></pre>
      *
@@ -460,7 +460,7 @@
      * <code>UTFDataFormatException</code> is thrown. Otherwise, the
      * group is converted to the character:
      *
-     * <p> <pre><code>
+     * <pre><code>
      * (char)(((a &amp; 0x0F) &lt;&lt; 12) | ((b &amp; 0x3F) &lt;&lt; 6) | (c &amp; 0x3F))
      * </code></pre>
      *
--- a/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -379,7 +379,7 @@
      * <code>&#92;u0001</code> through <code>&#92;u007f</code>, it is
      * represented by one byte:
      *
-     * <p><pre>
+     * <pre>
      * (byte)c
      * </pre>
      *
@@ -388,7 +388,7 @@
      * <code>&#92;u07ff</code>, then it is represented by two bytes,
      * to be written in the order shown:
      *
-     * <p> <pre><code>
+     * <pre><code>
      * (byte)(0xc0 | (0x1f &amp; (c &gt;&gt; 6)))
      * (byte)(0x80 | (0x3f &amp; c))
      * </code></pre>
@@ -397,7 +397,7 @@
      * <code>&#92;u0800</code> through <code>uffff</code>, then it is
      * represented by three bytes, to be written in the order shown:
      *
-     * <p> <pre><code>
+     * <pre><code>
      * (byte)(0xe0 | (0x0f &amp; (c &gt;&gt; 12)))
      * (byte)(0x80 | (0x3f &amp; (c &gt;&gt; 6)))
      * (byte)(0x80 | (0x3f &amp; c))
--- a/jdk/src/share/classes/javax/print/Doc.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/Doc.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,12 +44,12 @@
  * in which the print data is available. A doc flavor designates the print
  * data format (a MIME type) and the representation class of the object
  * from which the print data comes.
- * <P>
+ *
  * <LI>
  * Obtain the print data representation object, which is an instance of the
  * doc flavor's representation class. The Print Job can then obtain the actual
  * print data from the representation object.
- * <P>
+ *
  * <LI>
  * Obtain the printing attributes that specify additional characteristics of
  * the doc or that specify processing instructions to be applied to the doc.
@@ -104,7 +104,6 @@
  * a stream does not mean that it will, with the implications that Doc
  * implementors which rely on the service to close them should create such
  * streams only in response to a request from the service.
- * <P>
  * <HR>
  */
 public interface Doc {
--- a/jdk/src/share/classes/javax/print/DocFlavor.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/DocFlavor.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -49,7 +49,7 @@
  * See <a href="../../java/lang/package-summary.html#charenc">
  * character encodings</a> for more information on the character encodings
  * supported on the Java platform.
- * <P>
+ *
  * <LI>
  * <B>Representation class name.</B> This specifies the fully-qualified name of
  * the class of the object from which the actual print data comes, as returned
@@ -64,7 +64,7 @@
  * also lets the <code>DocPrintJob</code> obtain an instance of the doc flavor's
  * representation class, from which the <code>DocPrintJob</code> then obtains
  * the actual print data.
- * <P>
+ *
  * <HR>
  * <H3>Client Formatted Print Data</H3>
  * There are two broad categories of print data, client formatted print data
@@ -96,22 +96,22 @@
  * <LI>
  * Character array (<CODE>char[]</CODE>) -- The print data consists of the
  * Unicode characters in the array.
- * <P>
+ *
  * <LI>
  * <code>String</code>  --
  * The print data consists of the Unicode characters in the string.
- * <P>
+ *
  * <LI>
  * Character stream ({@link java.io.Reader java.io.Reader})
  * -- The print data consists of the Unicode characters read from the stream
  * up to the end-of-stream.
- * <P>
+ *
  * <LI>
  * Byte array (<CODE>byte[]</CODE>) -- The print data consists of the bytes in
  * the array. The bytes are encoded in the character set specified by the doc
  * flavor's MIME type. If the MIME type does not specify a character set, the
  * default character set is US-ASCII.
- * <P>
+ *
  * <LI>
  * Byte stream ({@link java.io.InputStream java.io.InputStream}) --
  * The print data consists of the bytes read from the stream up to the
@@ -139,7 +139,7 @@
  * To print such documents, let the client open an input stream on the URL
  * or file and use an input stream data flavor.
  * </UL>
- * <p>
+ *
  * <HR>
  * <h3>Default and Platform Encodings</h3>
  * <P>
@@ -179,11 +179,9 @@
  * understood by this VM.
  * For common flavors, the pre-defined *HOST DocFlavors may be used.
  * <p>
- * <p>
  * See <a href="../../java/lang/package-summary.html#charenc">
  * character encodings</a> for more information on the character encodings
  * supported on the Java platform.
- * <p>
  * <HR>
  * <h3>Recommended DocFlavors</h3>
  * <P>
@@ -196,7 +194,6 @@
  * constructor can be used to create an arbitrary doc flavor.
  * <UL>
  * <LI>Preformatted text
- * <P>
  * <TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 SUMMARY="MIME-Types and their descriptions">
  * <TR>
  *  <TH>MIME-Type</TH><TH>Description</TH>
@@ -222,9 +219,9 @@
  * In general, preformatted text print data is provided either in a character
  * oriented representation class (character array, String, Reader) or in a
  * byte oriented representation class (byte array, InputStream, URL).
- * <P>
+ *
  *  <LI>Preformatted page description language (PDL) documents
- *<P>
+ *
  * <TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 SUMMARY="MIME-Types and their descriptions">
  * <TR>
  *  <TH>MIME-Type</TH><TH>Description</TH>
@@ -245,9 +242,9 @@
  * <P>
  * In general, preformatted PDL print data is provided in a byte oriented
  * representation class (byte array, InputStream, URL).
- * <P>
+ *
  *  <LI>Preformatted images
- *<P>
+ *
  * <TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 SUMMARY="MIME-Types and their descriptions">
  * <TR>
  *  <TH>MIME-Type</TH><TH>Description</TH>
@@ -269,9 +266,9 @@
  * <P>
  * In general, preformatted image print data is provided in a byte oriented
  * representation class (byte array, InputStream, URL).
- * <P>
+ *
  *  <LI>Preformatted autosense print data
- *   <P>
+ *
  * <TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 SUMMARY="MIME-Types and their descriptions">
  * <TR>
  *  <TH>MIME-Type</TH><TH>Description</TH>
@@ -287,7 +284,7 @@
  * autosense print data is provided in a byte oriented representation class
  * (byte array, InputStream, URL).
  * </UL>
- * <P>
+ *
  * <HR>
  * <H3>Service Formatted Print Data</H3>
  * <P>
@@ -315,7 +312,7 @@
  * {@link java.awt.image.renderable.RenderableImage RenderableImage}. The
  * printer calls methods
  * in that interface to obtain the image to be printed.
- * <P>
+ *
  * <LI>
  * Printable object -- The client supplies an object that implements interface
  * {@link java.awt.print.Printable Printable}.
@@ -323,7 +320,7 @@
  * printed, one by one.
  * For each page, the printer supplies a graphics context, and whatever the
  * client draws in that graphics context gets printed.
- * <P>
+ *
  * <LI>
  * Pageable object -- The client supplies an object that implements interface
  * {@link java.awt.print.Pageable Pageable}. The printer calls
@@ -331,9 +328,9 @@
  * For each page, the printer supplies a graphics context, and whatever
  * the client draws in that graphics context gets printed.
  * </UL>
- * <P>
+ *
  * <HR>
- * <P>
+ *
  * <HR>
  * <H3>Pre-defined Doc Flavors</H3>
  * A Java Print Service instance is not <B><I>required</I></B> to support the
@@ -354,7 +351,7 @@
  * <CODE>("text/plain; charset=us-ascii", "java.io.InputStream")</CODE>
  * <BR>&#183;&nbsp;&nbsp;
  * <CODE>("text/plain; charset=utf-8", "java.io.InputStream")</CODE>
- * <P>
+ *
  * <LI>
  * Renderable image objects. Specifically, the following doc flavor is
  * recommended to be supported:
@@ -389,7 +386,7 @@
  * <P>
  * The client must itself perform all plain text print data formatting not
  * addressed by the above requirements.
- * <P>
+ *
  * <H3>Design Rationale</H3>
  * <P>
  * Class DocFlavor in package javax.print.data is similar to class
@@ -403,13 +400,13 @@
  * <LI>
  * The JPS API is designed to be used in Java profiles which do not support
  * AWT.
- * <P>
+ *
  * <LI>
  * The implementation of class <code>java.awt.datatransfer.DataFlavor</code>
  * does not guarantee that equivalent data flavors will have the same
  * serialized representation. DocFlavor does, and can be used in services
  * which need this.
- * <P>
+ *
  * <LI>
  * The implementation of class <code>java.awt.datatransfer.DataFlavor</code>
  * includes a human presentable name as part of the serialized representation.
--- a/jdk/src/share/classes/javax/print/MultiDoc.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/MultiDoc.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -67,7 +67,7 @@
  * data from the print data representation object. Get the next multidoc from
  * the current multidoc, and repeat until there are no more. (The code example
  * above uses the interleaved pattern.)
- * <P>
+ *
  * <LI>
  * The <B>all-at-once</B> pattern: Get the doc from the current multidoc, and
  * save the doc in a list. Get the next multidoc from the current multidoc, and
--- a/jdk/src/share/classes/javax/print/MultiDocPrintJob.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/MultiDocPrintJob.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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 @@
  * Obtained from a MultiDocPrintService, a MultiDocPrintJob can print a
  * specified collection of documents as a single print job with a set of
  * job attributes.
- * <P>
  */
 
 public interface MultiDocPrintJob extends DocPrintJob {
--- a/jdk/src/share/classes/javax/print/ServiceUI.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/ServiceUI.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,6 @@
  *for a user as well as allowing the user to select the print service to use
  *and specify choices such as paper size and number of copies.
  * <p>
- * <p>
  * The dialogs are designed to work with pluggable print services though the
  * public APIs of those print services.
  * <p>
--- a/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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 @@
  * <p>
  * This class is implemented by a service and located by the
  * implementation 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>.
  * <p>
  * Applications locate instances of this class by calling the
--- a/jdk/src/share/classes/javax/print/attribute/AttributeSet.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/AttributeSet.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -69,17 +69,17 @@
  * A {@link DocAttributeSet DocAttributeSet}, containing {@link DocAttribute
  * DocAttribute}s, specifies the characteristics of an individual doc and the
  * print job settings to be applied to an individual doc.
- * <P>
+ *
  * <LI>
  * A {@link PrintRequestAttributeSet PrintRequestAttributeSet}, containing
  * {@link PrintRequestAttribute PrintRequestAttribute}s, specifies the
  * settings
  * to be applied to a whole print job and to all the docs in the print job.
- * <P>
+ *
  * <LI>
  * A {@link PrintJobAttributeSet PrintJobAttributeSet}, containing {@link
  * PrintJobAttribute PrintJobAttribute}s, reports the status of a print job.
- * <P>
+ *
  * <LI>
  * A {@link PrintServiceAttributeSet PrintServiceAttributeSet}, containing
  * {@link PrintServiceAttribute PrintServiceAttribute}s, reports the status of
@@ -103,7 +103,6 @@
  * HashPrintRequestAttributeSet}, {@link HashPrintJobAttributeSet
  * HashPrintJobAttributeSet}, and {@link HashPrintServiceAttributeSet
  * HashPrintServiceAttributeSet}.
- * <P>
  *
  * @author  Alan Kaminsky
  */
--- a/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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 +41,7 @@
  * The table below shows the effects of specifying a Chromaticity attribute of
  * {@link #MONOCHROME MONOCHROME} or {@link #COLOR COLOR}
  * for a monochrome or color document.
- * <P>
+ *
  * <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=1 SUMMARY="Shows effects of specifying MONOCHROME or COLOR Chromaticity attributes">
  * <TR>
  * <TH>
@@ -79,9 +78,7 @@
  * </TR>
  * </TABLE>
  * <P>
- * <P>
  * <B>IPP Compatibility:</B> Chromaticity is not an IPP attribute at present.
- * <P>
  *
  * @author  Alan Kaminsky
  */
--- a/jdk/src/share/classes/javax/print/attribute/standard/Copies.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Copies.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,17 +44,17 @@
  * <LI>
  * SINGLE_DOCUMENT -- The result will be <I>n</I> copies of a single output
  * document comprising all the input docs.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- The result will be <I>n</I> copies of a single
  * output document comprising all the input docs, and the first impression of
  * each input doc will always start on a new media sheet.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The result will be <I>n</I> copies of
  * the first input document, followed by <I>n</I> copies of the second input
  * document, . . . followed by <I>n</I> copies of the last input document.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The result will be the first input
  * document, the second input document, . . . the last input document, the group
@@ -64,7 +64,6 @@
  * <B>IPP Compatibility:</B> The integer value gives the IPP integer value. The
  * category name returned by <CODE>getName()</CODE> gives the IPP attribute
  * name.
- * <P>
  *
  * @author  David Mendenhall
  * @author  Alan Kamihensky
--- a/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,6 @@
  * returns the IPP string representation of the attribute value.
  * See <a href="http://www.ietf.org/rfc/rfc2911.txt">RFC 2911</a> Section 15.1 for
  * a fuller description of the IPP fidelity attribute.
- * <P>
  *
  */
 public final class Fidelity extends EnumSyntax
--- a/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -178,21 +178,21 @@
  * <LI>
  * SINGLE_DOCUMENT -- All the input docs will be bound together as one output
  * document with the specified binding.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be bound together as one
  * output document with the specified binding, and the first impression of each
  * input doc will always start on a new media sheet.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each input doc will be bound
  * separately with the specified binding.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input doc will be bound separately
  * with the specified binding.
  * </UL>
- * <P>
+ *
  * <LI>
  * If different docs have different bindings specified, then only two values of
  * {@link MultipleDocumentHandling MultipleDocumentHandling} make sense, and the
@@ -202,7 +202,7 @@
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each input doc will be bound
  * separately with its own specified binding.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input doc will be bound separately
  * with its own specified binding.
--- a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java	Fri Jan 10 09:24:47 2014 -0800
@@ -65,7 +65,7 @@
  * The size of a doc is computed based on the print data representation class as
  * specified by the doc's {@link javax.print.DocFlavor DocFlavor}, as
  * shown in the table below.
- * <P>
+ *
  * <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=1 SUMMARY="Table showing computation of doc sizes">
  * <TR>
  * <TH>Representation Class</TH>
--- a/jdk/src/share/classes/javax/print/attribute/standard/JobState.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/JobState.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -76,12 +76,12 @@
      * <LI>
      * The job is using, or is attempting to use, one or more purely software
      * processes that are analyzing, creating, or interpreting a PDL, etc.
-     * <P>
+     *
      * <LI>
      * The job is using, or is attempting to use, one or more hardware
      * devices that are interpreting a PDL, making marks on a medium, and/or
      * performing finishing, such as stapling, etc.
-     * <P>
+     *
      * <LI>
      * The printer has made the job ready for printing, but the output
      * device is not yet printing it, either because the job hasn't reached the
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,7 +40,6 @@
  * <P>
  * <B>IPP Compatibility:</B> MediaName is a representation class for
  * values of the IPP "media" attribute which names media.
- * <P>
  *
  */
 public class MediaName extends Media implements Attribute {
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -288,7 +288,6 @@
     /**
      * Class MediaSize.ISO includes {@link MediaSize MediaSize} values for ISO
      * media.
-     * <P>
      */
     public final static class ISO {
         /**
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -41,7 +41,6 @@
  * values of the IPP "media" attribute which names media sizes.
  * The names of the media sizes correspond to those in the IPP 1.1 RFC
  * <a HREF="http://www.ietf.org/rfc/rfc2911.txt">RFC 2911</a>
- * <P>
  *
  */
 public class MediaSizeName extends Media {
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,8 +42,6 @@
  * <P>
  * <B>IPP Compatibility:</B> MediaTray is a representation class for
  * values of the IPP "media" attribute which name paper trays.
- * <P>
- *
  */
 public class MediaTray extends Media implements Attribute {
 
--- a/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -51,7 +51,7 @@
  * single output document to produce. The MultipleDocumentHandling values
  * SINGLE_DOCUMENT and SINGLE_DOCUMENT_NEW_SHEET specify two variations of
  * this  possibility.
- * <P>
+ *
  * <LI>
  * The multiple input documents remain separate output documents. Finishing
  * operations ({@link Finishings Finishings}),
@@ -83,7 +83,7 @@
  * sheets resulting from processing the document data must be
  * <CODE>a(*),b(*),a(*),b(*),...</CODE>, and the printer object must force
  * each copy (<CODE>a(*),b(*)</CODE>) to start on a new media sheet.
- * <P>
+ *
  * <LI>
  * <A NAME="sducfi">{@link #SEPARATE_DOCUMENTS_UNCOLLATED_COPIES
  * <B>SEPARATE_DOCUMENTS_UNCOLLATED_COPIES</B>}</A>. If a print job
@@ -96,7 +96,7 @@
  * If more than one copy is made, the ordering of the sets of media sheets
  * resulting from processing the document data must be
  * <CODE>a(*),a(*),...,b(*),b(*)...</CODE>.
- * <P>
+ *
  * <LI>
  * <A NAME="sdccfi">{@link #SEPARATE_DOCUMENTS_COLLATED_COPIES
  * <B>SEPARATE_DOCUMENTS_COLLATED_COPIES</B>}</A>. If a print job
@@ -109,7 +109,7 @@
  * If more than one copy is made, the ordering of the sets of media sheets
  * resulting from processing the document data must be
  * <CODE>a(*),b(*),a(*),b(*),...</CODE>.
- * <P>
+ *
  * <LI>
  * <A NAME="sdnsfi">{@link #SINGLE_DOCUMENT_NEW_SHEET
  * <B>SINGLE_DOCUMENT_NEW_SHEET</B>}</A>. Same as SINGLE_DOCUMENT,
@@ -132,12 +132,12 @@
  * <LI>
  * With SINGLE_DOCUMENT, documents <CODE>a</CODE> and <CODE>b</CODE> are
  * stapled together as a single document with no regard to new sheets.
- * <P>
+ *
  * <LI>
  * With SINGLE_DOCUMENT_NEW_SHEET, documents <CODE>a</CODE> and <CODE>b</CODE>
  * are stapled together as a single document, but document <CODE>b</CODE>
  * starts on a new sheet.
- * <P>
+ *
  * <LI>
  * With SEPARATE_DOCUMENTS_UNCOLLATED_COPIES and
  * SEPARATE_DOCUMENTS_COLLATED_COPIES, documents <CODE>a</CODE> and
--- a/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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 @@
  * SINGLE_DOCUMENT -- All the input docs will be combined together into one
  * output document. Each media impression will consist of <I>n</I>m
  *  print-stream pages from the output document.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together
  * into one output document. Each media impression will consist of <I>n</I>
@@ -64,7 +64,7 @@
  * each input doc will always start on a new media sheet; this means the last
  * impression of an input doc may have fewer than <I>n</I> print-stream pages
  *  on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate.
  * Each media impression will consist of <I>n</I> print-stream pages from the
@@ -72,7 +72,7 @@
  * input doc will always start on a new media sheet; this means the last
  * impression of an input doc may have fewer than <I>n</I> print-stream pages on
  * it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate.
  * Each media impression will consist of <I>n</I> print-stream pages from the
@@ -91,7 +91,7 @@
  * the first print-stream page of the next input doc goes at the start of the
  * next media impression, possibly leaving fewer than the full number of
  * print-stream pages on the previous media impression.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together
  * into one output document. Each media impression will consist of <I>n</I>
@@ -99,7 +99,7 @@
  * each input doc will always start on a new media sheet; this means the last
  * impression of an input doc may have fewer than <I>n</I> print-stream pages
  * on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate.
  * For input doc <I>i,</I> each media impression will consist of
@@ -107,7 +107,7 @@
  * docs are separate, the first impression of each input doc will always start
  * on a new media sheet; this means the last impression of an input doc may have
  * fewer than <I>n<SUB>i</SUB></I> print-stream pages on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate.
  * For input doc <I>i,</I> each media impression will consist of
@@ -120,7 +120,6 @@
  * <B>IPP Compatibility:</B> The integer value gives the IPP integer value.
  * The category name returned by <CODE>getName()</CODE> gives the IPP
  * attribute name.
- * <P>
  *
  * @author  Alan Kaminsky
  */
--- a/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,17 +68,17 @@
  * SINGLE_DOCUMENT -- All the input docs will be combined together into one
  * output document. The specified page ranges of that output document will be
  * printed.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together
  * into one output document, and the first impression of each input doc will
  * always start on a new media sheet. The specified page ranges of that output
  * document will be printed.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- For each separate input doc, the
  * specified page ranges will be printed.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- For each separate input doc, the
  * specified page ranges will be printed.
@@ -87,7 +87,7 @@
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- For each separate input doc, its own
  * specified page ranges will be printed..
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- For each separate input doc, its own
  * specified page ranges will be printed..
@@ -100,7 +100,6 @@
  * javax.print.attribute.SetOfIntegerSyntax SetOfIntegerSyntax} for an
  * explanation of canonical array form. The category name returned by
  * <CODE>getName()</CODE> gives the IPP attribute name.
- * <P>
  *
  * @author  David Mendenhall
  * @author  Alan Kaminsky
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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,6 @@
  * to find out more information about this specific printer rather than this
  * general kind of printer.
  * <P>
- * <P>
  * <B>IPP Compatibility:</B> The string form returned by
  * <CODE>toString()</CODE> gives the IPP uri value.
  * The category name returned by <CODE>getName()</CODE>
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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 @@
  * an instance of class PrinterResolution indicating the exact resolution the
  * client wants. Only printers supporting that exact resolution will match the
  * search.
- * <P>
+ *
  * <LI>
  * When a client needs to print a job using the client's desired resolution
  * exactly (no more, no less), the client specifies an instance of class
@@ -60,7 +60,6 @@
  * In some cases this may be more simply achieved by specifying a
  * PrintQuality attribute which often controls resolution.
  * <P>
- * <P>
  * <B>IPP Compatibility:</B> The information needed to construct an IPP
  * <CODE>"printer-resolution"</CODE> attribute can be obtained by calling
  * methods on the PrinterResolution object. The category name returned by
--- a/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -77,7 +77,7 @@
  * combined into one output document. Multiple copies of the output document
  * will be produced with pages in collated order, i.e. pages 1, 2, 3, . . .,
  * 1, 2, 3, . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = COLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SINGLE_DOCUMENT_NEW_SHEET -- All the input docs
@@ -85,7 +85,7 @@
  * input doc will always start on a new media sheet. Multiple copies of the
  * output document will be produced with pages in collated order, i.e. pages
  * 1, 2, 3, . . ., 1, 2, 3, . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = COLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each
@@ -94,7 +94,7 @@
  * pages in collated order, but the documents themselves in uncollated order,
  * i.e. pages A1, A2, A3, . . ., A1, A2, A3, . . ., B1, B2, B3, . . ., B1, B2,
  * B3, . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = COLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input
@@ -103,14 +103,14 @@
  * in collated order, with the documents themselves also in collated order, i.e.
  * pages A1, A2, A3, . . ., B1, B2, B3, . . ., A1, A2, A3, . . ., B1, B2, B3,
  * . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SINGLE_DOCUMENT -- All the input docs will be
  * combined into one output document. Multiple copies of the output document
  * will be produced with pages in uncollated order, i.e. pages 1, 1, . . .,
  * 2, 2, . . ., 3, 3, . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SINGLE_DOCUMENT_NEW_SHEET -- All the input docs
@@ -118,7 +118,7 @@
  * input doc will always start on a new media sheet. Multiple copies of the
  * output document will be produced with pages in uncollated order, i.e. pages
  * 1, 1, . . ., 2, 2, . . ., 3, 3, . . .
- * <P>
+ *
  * <LI>
  * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling
  * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each
@@ -128,7 +128,7 @@
  * order, i.e. pages A1, A1, . . ., A2, A2, . . ., A3, A3, . . ., B1, B1, . . .,
  * B2, B2, . . ., B3, B3, . . .
  * </UL>
- * <P>
+ *
  * <LI>
  * If different docs have different sheet collations specified, then only one
  * value of {@link MultipleDocumentHandling MultipleDocumentHandling} is
--- a/jdk/src/share/classes/javax/print/attribute/standard/Sides.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Sides.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -51,21 +51,21 @@
  * SINGLE_DOCUMENT -- All the input docs will be combined together into one
  * output document. Each media sheet will consist of <I>n</I> impressions from
  * the output document.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together
  * into one output document. Each media sheet will consist of <I>n</I>
  * impressions from the output document. However, the first impression of each
  * input doc will always start on a new media sheet; this means the last media
  * sheet of an input doc may have only one impression on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate.
  * Each media sheet will consist of <I>n</I> impressions from the input doc.
  * Since the input docs are separate, the first impression of each input doc
  * will always start on a new media sheet; this means the last media sheet of
  * an input doc may have only one impression on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate.
  * Each media sheet will consist of <I>n</I> impressions from the input doc.
@@ -73,7 +73,7 @@
  * will always start on a new media sheet; this means the last media sheet of
  * an input doc may have only one impression on it.
  * </UL>
- * <P>
+ *
  * <UL>
  * <LI>
  * SINGLE_DOCUMENT -- All the input docs will be combined together into one
@@ -83,14 +83,14 @@
  * input doc has a different sides value from the previous input doc, the first
  * print-stream page of the next input doc goes at the start of the next media
  * sheet, possibly leaving only one impression on the previous media sheet.
- * <P>
+ *
  * <LI>
  * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together
  * into one output document. Each media sheet will consist of <I>n</I>
  * impressions from the output document. However, the first impression of each
  * input doc will always start on a new media sheet; this means the last
  * impression of an input doc may have only one impression on it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate.
  * For input doc <I>i,</I> each media sheet will consist of <I>n<SUB>i</SUB></I>
@@ -98,7 +98,7 @@
  * impression of each input doc will always start on a new media sheet; this
  * means the last media sheet of an input doc may have only one impression on
  * it.
- * <P>
+ *
  * <LI>
  * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate.
  * For input doc <I>i,</I> each media sheet will consist of <I>n<SUB>i</SUB></I>
@@ -113,7 +113,6 @@
  * <CODE>getName()</CODE> is the IPP attribute name.  The enumeration's
  * integer value is the IPP enum value.  The <code>toString()</code> method
  * returns the IPP string representation of the attribute value.
- * <P>
  *
  * @author  Alan Kaminsky
  */
--- a/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -193,7 +193,6 @@
      * @see #read(byte[], int, int)
      * @see #read(byte[])
      * @see #available
-     * <p>
      */
     public int read() throws IOException {
         if( frameSize != 1 ) {
--- a/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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,7 +40,7 @@
  * The following table lists the possible <code>AudioPermission</code> target names.
  * For each name, the table provides a description of exactly what that permission
  * allows, as well as a discussion of the risks of granting code the permission.
- * <p>
+ *
  *
  * <table border=1 cellpadding=5 summary="permission target name, what the permission allows, and associated risks">
  * <tr>
--- a/jdk/src/share/classes/javax/sound/sampled/ReverbType.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/sound/sampled/ReverbType.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -77,7 +77,7 @@
  * <p>
  *
  * <b>Reverberation Types and Parameters</b>
- * <p>
+ *
  * <table border=1 cellpadding=5 summary="reverb types and params: decay time, late intensity, late delay, early intensity, and early delay">
  *
  * <tr>
--- a/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java	Fri Jan 10 09:24:47 2014 -0800
@@ -115,7 +115,7 @@
     /**
      * Returns the index-position of the specified object in the list.
      *
-     * @param anObject
+     * @param anObject the object to return the index of
      * @return an int representing the index position, where 0 is
      *         the first position
      */
--- a/jdk/src/share/classes/javax/swing/JComboBox.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JComboBox.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -675,7 +675,7 @@
      * the model and its preferred size obtained, which can be
      * relatively expensive.
      *
-     * @param prototypeDisplayValue
+     * @param prototypeDisplayValue the prototype display value
      * @see #getPrototypeDisplayValue
      * @since 1.4
      * @beaninfo
--- a/jdk/src/share/classes/javax/swing/JEditorPane.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JEditorPane.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -160,9 +160,9 @@
  * the character set specified in the <code>ChangedCharSetException</code>
  * (which is an <code>IOException</code>).
  * </ol>
- * <p>
+ *
  * <dl>
- * <dt><b><font size=+1>Newlines</font></b>
+ * <dt><b>Newlines</b>
  * <dd>
  * For a discussion on how newlines are handled, see
  * <a href="text/DefaultEditorKit.html">DefaultEditorKit</a>.
--- a/jdk/src/share/classes/javax/swing/JLabel.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JLabel.java	Fri Jan 10 09:24:47 2014 -0800
@@ -855,7 +855,6 @@
      *           <code>RIGHT</code>,
      *           <code>LEADING</code>, or
      *           <code>TRAILING</code> (the default).
-     * @exception IllegalArgumentException
      *
      * @see SwingConstants
      * @beaninfo
--- a/jdk/src/share/classes/javax/swing/JLayeredPane.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JLayeredPane.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -58,20 +58,20 @@
  * layers makes it easy to ensure that components overlap properly,
  * without having to worry about specifying numbers for specific depths:
  * <DL>
- *    <DT><FONT SIZE="2">DEFAULT_LAYER</FONT></DT>
+ *    <DT>DEFAULT_LAYER</DT>
  *         <DD>The standard layer, where most components go. This the bottommost
  *         layer.
- *    <DT><FONT SIZE="2">PALETTE_LAYER</FONT></DT>
+ *    <DT>PALETTE_LAYER</DT>
  *         <DD>The palette layer sits over the default layer. Useful for floating
  *         toolbars and palettes, so they can be positioned above other components.
- *    <DT><FONT SIZE="2">MODAL_LAYER</FONT></DT>
+ *    <DT>MODAL_LAYER</DT>
  *         <DD>The layer used for modal dialogs. They will appear on top of any
  *         toolbars, palettes, or standard components in the container.
- *    <DT><FONT SIZE="2">POPUP_LAYER</FONT></DT>
+ *    <DT>POPUP_LAYER</DT>
  *         <DD>The popup layer displays above dialogs. That way, the popup windows
  *         associated with combo boxes, tooltips, and other help text will appear
  *         above the component, palette, or dialog that generated them.
- *    <DT><FONT SIZE="2">DRAG_LAYER</FONT></DT>
+ *    <DT>DRAG_LAYER</DT>
  *         <DD>When dragging a component, reassigning it to the drag layer ensures
  *         that it is positioned over every other component in the container. When
  *         finished dragging, it can be reassigned to its normal layer.
--- a/jdk/src/share/classes/javax/swing/JOptionPane.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JOptionPane.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -131,7 +131,7 @@
  * <b>Parameters:</b><br>
  * The parameters to these methods follow consistent patterns:
  * <blockquote>
- * <dl compact>
+ * <dl>
  * <dt>parentComponent<dd>
  * Defines the <code>Component</code> that is to be the parent of this
  * dialog box.
@@ -149,7 +149,7 @@
  * <code>String</code> constant.
  * However, the type of this parameter is actually <code>Object</code>. Its
  * interpretation depends on its type:
- * <dl compact>
+ * <dl>
  * <dt>Object[]<dd>An array of objects is interpreted as a series of
  *                 messages (one per object) arranged in a vertical stack.
  *                 The interpretation is recursive -- each object in the
@@ -187,7 +187,7 @@
  * <code>String</code>s. But
  * the parameter type is an array of <code>Objects</code>.
  * A button is created for each object depending on its type:
- * <dl compact>
+ * <dl>
  * <dt>Component<dd>The component is added to the button row directly.
  * <dt>Icon<dd>A <code>JButton</code> is created with this as its label.
  * <dt>other<dd>The <code>Object</code> is converted to a string using its
--- a/jdk/src/share/classes/javax/swing/JTextArea.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JTextArea.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -95,7 +95,7 @@
  * </pre>
  *
  * <dl>
- * <dt><b><font size=+1>Newlines</font></b>
+ * <dt><b>Newlines</b>
  * <dd>
  * For a discussion on how newlines are handled, see
  * <a href="text/DefaultEditorKit.html">DefaultEditorKit</a>.
--- a/jdk/src/share/classes/javax/swing/JTextPane.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/JTextPane.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -51,7 +51,7 @@
  * be embedded in the flow of text.
  *
  * <dl>
- * <dt><b><font size=+1>Newlines</font></b>
+ * <dt><b>Newlines</b>
  * <dd>
  * For a discussion on how newlines are handled, see
  * <a href="text/DefaultEditorKit.html">DefaultEditorKit</a>.
--- a/jdk/src/share/classes/javax/swing/plaf/TextUI.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/plaf/TextUI.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -105,7 +105,7 @@
      * @param biasRet an array to contain the bias for the returned position
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException
+     * @exception BadLocationException for a bad location within a document model
      * @exception IllegalArgumentException for an invalid direction
      */
     public abstract int getNextVisualPositionFrom(JTextComponent t,
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -1199,7 +1199,7 @@
      * can be traversed to determine how the model is being
      * represented spatially.
      * <p>
-     * <font color=red><b>NOTE:</b>The View hierarchy can
+     * <font style="color: red;"><b>NOTE:</b>The View hierarchy can
      * be traversed from the root view, and other things
      * can be done as well.  Things done in this way cannot
      * be protected like simple method calls through the TextUI.
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java	Fri Jan 10 09:24:47 2014 -0800
@@ -356,12 +356,12 @@
      * end points are equal. In such a case, the end y point is slightly
      * increased to avoid the overlap.
      *
-     * @param x1
-     * @param y1
-     * @param x2
-     * @param y2
-     * @param midpoints
-     * @param colors
+     * @param x1 x1
+     * @param y1 y1
+     * @param x2 x2
+     * @param y2 y2
+     * @param midpoints the midpoints
+     * @param colors the colors
      * @return a valid LinearGradientPaint. This method never returns null.
      * @throws NullPointerException
      *      if {@code midpoints} array is null,
@@ -387,11 +387,11 @@
      * is non-positive. In such a case, the radius is just slightly
      * increased to avoid 0.
      *
-     * @param x
-     * @param y
-     * @param r
-     * @param midpoints
-     * @param colors
+     * @param x x-coordinate
+     * @param y y-coordinate
+     * @param r radius
+     * @param midpoints the midpoints
+     * @param colors the colors
      * @return a valid RadialGradientPaint. This method never returns null.
      * @throws NullPointerException
      *      if {@code midpoints} array is null,
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, 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
@@ -645,7 +645,7 @@
      * passed to the NimbusStyle constructor. In either case, it looks for
      * "background".</p>
      *
-     * @param ctx
+     * @param ctx SynthContext identifying requester
      * @param key must not be null
      */
     @Override public Object get(SynthContext ctx, Object key) {
--- a/jdk/src/share/classes/javax/swing/text/CompositeView.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/CompositeView.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -713,7 +713,7 @@
      * @param biasRet an array containing the bias that was checked
      * @return the location within the model that best represents the next
      *  north or south location
-     * @exception BadLocationException
+     * @exception BadLocationException for a bad location within a document model
      * @exception IllegalArgumentException if <code>direction</code> is invalid
      * @see #getNextVisualPositionFrom
      *
@@ -745,7 +745,7 @@
      * @param biasRet an array containing the bias that was checked
      * @return the location within the model that best represents the next
      *  west or east location
-     * @exception BadLocationException
+     * @exception BadLocationException for a bad location within a document model
      * @exception IllegalArgumentException if <code>direction</code> is invalid
      * @see #getNextVisualPositionFrom
      */
--- a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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 @@
  * provides a minimal set of actions for a simple editor.
  *
  * <dl>
- * <dt><b><font size=+1>Newlines</font></b>
+ * <dt><b>Newlines</b>
  * <dd>
  * There are two properties which deal with newlines.  The
  * system property, <code>line.separator</code>, is defined to be
--- a/jdk/src/share/classes/javax/swing/text/Document.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/Document.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -33,7 +33,7 @@
  * interface is to scale from very simple needs (a plain text textfield)
  * to complex needs (an HTML or XML document, for example).
  *
- * <p><b><font size=+1>Content</font></b>
+ * <p><b>Content</b>
  * <p>
  * At the simplest level, text can be
  * modeled as a linear sequence of characters. To support
@@ -62,7 +62,7 @@
  * <li>{@link #getText(int, int)}
  * <li>{@link #getText(int, int, javax.swing.text.Segment)}
  * </ul>
- * <p><b><font size=+1>Structure</font></b>
+ * <p><b>Structure</b>
  * <p>
  * Text is rarely represented simply as featureless content. Rather,
  * text typically has some sort of structure associated with it.
@@ -83,7 +83,7 @@
  * <li>{@link #getRootElements()}
  * </ul>
  *
- * <p><b><font size=+1>Mutations</font></b>
+ * <p><b>Mutations</b>
  * <p>
  * All documents need to be able to add and remove simple text.
  * Typically, text is inserted and removed via gestures from
@@ -98,7 +98,7 @@
  * <li>{@link #createPosition(int)}
  * </ul>
  *
- * <p><b><font size=+1>Notification</font></b>
+ * <p><b>Notification</b>
  * <p>
  * Mutations to the <code>Document</code> must be communicated to
  * interested observers.  The notification of change follows the event model
@@ -152,7 +152,7 @@
  * <li><a href="#removeUndoableEditListener(javax.swing.event.UndoableEditListener)">removeUndoableEditListener(UndoableEditListener)</a>
  * </ul>
  *
- * <p><b><font size=+1>Properties</font></b>
+ * <p><b>Properties</b>
  * <p>
  * Document implementations will generally have some set of properties
  * associated with them at runtime.  Two well known properties are the
--- a/jdk/src/share/classes/javax/swing/text/GlyphView.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1250,7 +1250,7 @@
          *                 is returned as the zero-th element of this array
          * @return the location within the model that best represents the next
          *  location visual position.
-         * @exception BadLocationException
+         * @exception BadLocationException for a bad location within a document model
          * @exception IllegalArgumentException for an invalid direction
          */
         public int getNextVisualPositionFrom(GlyphView v, int pos, Position.Bias b, Shape a,
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -88,7 +88,7 @@
  * a section in <em>The Java Tutorial.</em>
  *
  * <dl>
- * <dt><b><font size=+1>Caret Changes</font></b>
+ * <dt><b>Caret Changes</b>
  * <dd>
  * The caret is a pluggable object in swing text components.
  * Notification of changes to the caret position and the selection
@@ -107,7 +107,7 @@
  * <b>Note</b>: Non-editable text components also have a caret though
  * it may not be painted.
  *
- * <dt><b><font size=+1>Commands</font></b>
+ * <dt><b>Commands</b>
  * <dd>
  * Text components provide a number of commands that can be used
  * to manipulate the component.  This is essentially the way that
@@ -118,7 +118,7 @@
  * found with the {@link #getActions} method.  These actions
  * can be bound to key events, fired from buttons, etc.
  *
- * <dt><b><font size=+1>Text Input</font></b>
+ * <dt><b>Text Input</b>
  * <dd>
  * The text components support flexible and internationalized text input, using
  * keymaps and the input method framework, while maintaining compatibility with
@@ -203,7 +203,7 @@
  * <li>caret movement forward and backward
  * </ul>
  *
- * <dt><b><font size=+1>Model/View Split</font></b>
+ * <dt><b>Model/View Split</b>
  * <dd>
  * The text components have a model-view split.  A text component pulls
  * together the objects used to represent the model, view, and controller.
@@ -227,13 +227,13 @@
  * {@link DocumentListener}
  * interface and registered interest with the model being observed.
  *
- * <dt><b><font size=+1>Location Information</font></b>
+ * <dt><b>Location Information</b>
  * <dd>
  * The capability of determining the location of text in
  * the view is provided.  There are two methods, {@link #modelToView}
  * and {@link #viewToModel} for determining this information.
  *
- * <dt><b><font size=+1>Undo/Redo support</font></b>
+ * <dt><b>Undo/Redo support</b>
  * <dd>
  * Support for an edit history mechanism is provided to allow
  * undo/redo operations.  The text component does not itself
@@ -243,7 +243,7 @@
  * The support is provided by the Document model, which allows
  * one to attach UndoableEditListener implementations.
  *
- * <dt><b><font size=+1>Thread Safety</font></b>
+ * <dt><b>Thread Safety</b>
  * <dd>
  * The swing text components provide some support of thread
  * safe operations.  Because of the high level of configurability
@@ -254,13 +254,13 @@
  * The methods that are safe to call asynchronously are marked
  * with comments.
  *
- * <dt><b><font size=+1>Newlines</font></b>
+ * <dt><b>Newlines</b>
  * <dd>
  * For a discussion on how newlines are handled, see
  * <a href="DefaultEditorKit.html">DefaultEditorKit</a>.
  *
  *
- * <dt><b><font size=+1>Printing support</font></b>
+ * <dt><b>Printing support</b>
  * <dd>
  * Several {@link #print print} methods are provided for basic
  * document printing.  If more advanced printing is needed, use the
--- a/jdk/src/share/classes/javax/swing/text/NavigationFilter.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/NavigationFilter.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -100,7 +100,7 @@
      * @param biasRet Used to return resulting Bias of next position
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException
+     * @exception BadLocationException for a bad location within a document model
      * @exception IllegalArgumentException if <code>direction</code>
      *          doesn't have one of the legal values above
      */
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -183,7 +183,7 @@
  * <p>The following table shows the example document and the results
  * of various methods described above.</p>
  *
- * <table border=1 cellspacing=0>
+ * <table border=1 cellspacing=0 summary="HTML Content of example above">
  *   <tr>
  *     <th>Example</th>
  *     <th><code>insertAfterStart</code></th>
@@ -994,16 +994,16 @@
      *
      * <p>Invoking <code>setInnerHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <font
-     * color="red">in red</font>).</p>
+     * style="color: red;">in red</font>).</p>
      *
      * <pre>
      *     &lt;body&gt;
      *       |
      *     <b>&lt;div&gt;</b>
      *         \
-     *         <font color="red">&lt;ul&gt;</font>
+     *         <font style="color: red;">&lt;ul&gt;</font>
      *           \
-     *           <font color="red">&lt;li&gt;</font>
+     *           <font style="color: red;">&lt;li&gt;</font>
      * </pre>
      *
      * <p>Parameter <code>elem</code> must not be a leaf element,
@@ -1075,14 +1075,14 @@
      *
      * <p>Invoking <code>setOuterHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <font
-     * color="red">in red</font>).</p>
+     * style="color: red;">in red</font>).</p>
      *
      * <pre>
      *    &lt;body&gt;
      *      |
-     *     <font color="red">&lt;ul&gt;</font>
+     *     <font style="color: red;">&lt;ul&gt;</font>
      *       \
-     *       <font color="red">&lt;li&gt;</font>
+     *       <font style="color: red;">&lt;li&gt;</font>
      * </pre>
      *
      * <p>If either <code>elem</code> or <code>htmlText</code>
@@ -1145,16 +1145,16 @@
      *
      * <p>Invoking <code>insertAfterStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <font color="red">in red</font>).</p>
+     * (new elements are <font style="color: red;">in red</font>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *    <font color="red">&lt;ul&gt;</font> &lt;p&gt; &lt;p&gt;
+     *    <font style="color: red;">&lt;ul&gt;</font> &lt;p&gt; &lt;p&gt;
      *     /
-     *  <font color="red">&lt;li&gt;</font>
+     *  <font style="color: red;">&lt;li&gt;</font>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeStart</code> method, new
@@ -1215,16 +1215,16 @@
      *
      * <p>Invoking <code>insertBeforeEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <font
-     * color="red">in red</font>).</p>
+     * style="color: red;">in red</font>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *     &lt;p&gt; &lt;p&gt; <font color="red">&lt;ul&gt;</font>
+     *     &lt;p&gt; &lt;p&gt; <font style="color: red;">&lt;ul&gt;</font>
      *               \
-     *               <font color="red">&lt;li&gt;</font>
+     *               <font style="color: red;">&lt;li&gt;</font>
      * </pre>
      *
      * <p>Unlike the <code>insertAfterEnd</code> method, new elements
@@ -1282,14 +1282,14 @@
      *
      * <p>Invoking <code>insertBeforeStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <font color="red">in red</font>).</p>
+     * (new elements are <font style="color: red;">in red</font>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <font color="red">&lt;ul&gt;</font> <b>&lt;div&gt;</b>
+     *      <font style="color: red;">&lt;ul&gt;</font> <b>&lt;div&gt;</b>
      *       /    /  \
-     *     <font color="red">&lt;li&gt;</font> &lt;p&gt;  &lt;p&gt;
+     *     <font style="color: red;">&lt;li&gt;</font> &lt;p&gt;  &lt;p&gt;
      * </pre>
      *
      * <p>Unlike the <code>insertAfterStart</code> method, new
@@ -1340,14 +1340,14 @@
      *
      * <p>Invoking <code>insertAfterEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <font
-     * color="red">in red</font>).</p>
+     * style="color: red;">in red</font>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <b>&lt;div&gt;</b> <font color="red">&lt;ul&gt;</font>
+     *      <b>&lt;div&gt;</b> <font style="color: red;">&lt;ul&gt;</font>
      *       / \    \
-     *     &lt;p&gt; &lt;p&gt;  <font color="red">&lt;li&gt;</font>
+     *     &lt;p&gt; &lt;p&gt;  <font style="color: red;">&lt;li&gt;</font>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeEnd</code> method, new elements
--- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java	Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java	Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -117,10 +117,10 @@
  * support are pseudo selectors, such as <code>A:link { color: red }</code>,
  * and the <code>important</code> modifier.
  * <p>
- * <font color="red">Note: This implementation is currently
+ * @implNote This implementation is currently
  * incomplete.  It can be replaced with alternative implementations
  * that are complete.  Future versions of this class will provide
- * better CSS support.</font>
+ * better CSS support.
  *
  * @author  Timothy Prinzing
  * @author  Sunita Mani