--- a/langtools/test/tools/doclint/AccessTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -ref AccessTest.protected.out AccessTest.java
  * @run main DocLintTester -Xmsgs -ref AccessTest.private.out AccessTest.java

--- a/langtools/test/tools/doclint/AccessTest.package.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessTest.package.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,19 +1,19 @@
-AccessTest.java:21: error: malformed HTML
+AccessTest.java:23: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:26: error: malformed HTML
+AccessTest.java:28: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:31: error: malformed HTML
+AccessTest.java:33: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:44: error: malformed HTML
+AccessTest.java:46: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:49: error: malformed HTML
+AccessTest.java:51: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:54: error: malformed HTML
+AccessTest.java:56: error: malformed HTML
      * package-private a < b
                          ^
 6 errors

--- a/langtools/test/tools/doclint/AccessTest.private.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessTest.private.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,25 +1,25 @@
-AccessTest.java:21: error: malformed HTML
+AccessTest.java:23: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:26: error: malformed HTML
+AccessTest.java:28: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:31: error: malformed HTML
+AccessTest.java:33: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:36: error: malformed HTML
+AccessTest.java:38: error: malformed HTML
      * private a < b
                  ^
-AccessTest.java:44: error: malformed HTML
+AccessTest.java:46: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:49: error: malformed HTML
+AccessTest.java:51: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:54: error: malformed HTML
+AccessTest.java:56: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:59: error: malformed HTML
+AccessTest.java:61: error: malformed HTML
      * private a < b
                  ^
 8 errors

--- a/langtools/test/tools/doclint/AccessTest.protected.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessTest.protected.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,7 +1,7 @@
-AccessTest.java:21: error: malformed HTML
+AccessTest.java:23: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:26: error: malformed HTML
+AccessTest.java:28: error: malformed HTML
      * protected a < b
                    ^
 2 errors

--- a/langtools/test/tools/doclint/AccessTest.public.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessTest.public.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-AccessTest.java:21: error: malformed HTML
+AccessTest.java:23: error: malformed HTML
      * public a < b
                 ^
 1 error

--- a/langtools/test/tools/doclint/AccessibilityTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessibilityTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-accessibility AccessibilityTest.java
  * @run main DocLintTester -ref AccessibilityTest.out AccessibilityTest.java

--- a/langtools/test/tools/doclint/AccessibilityTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/AccessibilityTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,13 +1,13 @@
-AccessibilityTest.java:12: error: header used out of sequence: <H2>
+AccessibilityTest.java:14: error: header used out of sequence: <H2>
      * <h2> ... </h2>
        ^
-AccessibilityTest.java:18: error: header used out of sequence: <H3>
+AccessibilityTest.java:20: error: header used out of sequence: <H3>
      * <h3> ... </h3>
        ^
-AccessibilityTest.java:23: error: no "alt" attribute for image
+AccessibilityTest.java:25: error: no "alt" attribute for image
      * <img src="x.jpg">
        ^
-AccessibilityTest.java:38: error: no summary or caption for table
+AccessibilityTest.java:40: error: no summary or caption for table
      * <table><tr><th>head<tr><td>data</table>
                                       ^
 4 errors

--- a/langtools/test/tools/doclint/EmptyAuthorTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyAuthorTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyAuthorTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyAuthorTest.out EmptyAuthorTest.java

--- a/langtools/test/tools/doclint/EmptyAuthorTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyAuthorTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptyAuthorTest.java:8: warning: no description for @author
+EmptyAuthorTest.java:10: warning: no description for @author
 /** @author */
     ^
 1 warning

--- a/langtools/test/tools/doclint/EmptyExceptionTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyExceptionTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyExceptionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyExceptionTest.out EmptyExceptionTest.java

--- a/langtools/test/tools/doclint/EmptyExceptionTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyExceptionTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptyExceptionTest.java:10: warning: no description for @exception
+EmptyExceptionTest.java:12: warning: no description for @exception
     /** @exception NullPointerException */
         ^
 1 warning

