--- old/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java	2017-07-16 16:18:28.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java	2017-07-16 16:18:28.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -22,49 +22,49 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package javax.print.attribute.standard;
 
 import java.net.URI;
 
 import javax.print.attribute.Attribute;
-import javax.print.attribute.URISyntax;
 import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.URISyntax;
 
 /**
- * Class PrinterMoreInfoManufacturer is a printing attribute class, a URI,
- * that is used to obtain more information about this type of device.
- * The information obtained from this URI is intended for end user
- * consumption. Features outside the scope of the Print Service API
- * can be accessed from this URI (e.g.,
- * latest firmware, upgrades, service proxies, optional features available,
- * details on color support). The information is intended to be germane to
- * this kind of printer without regard to site specific modifications or
- * services.
- * <P>
- * In contrast, the {@link PrinterMoreInfo PrinterMoreInfo} attribute is used
- * to find out more information about this specific printer rather than this
+ * Class {@code PrinterMoreInfoManufacturer} is a printing attribute class, a
+ * {@code URI}, that is used to obtain more information about this type of
+ * device. The information obtained from this {@code URI} is intended for end
+ * user consumption. Features outside the scope of the Print Service API can be
+ * accessed from this {@code URI} (e.g., latest firmware, upgrades, service
+ * proxies, optional features available, details on color support). The
+ * information is intended to be germane to this kind of printer without regard
+ * to site specific modifications or services.
+ * <p>
+ * In contrast, the {@link PrinterMoreInfo PrinterMoreInfo} attribute is used to
+ * find out more information about this specific printer rather than this
  * general kind of printer.
- * <P>
- * <B>IPP Compatibility:</B> The string form returned by
- * {@code toString()} gives the IPP uri value.
- * The category name returned by {@code getName()}
+ * <p>
+ * <b>IPP Compatibility:</b> The string form returned by {@code toString()}
+ * gives the IPP uri value. The category name returned by {@code getName()}
  * gives the IPP attribute name.
  *
- * @author  Alan Kaminsky
+ * @author Alan Kaminsky
  */
 public final class PrinterMoreInfoManufacturer extends URISyntax
         implements PrintServiceAttribute {
 
+    /**
+     * Use serialVersionUID from JDK 1.4 for interoperability.
+     */
     private static final long serialVersionUID = 3323271346485076608L;
 
     /**
      * Constructs a new printer more info manufacturer attribute with the
-     * specified URI.
+     * specified {@code URI}.
      *
-     * @param  uri  URI.
-     *
-     * @exception  NullPointerException
-     *     (unchecked exception) Thrown if {@code uri} is null.
+     * @param  uri {@code URI}
+     * @throws NullPointerException if {@code uri} is {@code null}
      */
     public PrinterMoreInfoManufacturer(URI uri) {
         super (uri);
@@ -74,21 +74,17 @@
      * Returns whether this printer more info manufacturer attribute is
      * equivalent to the passed in object. To be equivalent, all of the
      * following conditions must be true:
-     * <OL TYPE=1>
-     * <LI>
-     * {@code object} is not null.
-     * <LI>
-     * {@code object} is an instance of class
-     * PrinterMoreInfoManufacturer.
-     * <LI>
-     * This printer more info manufacturer attribute's URI and
-     * {@code object}'s URI are equal.
-     * </OL>
-     *
-     * @param  object  Object to compare to.
-     *
-     * @return  True if {@code object} is equivalent to this printer
-     *          more info manufacturer attribute, false otherwise.
+     * <ol type=1>
+     *   <li>{@code object} is not {@code null}.
+     *   <li>{@code object} is an instance of class
+     *   {@code PrinterMoreInfoManufacturer}.
+     *   <li>This printer more info manufacturer attribute's {@code URI} and
+     *   {@code object}'s {@code URI} are equal.
+     * </ol>
+     *
+     * @param  object {@code Object} to compare to
+     * @return {@code true} if {@code object} is equivalent to this printer more
+     *         info manufacturer attribute, {@code false} otherwise
      */
     public boolean equals(Object object) {
         return (super.equals(object) &&
@@ -98,12 +94,12 @@
     /**
      * Get the printing attribute class which is to be used as the "category"
      * for this printing attribute value.
-     * <P>
-     * For class PrinterMoreInfoManufacturer, the category is
-     * class PrinterMoreInfoManufacturer itself.
+     * <p>
+     * For class {@code PrinterMoreInfoManufacturer}, the category is class
+     * {@code PrinterMoreInfoManufacturer} itself.
      *
-     * @return  Printing attribute class (category), an instance of class
-     *          {@link java.lang.Class java.lang.Class}.
+     * @return printing attribute class (category), an instance of class
+     *         {@link Class java.lang.Class}
      */
     public final Class<? extends Attribute> getCategory() {
         return PrinterMoreInfoManufacturer.class;
@@ -112,14 +108,13 @@
     /**
      * Get the name of the category of which this attribute value is an
      * instance.
-     * <P>
-     * For class PrinterMoreInfoManufacturer, the category name is
+     * <p>
+     * For class {@code PrinterMoreInfoManufacturer}, the category name is
      * {@code "printer-more-info-manufacturer"}.
      *
-     * @return  Attribute category name.
+     * @return attribute category name
      */
     public final String getName() {
         return "printer-more-info-manufacturer";
     }
-
 }