--- a/langtools/test/tools/doclint/EmptyParamTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyParamTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyParamTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyParamTest.out EmptyParamTest.java

--- a/langtools/test/tools/doclint/EmptyParamTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyParamTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptyParamTest.java:10: warning: no description for @param
+EmptyParamTest.java:12: warning: no description for @param
     /** @param i */
         ^
 1 warning

--- a/langtools/test/tools/doclint/EmptyReturnTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyReturnTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyReturnTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyReturnTest.out EmptyReturnTest.java

--- a/langtools/test/tools/doclint/EmptyReturnTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyReturnTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptyReturnTest.java:10: warning: no description for @return
+EmptyReturnTest.java:12: warning: no description for @return
     /** @return */
         ^
 1 warning

--- a/langtools/test/tools/doclint/EmptySerialDataTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySerialDataTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialDataTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialDataTest.out EmptySerialDataTest.java

--- a/langtools/test/tools/doclint/EmptySerialDataTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySerialDataTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptySerialDataTest.java:13: warning: no description for @serialData
+EmptySerialDataTest.java:15: warning: no description for @serialData
     /** @serialData */
         ^
 1 warning

--- a/langtools/test/tools/doclint/EmptySerialFieldTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySerialFieldTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialFieldTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialFieldTest.out EmptySerialFieldTest.java

--- a/langtools/test/tools/doclint/EmptySerialFieldTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySerialFieldTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptySerialFieldTest.java:15: warning: no description for @serialField
+EmptySerialFieldTest.java:17: warning: no description for @serialField
      * @serialField empty    String
        ^
 1 warning

--- a/langtools/test/tools/doclint/EmptySinceTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySinceTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySinceTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySinceTest.out EmptySinceTest.java

--- a/langtools/test/tools/doclint/EmptySinceTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptySinceTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptySinceTest.java:10: warning: no description for @since
+EmptySinceTest.java:12: warning: no description for @since
     /** @since */
         ^
 1 warning

--- a/langtools/test/tools/doclint/EmptyVersionTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyVersionTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyVersionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyVersionTest.out EmptyVersionTest.java

--- a/langtools/test/tools/doclint/EmptyVersionTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/EmptyVersionTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-EmptyVersionTest.java:10: warning: no description for @version
+EmptyVersionTest.java:12: warning: no description for @version
     /** @version */
         ^
 1 warning

--- a/langtools/test/tools/doclint/HtmlAttrsTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/HtmlAttrsTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlAttrsTest.java
  * @run main DocLintTester -ref HtmlAttrsTest.out HtmlAttrsTest.java

--- a/langtools/test/tools/doclint/HtmlAttrsTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/HtmlAttrsTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,10 +1,10 @@
-HtmlAttrsTest.java:11: error: unknown attribute: xyz
+HtmlAttrsTest.java:13: error: unknown attribute: xyz
      * <p xyz>
           ^
-HtmlAttrsTest.java:16: warning: attribute obsolete: name
+HtmlAttrsTest.java:18: warning: attribute obsolete: name
      * <img name="x" alt="alt">
             ^
-HtmlAttrsTest.java:21: warning: attribute obsolete, use CSS instead: size
+HtmlAttrsTest.java:23: warning: attribute obsolete, use CSS instead: size
      * <font size="3"> text </font>
              ^
 1 error

--- a/langtools/test/tools/doclint/HtmlTagsTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/HtmlTagsTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlTagsTest.java
  * @run main DocLintTester -ref HtmlTagsTest.out HtmlTagsTest.java

--- a/langtools/test/tools/doclint/HtmlTagsTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/HtmlTagsTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,37 +1,37 @@
-HtmlTagsTest.java:11: error: unknown tag: xyz
+HtmlTagsTest.java:13: error: unknown tag: xyz
      * <xyz> ... </xyz>
        ^
-HtmlTagsTest.java:11: error: unknown tag: xyz
+HtmlTagsTest.java:13: error: unknown tag: xyz
      * <xyz> ... </xyz>
                  ^
-HtmlTagsTest.java:16: error: unknown tag: xyz
+HtmlTagsTest.java:18: error: unknown tag: xyz
      * <div> <xyz> </div>
              ^
-HtmlTagsTest.java:21: error: self-closing element not allowed
+HtmlTagsTest.java:23: error: self-closing element not allowed
      * <br/>
        ^
-HtmlTagsTest.java:26: error: element not allowed in documentation comments: <html>
+HtmlTagsTest.java:28: error: element not allowed in documentation comments: <html>
      * <html>
        ^
-HtmlTagsTest.java:31: error: block element not allowed within inline element <span>: p
+HtmlTagsTest.java:33: error: block element not allowed within inline element <span>: p
      * <span> <p> </span>
               ^
-HtmlTagsTest.java:36: error: block element not allowed within @link: p
+HtmlTagsTest.java:38: error: block element not allowed within @link: p
      * {@link java.lang.String <p> }
                                ^
-HtmlTagsTest.java:37: error: block element not allowed within @link: p
+HtmlTagsTest.java:39: error: block element not allowed within @link: p
      * {@link java.lang.String <p> }
                                ^
-HtmlTagsTest.java:42: error: invalid end tag: </img>
+HtmlTagsTest.java:44: error: invalid end tag: </img>
      * <img src="any.jpg" alt="alt"> </img>
                                      ^
-HtmlTagsTest.java:47: error: end tag missing: </b>
+HtmlTagsTest.java:49: error: end tag missing: </b>
      * <i> <b> </i>
            ^
-HtmlTagsTest.java:52: error: unexpected end tag: </b>
+HtmlTagsTest.java:54: error: unexpected end tag: </b>
      * <i> </b> </i>
            ^
-HtmlTagsTest.java:52: warning: empty <i> tag
+HtmlTagsTest.java:54: warning: empty <i> tag
      * <i> </b> </i>
                 ^
 11 errors

--- a/langtools/test/tools/doclint/MissingParamsTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingParamsTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingParamsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingParamsTest.out MissingParamsTest.java

--- a/langtools/test/tools/doclint/MissingParamsTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingParamsTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,13 +1,13 @@
-MissingParamsTest.java:11: warning: no @param for param
+MissingParamsTest.java:13: warning: no @param for param
     MissingParamsTest(int param) { }
     ^
-MissingParamsTest.java:14: warning: no @param for <T>
+MissingParamsTest.java:16: warning: no @param for <T>
     <T> MissingParamsTest() { }
         ^
-MissingParamsTest.java:17: warning: no @param for param
+MissingParamsTest.java:19: warning: no @param for param
     void missingParam(int param) { }
          ^
-MissingParamsTest.java:20: warning: no @param for <T>
+MissingParamsTest.java:22: warning: no @param for <T>
     <T> void missingTyparam() { }
              ^
 4 warnings

--- a/langtools/test/tools/doclint/MissingReturnTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingReturnTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingReturnTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingReturnTest.out MissingReturnTest.java

--- a/langtools/test/tools/doclint/MissingReturnTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingReturnTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-MissingReturnTest.java:20: warning: no @return
+MissingReturnTest.java:22: warning: no @return
     int missingReturn() { }
         ^
 1 warning

--- a/langtools/test/tools/doclint/MissingThrowsTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingThrowsTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingThrowsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingThrowsTest.out MissingThrowsTest.java

--- a/langtools/test/tools/doclint/MissingThrowsTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/MissingThrowsTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-MissingThrowsTest.java:11: warning: no @throws for java.lang.Exception
+MissingThrowsTest.java:13: warning: no @throws for java.lang.Exception
     void missingThrows() throws Exception { }
          ^
 1 warning

--- a/langtools/test/tools/doclint/OptionTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/OptionTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,6 +1,3 @@
-
-import com.sun.tools.doclint.DocLint;
-
 /*
  * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +23,12 @@
 
 /*
  * @test
+ * @bug 8004832
+ * @summary Add new doclint package
  */
+
+import com.sun.tools.doclint.DocLint;
+
 public class OptionTest {
     public static void main(String... args) throws Exception {
         new OptionTest().run();

--- a/langtools/test/tools/doclint/OverridesTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/OverridesTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -23,6 +23,8 @@
 
 /*
  * @test
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all OverridesTest.java
  */

--- a/langtools/test/tools/doclint/ReferenceTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/ReferenceTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-reference ReferenceTest.java
  * @run main DocLintTester -ref ReferenceTest.out ReferenceTest.java

--- a/langtools/test/tools/doclint/ReferenceTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/ReferenceTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,28 +1,28 @@
-ReferenceTest.java:11: error: invalid use of @param
+ReferenceTest.java:13: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:16: error: invalid use of @param
+ReferenceTest.java:18: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:21: error: @param name not found
+ReferenceTest.java:23: error: @param name not found
      * @param x description
               ^
-ReferenceTest.java:23: warning: no @param for a
+ReferenceTest.java:25: warning: no @param for a
     public void param_name_not_found(int a) { }
                 ^
-ReferenceTest.java:26: error: @param name not found
+ReferenceTest.java:28: error: @param name not found
      * @param <X> description
                ^
-ReferenceTest.java:31: error: reference not found
+ReferenceTest.java:33: error: reference not found
      * @see Object#tooStrong()
             ^
-ReferenceTest.java:36: error: invalid use of @return
+ReferenceTest.java:38: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:41: error: invalid use of @return
+ReferenceTest.java:43: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:46: error: exception not thrown: java.lang.Exception
+ReferenceTest.java:48: error: exception not thrown: java.lang.Exception
      * @throws Exception description
                ^
 8 errors

--- a/langtools/test/tools/doclint/RunTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/RunTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -22,6 +22,8 @@
  */
 
 /* @test
+ * @bug 8004832
+ * @summary Add new doclint package
  * @bug 8000103
  * @summary Create doclint utility
  */

--- a/langtools/test/tools/doclint/SyntaxTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/SyntaxTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax SyntaxTest.java
  * @run main DocLintTester -ref SyntaxTest.out SyntaxTest.java

--- a/langtools/test/tools/doclint/SyntaxTest.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/SyntaxTest.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-SyntaxTest.java:11: error: malformed HTML
+SyntaxTest.java:13: error: malformed HTML
      * a < b
          ^
 1 error

--- a/langtools/test/tools/doclint/SyntheticTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/SyntheticTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -23,6 +23,8 @@
 
 /*
  * @test
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all SyntheticTest.java
  */

--- a/langtools/test/tools/doclint/ValidTest.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/ValidTest.java	Thu Dec 20 17:59:46 2012 +0000
@@ -23,6 +23,8 @@
 
 /*
  * @test
+ * @bug 8004832
+ * @summary Add new doclint package
  * @build DocLintTester
  * @run main DocLintTester ValidTest.java
  */

--- a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorAlreadyDefined.out AnchorAlreadyDefined.java

--- a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,7 +1,7 @@
-AnchorAlreadyDefined.java:12: error: anchor already defined: here
+AnchorAlreadyDefined.java:14: error: anchor already defined: here
  * <a name="here">duplicate</a>
       ^
-AnchorAlreadyDefined.java:13: error: anchor already defined: here
+AnchorAlreadyDefined.java:15: error: anchor already defined: here
  * <h1 id="here">duplicate</h1>
        ^
 2 errors

--- a/langtools/test/tools/doclint/tidy/BadEnd.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/BadEnd.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref BadEnd.out BadEnd.java

--- a/langtools/test/tools/doclint/tidy/BadEnd.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/BadEnd.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,16 +1,16 @@
-BadEnd.java:12: warning: nested tag not allowed: <code>
+BadEnd.java:14: warning: nested tag not allowed: <code>
  * <code> text <code>
                ^
-BadEnd.java:12: error: element not closed: code
+BadEnd.java:14: error: element not closed: code
  * <code> text <code>
                ^
-BadEnd.java:12: error: element not closed: code
+BadEnd.java:14: error: element not closed: code
  * <code> text <code>
    ^
-BadEnd.java:11: error: element not closed: a
+BadEnd.java:13: error: element not closed: a
  * <a name="here"> text <a>
                         ^
-BadEnd.java:11: error: element not closed: a
+BadEnd.java:13: error: element not closed: a
  * <a name="here"> text <a>
    ^
 4 errors

--- a/langtools/test/tools/doclint/tidy/InsertImplicit.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InsertImplicit.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref InsertImplicit.out InsertImplicit.java

--- a/langtools/test/tools/doclint/tidy/InsertImplicit.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InsertImplicit.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,7 +1,7 @@
-InsertImplicit.java:11: error: unexpected end tag: </p>
+InsertImplicit.java:13: error: unexpected end tag: </p>
  * </p>
    ^
-InsertImplicit.java:12: error: block element not allowed within inline element <i>: blockquote
+InsertImplicit.java:14: error: block element not allowed within inline element <i>: blockquote
  * <i> <blockquote> abc </blockquote> </i>
        ^
 2 errors

--- a/langtools/test/tools/doclint/tidy/InvalidEntity.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidEntity.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidEntity.out InvalidEntity.java

--- a/langtools/test/tools/doclint/tidy/InvalidEntity.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidEntity.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,10 +1,10 @@
-InvalidEntity.java:15: error: invalid entity 
+InvalidEntity.java:17: error: invalid entity 
  * 
    ^
-InvalidEntity.java:16: error: invalid entity 
+InvalidEntity.java:18: error: invalid entity 
  * 
    ^
-InvalidEntity.java:17: error: invalid entity &splodge;
+InvalidEntity.java:19: error: invalid entity &splodge;
  * &splodge;
    ^
 3 errors

--- a/langtools/test/tools/doclint/tidy/InvalidName.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidName.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidName.out InvalidName.java

--- a/langtools/test/tools/doclint/tidy/InvalidName.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidName.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-InvalidName.java:14: error: invalid name for anchor: "foo()"
+InvalidName.java:16: error: invalid name for anchor: "foo()"
  * <a name="foo()">invalid</a>
       ^
 1 error

--- a/langtools/test/tools/doclint/tidy/InvalidTag.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidTag.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidTag.out InvalidTag.java

--- a/langtools/test/tools/doclint/tidy/InvalidTag.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidTag.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,10 +1,10 @@
-InvalidTag.java:11: error: unknown tag: String
+InvalidTag.java:13: error: unknown tag: String
  * List<String> list = new ArrayList<>();
        ^
-InvalidTag.java:11: error: malformed HTML
+InvalidTag.java:13: error: malformed HTML
  * List<String> list = new ArrayList<>();
                                     ^
-InvalidTag.java:11: error: bad use of '>'
+InvalidTag.java:13: error: bad use of '>'
  * List<String> list = new ArrayList<>();
                                      ^
 3 errors

--- a/langtools/test/tools/doclint/tidy/InvalidURI.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidURI.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidURI.out InvalidURI.java

--- a/langtools/test/tools/doclint/tidy/InvalidURI.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/InvalidURI.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,13 +1,13 @@
-InvalidURI.java:14: error: invalid uri: "abc def"
+InvalidURI.java:16: error: invalid uri: "abc def"
  * <a href="abc def">invalid</a>
       ^
-InvalidURI.java:15: error: attribute lacks value
+InvalidURI.java:17: error: attribute lacks value
  * <a href>no value</a>
       ^
-InvalidURI.java:16: error: attribute lacks value
+InvalidURI.java:18: error: attribute lacks value
  * <a href= >no value</a>
       ^
-InvalidURI.java:17: error: attribute lacks value
+InvalidURI.java:19: error: attribute lacks value
  * <a href="" >no value</a>
       ^
 4 errors

--- a/langtools/test/tools/doclint/tidy/MissingGT.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/MissingGT.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref MissingGT.out MissingGT.java

--- a/langtools/test/tools/doclint/tidy/MissingGT.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/MissingGT.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-MissingGT.java:11: error: malformed HTML
+MissingGT.java:13: error: malformed HTML
  * <img src="image.gif"
    ^
 1 error

--- a/langtools/test/tools/doclint/tidy/MissingTag.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/MissingTag.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref MissingTag.out MissingTag.java

--- a/langtools/test/tools/doclint/tidy/MissingTag.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/MissingTag.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,7 +1,7 @@
-MissingTag.java:12: error: unexpected end tag: </p>
+MissingTag.java:14: error: unexpected end tag: </p>
  * </p>
    ^
-MissingTag.java:13: error: end tag missing: </b>
+MissingTag.java:15: error: end tag missing: </b>
  * <h1> <b> text </h1>
         ^
 2 errors

--- a/langtools/test/tools/doclint/tidy/NestedTag.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/NestedTag.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref NestedTag.out NestedTag.java

--- a/langtools/test/tools/doclint/tidy/NestedTag.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/NestedTag.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,7 +1,7 @@
-NestedTag.java:11: warning: nested tag not allowed: <b>
+NestedTag.java:13: warning: nested tag not allowed: <b>
  * <b><b> text </b></b>
       ^
-NestedTag.java:12: warning: nested tag not allowed: <code>
+NestedTag.java:14: warning: nested tag not allowed: <code>
  * {@link java.lang.String <code>String</code>}
                            ^
 2 warnings

--- a/langtools/test/tools/doclint/tidy/ParaInPre.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/ParaInPre.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref ParaInPre.out ParaInPre.java

--- a/langtools/test/tools/doclint/tidy/ParaInPre.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/ParaInPre.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-ParaInPre.java:14: warning: unexpected use of <p> inside <pre> element
+ParaInPre.java:16: warning: unexpected use of <p> inside <pre> element
  *     <p>
        ^
 1 warning

--- a/langtools/test/tools/doclint/tidy/RepeatedAttr.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/RepeatedAttr.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref RepeatedAttr.out RepeatedAttr.java

--- a/langtools/test/tools/doclint/tidy/RepeatedAttr.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/RepeatedAttr.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,4 +1,4 @@
-RepeatedAttr.java:11: error: repeated attribute: alt
+RepeatedAttr.java:13: error: repeated attribute: alt
  * <img src="image.gif" alt alt="summary">
                             ^
 1 error

--- a/langtools/test/tools/doclint/tidy/TextNotAllowed.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/TextNotAllowed.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref TextNotAllowed.out TextNotAllowed.java

--- a/langtools/test/tools/doclint/tidy/TextNotAllowed.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/TextNotAllowed.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,19 +1,19 @@
-TextNotAllowed.java:11: error: text not allowed in <table> element
+TextNotAllowed.java:13: error: text not allowed in <table> element
  * <table summary=description> abc </table>
                                    ^
-TextNotAllowed.java:12: error: text not allowed in <tbody> element
+TextNotAllowed.java:14: error: text not allowed in <tbody> element
  * <table summary=description> <tbody> abc </tbody> </table>
                                            ^
-TextNotAllowed.java:13: error: text not allowed in <tr> element
+TextNotAllowed.java:15: error: text not allowed in <tr> element
  * <table summary=description> <tr> abc </tr> </table>
                                         ^
-TextNotAllowed.java:15: error: text not allowed in <dl> element
+TextNotAllowed.java:17: error: text not allowed in <dl> element
  * <dl> abc </dl>
             ^
-TextNotAllowed.java:16: error: text not allowed in <ol> element
+TextNotAllowed.java:18: error: text not allowed in <ol> element
  * <ol> abc </ol>
             ^
-TextNotAllowed.java:17: error: text not allowed in <ul> element
+TextNotAllowed.java:19: error: text not allowed in <ul> element
  * <ul> abc </ul>
             ^
 6 errors

--- a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref TrimmingEmptyTag.out TrimmingEmptyTag.java

--- a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,46 +1,46 @@
-TrimmingEmptyTag.java:11: warning: empty <b> tag
+TrimmingEmptyTag.java:13: warning: empty <b> tag
  * <b></b>
       ^
-TrimmingEmptyTag.java:12: warning: empty <table> tag
+TrimmingEmptyTag.java:14: warning: empty <table> tag
  * <table summary=description></table>
                               ^
-TrimmingEmptyTag.java:13: warning: empty <caption> tag
+TrimmingEmptyTag.java:15: warning: empty <caption> tag
  * <table><caption></caption></table>
                    ^
-TrimmingEmptyTag.java:14: warning: empty <code> tag
+TrimmingEmptyTag.java:16: warning: empty <code> tag
  * <code></code>
          ^
-TrimmingEmptyTag.java:15: warning: empty <dl> tag
+TrimmingEmptyTag.java:17: warning: empty <dl> tag
  * <dl></dl>
        ^
-TrimmingEmptyTag.java:16: warning: empty <dt> tag
+TrimmingEmptyTag.java:18: warning: empty <dt> tag
  * <dl><dt></dt><dd></dd></dl>
            ^
-TrimmingEmptyTag.java:16: warning: empty <dd> tag
+TrimmingEmptyTag.java:18: warning: empty <dd> tag
  * <dl><dt></dt><dd></dd></dl>
                     ^
-TrimmingEmptyTag.java:17: warning: empty <font> tag
+TrimmingEmptyTag.java:19: warning: empty <font> tag
  * <font></font>
          ^
-TrimmingEmptyTag.java:18: warning: empty <i> tag
+TrimmingEmptyTag.java:20: warning: empty <i> tag
  * <i></i>
       ^
-TrimmingEmptyTag.java:19: warning: empty <ol> tag
+TrimmingEmptyTag.java:21: warning: empty <ol> tag
  * <ol></ol>
        ^
-TrimmingEmptyTag.java:20: warning: empty <p> tag
+TrimmingEmptyTag.java:22: warning: empty <p> tag
  * <p></p>
       ^
-TrimmingEmptyTag.java:21: warning: empty <pre> tag
+TrimmingEmptyTag.java:23: warning: empty <pre> tag
  * <pre></pre>
         ^
-TrimmingEmptyTag.java:22: warning: empty <span> tag
+TrimmingEmptyTag.java:24: warning: empty <span> tag
  * <span></span>
          ^
-TrimmingEmptyTag.java:23: warning: empty <tt> tag
+TrimmingEmptyTag.java:25: warning: empty <tt> tag
  * <tt></tt>
        ^
-TrimmingEmptyTag.java:24: warning: empty <ul> tag
+TrimmingEmptyTag.java:26: warning: empty <ul> tag
  * <ul></ul>
        ^
 15 warnings

--- a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java	Thu Dec 20 17:59:46 2012 +0000
@@ -1,5 +1,7 @@
 /*
  * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
  * @library ..
  * @build DocLintTester
  * @run main DocLintTester -ref UnescapedOrUnknownEntity.out UnescapedOrUnknownEntity.java

--- a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out	Sun Dec 16 11:09:36 2012 +0100
+++ b/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out	Thu Dec 20 17:59:46 2012 +0000
@@ -1,10 +1,10 @@
-UnescapedOrUnknownEntity.java:13: error: semicolon missing
+UnescapedOrUnknownEntity.java:15: error: semicolon missing
  * L&F
     ^
-UnescapedOrUnknownEntity.java:14: error: semicolon missing
+UnescapedOrUnknownEntity.java:16: error: semicolon missing
  * Drag&Drop
        ^
-UnescapedOrUnknownEntity.java:15: error: bad HTML entity
+UnescapedOrUnknownEntity.java:17: error: bad HTML entity
  * if (a & b);
          ^
 3 errors